diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2014-11-05 00:07:54 -0500 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2014-11-05 00:07:54 -0500 |
| commit | 81b8a037092881cdf83c07276177280fd38fb84e (patch) | |
| tree | 8fbe86cd52698c483468f8b8d4fa71e668f83291 | |
| parent | 2d5d235232f7b4f28cb2f95823ca4ca7b9ad408f (diff) | |
| download | pidgin-81b8a037092881cdf83c07276177280fd38fb84e.tar.gz | |
Fix building with NSS 3.10.8 (which is what squeeze has and is probably the oldest we need to worry about)
| -rw-r--r-- | libpurple/plugins/ssl/ssl-nss.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c index 5749f19217..85335e8a04 100644 --- a/libpurple/plugins/ssl/ssl-nss.c +++ b/libpurple/plugins/ssl/ssl-nss.c @@ -150,18 +150,20 @@ static void ssl_nss_log_ciphers(void) { rv = SSL_CipherPrefGetDefault(suite, &enabled); if (rv != SECSuccess) { - err = PR_GetError(); + gchar *error_txt = get_error_text(); purple_debug_warning("nss", "SSL_CipherPrefGetDefault didn't like value 0x%04x: %s\n", - suite, PORT_ErrorToString(err)); + suite, error_txt); + g_free(error_txt); continue; } rv = SSL_GetCipherSuiteInfo(suite, &info, (int)(sizeof info)); if (rv != SECSuccess) { - err = PR_GetError(); + gchar *error_txt = get_error_text(); purple_debug_warning("nss", "SSL_GetCipherSuiteInfo didn't like value 0x%04x: %s\n", - suite, PORT_ErrorToString(err)); + suite, error_txt); + g_free(error_txt); continue; } purple_debug_info("nss", "Cipher - %s: %s\n", @@ -179,7 +181,7 @@ ssl_nss_init_nss(void) PR_Init(PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1); NSS_NoDB_Init("."); -#if (NSS_VMAJOR == 3 && (NSS_VMINOR < 15 || (NSS_VMINOR == 15 && NSS_VMICRO < 2))) +#if (NSS_VMAJOR == 3 && (NSS_VMINOR < 15 || (NSS_VMINOR == 15 && NSS_VPATCH < 2))) NSS_SetDomesticPolicy(); #endif /* NSS < 3.15.2 */ @@ -1128,7 +1130,9 @@ static void x509_verify_cert(PurpleCertificateVerificationRequest *vrq, PurpleCe case SEC_ERROR_CA_CERT_INVALID: case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: case SEC_ERROR_UNTRUSTED_CERT: +#ifdef SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED case SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED: +#endif if (!self_signed) { *flags |= PURPLE_CERTIFICATE_INVALID_CHAIN; } |