diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 13:00:01 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 13:00:01 +0000 |
| commit | 8fc73c77bef5950266756a691b90b5d1a6b4ee67 (patch) | |
| tree | 4f83f8fac6584572a90dd9fb270e92fb131ee076 /crypto/nss_util.cc | |
| parent | 06c3261f668bf413e8f85e4a26593f970cac700a (diff) | |
| download | chromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.zip chromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.tar.gz chromium_src-8fc73c77bef5950266756a691b90b5d1a6b4ee67.tar.bz2 | |
Revert 209278 "Update dependency to NSS >= 3.14.3 and NSPR >= 4.9.2"
> Update dependency to NSS >= 3.14.3 and NSPR >= 4.9.2
>
> Technically NSS 3.14.3 depends on NSPR 4.9.5, but Debian stable still
> ships 4.9.2 on stable, so this is the lower bound.
>
> 3.14.3 contains a number of important security fixes, and support for
> older systems is no longer desirable.
>
> BUG=245370
> R=thestig@chromium.org, wtc@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/18063013
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/18181019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
| -rw-r--r-- | crypto/nss_util.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index f7c5fc4..bbbaa70 100644 --- a/crypto/nss_util.cc +++ b/crypto/nss_util.cc @@ -384,17 +384,23 @@ class NSSInitSingleton { base::TimeTicks start_time = base::TimeTicks::Now(); EnsureNSPRInit(); - // We *must* have NSS >= 3.14.3. + // We *must* have NSS >= 3.12.3. See bug 26448. COMPILE_ASSERT( - (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) || - (NSS_VMAJOR == 3 && NSS_VMINOR > 14) || + (NSS_VMAJOR == 3 && NSS_VMINOR == 12 && NSS_VPATCH >= 3) || + (NSS_VMAJOR == 3 && NSS_VMINOR > 12) || (NSS_VMAJOR > 3), nss_version_check_failed); // Also check the run-time NSS version. // NSS_VersionCheck is a >= check, not strict equality. - if (!NSS_VersionCheck("3.14.3")) { - LOG(FATAL) << "NSS_VersionCheck(\"3.14.3\") failed. NSS >= 3.14.3 is " - "required. Please upgrade to the latest NSS, and if you " + if (!NSS_VersionCheck("3.12.3")) { + // It turns out many people have misconfigured NSS setups, where + // their run-time NSPR doesn't match the one their NSS was compiled + // against. So rather than aborting, complain loudly. + LOG(ERROR) << "NSS_VersionCheck(\"3.12.3\") failed. " + "We depend on NSS >= 3.12.3, and this error is not fatal " + "only because many people have busted NSS setups (for " + "example, using the wrong version of NSPR). " + "Please upgrade to the latest NSS and NSPR, and if you " "still get this error, contact your distribution " "maintainer."; } |