diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 02:20:58 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 02:20:58 +0000 |
| commit | b20a91661a8dc2e3d46c99c90c4e62af46b21a89 (patch) | |
| tree | 9a214f8d69634df6d2c24ddde038a266cf0fe2c6 /crypto | |
| parent | 67f9f24cd290bef63330d054c58f5f069e7bc37b (diff) | |
| download | chromium_src-b20a91661a8dc2e3d46c99c90c4e62af46b21a89.zip chromium_src-b20a91661a8dc2e3d46c99c90c4e62af46b21a89.tar.gz chromium_src-b20a91661a8dc2e3d46c99c90c4e62af46b21a89.tar.bz2 | |
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
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/nss_util.cc | 2 |
1 files changed, 0 insertions, 2 deletions
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 |