summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--crypto/nss_util.cc2
2 files changed, 1 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 3fac345..47d548c 100644
--- a/DEPS
+++ b/DEPS
@@ -39,7 +39,7 @@ vars = {
# and V8 without interference from each other.
"webrtc_revision": "3088",
"jsoncpp_revision": "248",
- "nss_revision": "168591",
+ "nss_revision": "169146",
}
deps = {
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index ff2b0c8..0542a34 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -519,13 +519,11 @@ class NSSInitSingleton {
#endif // defined(USE_NSS)
}
-#if defined(USE_NSS) || defined(OS_IOS)
// Disable MD5 certificate signatures. (They are disabled by default in
// NSS 3.14.)
NSS_SetAlgorithmPolicy(SEC_OID_MD5, 0, NSS_USE_ALG_IN_CERT_SIGNATURE);
NSS_SetAlgorithmPolicy(SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION,
0, NSS_USE_ALG_IN_CERT_SIGNATURE);
-#endif // defined(USE_NSS) || defined(OS_IOS)
}
// NOTE(willchan): We don't actually execute this code since we leak NSS to