Chromium Code Reviews| Index: crypto/nss_util.cc |
| diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc |
| index 358656790078fa6d1f60dc41146037569b9ae2d9..c331703224eda2977697268e134d9c121307c9fa 100644 |
| --- a/crypto/nss_util.cc |
| +++ b/crypto/nss_util.cc |
| @@ -670,16 +670,15 @@ class NSSInitSingleton { |
| EnsureNSPRInit(); |
| - // We *must* have NSS >= 3.14.3. |
| + // We *must* have NSS >= 3.26. |
| static_assert( |
| - (NSS_VMAJOR == 3 && NSS_VMINOR == 14 && NSS_VPATCH >= 3) || |
| - (NSS_VMAJOR == 3 && NSS_VMINOR > 14) || |
| + (NSS_VMAJOR == 3 && NSS_VMINOR >= 26) || |
|
Tom Anderson
2017/03/01 19:36:58
This won't work when compiling against the Wheezy
|
| (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."; |