summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Atallah <datallah@pidgin.im>2014-10-31 18:02:39 -0400
committerDaniel Atallah <datallah@pidgin.im>2014-10-31 18:02:39 -0400
commit7d5e99bb192f8cdad45baf588eded8d7df585389 (patch)
treecae5387b03113dfc48b0df9e6b96cc0e6d7d0493
parent90bda5b9d8b60f8435c747038c9f01b7536fffff (diff)
downloadpidgin-7d5e99bb192f8cdad45baf588eded8d7df585389.tar.gz
As of NSS 3.15.2, NSS_SetDomesticPolicy() doesn't do anything, so don't use it.
-rw-r--r--libpurple/plugins/ssl/ssl-nss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index 12cae38676..066203157f 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -148,7 +148,9 @@ 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)))
NSS_SetDomesticPolicy();
+#endif /* NSS < 3.15.2 */
SSL_CipherPrefSetDefault(TLS_DHE_RSA_WITH_AES_256_CBC_SHA, 1);
SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_AES_256_CBC_SHA, 1);