Update nss_revision to 169146.

The underlying CLs are: https://codereview.chromium.org/11419095/ https://codereview.chromium.org/11411127/ The first CL allows us to call NSS_SetAlgorithmPolicy in Windows shared_library build. R=rsleevi@chromium.org,sgjesse@chromium.org BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/11308155 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169195 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Nov 22, 2012 · b20a916 · b20a916
1 parent 67f9f24
commit b20a916
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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