summaryrefslogtreecommitdiffstats
path: root/crypto/nss_util.cc
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 23:23:37 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 23:23:37 +0000
commitec27c0de4e9c1054f2d7faed2dae910ef5b88f17 (patch)
treede709d2f1141ca53a4429017bbd6151813882b79 /crypto/nss_util.cc
parent5b6838b421fe7e4d4bcd027035f049164901591d (diff)
downloadchromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.zip
chromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.tar.gz
chromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.tar.bz2
Revert 209515 "Reland http://crrev.com/209278"
> Reland http://crrev.com/209278 > > 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 > TBR=thestig@chromium.org, wtc@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/18332012 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/18414004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.cc')
-rw-r--r--crypto/nss_util.cc18
1 files changed, 12 insertions, 6 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 52bb054..850d47d 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.";
}