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

Unified Diff: crypto/nss_util.cc

Issue 2721373002: Uprev NSS requirement on Linux to 3.26 (Closed)
Patch Set: Update deps Created 3 years, 6 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 | « chrome/installer/linux/rpm/build.sh ('k') | crypto/scoped_test_nss_db.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/nss_util.cc
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
index 5ed2fa06740b4681c604bfecb463e5c7d07b4767..29bef61ee388a65cf9218ae9ab753a57169cab4b 100644
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -670,16 +670,13 @@ class NSSInitSingleton {
EnsureNSPRInit();
- // We *must* have NSS >= 3.14.3.
- static_assert(
- (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) ||
- (NSS_VMAJOR == 3 && NSS_VMINOR > 14) ||
- (NSS_VMAJOR > 3),
- "nss version check failed");
+ // We *must* have NSS >= 3.26 at compile time.
+ static_assert((NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || (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 "
+ if (!NSS_VersionCheck("3.26")) {
+ LOG(FATAL) << "NSS_VersionCheck(\"3.26\") failed. NSS >= 3.26 is "
"required. Please upgrade to the latest NSS, and if you "
"still get this error, contact your distribution "
"maintainer.";
« no previous file with comments | « chrome/installer/linux/rpm/build.sh ('k') | crypto/scoped_test_nss_db.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698