comparison: libpurple/plugins/ssl/ssl-nss.c
libpurple/plugins/ssl/ssl-nss.c
- changeset 37426
- 6fd4989b77e4
- parent 37158
- 96b5ab42da00
equal
deleted
inserted
replaced
| 37425:5061721fd98f | 37426:6fd4989b77e4 |
|---|---|
| 680 } | 680 } |
| 681 | 681 |
| 682 if (len == 0) { | 682 if (len == 0) { |
| 683 purple_debug_error("nss/x509", | 683 purple_debug_error("nss/x509", |
| 684 "Certificate file has no contents!\n"); | 684 "Certificate file has no contents!\n"); |
| 685 if (rawcert) | 685 g_free(rawcert); |
| 686 g_free(rawcert); | |
| 687 return NULL; | 686 return NULL; |
| 688 } | 687 } |
| 689 | 688 |
| 690 /* Decode the certificate */ | 689 /* Decode the certificate */ |
| 691 crt_dat = CERT_DecodeCertFromPackage(rawcert, len); | 690 crt_dat = CERT_DecodeCertFromPackage(rawcert, len); |
| 729 } | 728 } |
| 730 | 729 |
| 731 if (len == 0) { | 730 if (len == 0) { |
| 732 purple_debug_error("nss/x509", | 731 purple_debug_error("nss/x509", |
| 733 "Certificate file has no contents!\n"); | 732 "Certificate file has no contents!\n"); |
| 734 if (rawcert) | 733 g_free(rawcert); |
| 735 g_free(rawcert); | |
| 736 return NULL; | 734 return NULL; |
| 737 } | 735 } |
| 738 | 736 |
| 739 begin = rawcert; | 737 begin = rawcert; |
| 740 while((end = strstr(begin, "-----END CERTIFICATE-----")) != NULL) { | 738 while((end = strstr(begin, "-----END CERTIFICATE-----")) != NULL) { |
