Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4003)

Unified Diff: base/nss_util.cc

Issue 562039: linux: make NSS version check non-fatal (Closed)
Patch Set: with nspr message Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/nss_util.cc
diff --git a/base/nss_util.cc b/base/nss_util.cc
index c6c4ae3a6afc3448938cbc485ed88b26277e6af3..58c8d623261d9ca55e5008a5ca99b357911c9aa9 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -89,9 +89,18 @@ class NSSInitSingleton {
nss_version_check_failed);
// Also check the run-time NSS version.
// NSS_VersionCheck is a >= check, not strict equality.
- CHECK(NSS_VersionCheck("3.12.3")) << "We depend on NSS >= 3.12.3. "
- "If NSS is up to date, please "
- "update NSPR to the latest version.";
+ 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.";
+ }
SECStatus status = SECFailure;
#if defined(USE_NSS_FOR_SSL_ONLY)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698