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

Unified Diff: patches/nss-error-collision.patch

Issue 11362174: Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Update the snapshot timestamp in README.chromium Created 8 years, 1 month 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
Index: patches/nss-error-collision.patch
===================================================================
--- patches/nss-error-collision.patch (revision 0)
+++ patches/nss-error-collision.patch (revision 0)
@@ -0,0 +1,21 @@
+Index: mozilla/security/nss/lib/util/secerr.h
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/util/secerr.h,v
+retrieving revision 1.32
+retrieving revision 1.33
+diff -p -u -r1.32 -r1.33
+--- mozilla/security/nss/lib/util/secerr.h 26 Jun 2012 22:27:33 -0000 1.32
++++ mozilla/security/nss/lib/util/secerr.h 22 Sep 2012 13:53:55 -0000 1.33
+@@ -203,10 +203,11 @@ SEC_ERROR_LOCKED_PASSWORD
+ SEC_ERROR_UNKNOWN_PKCS11_ERROR = (SEC_ERROR_BASE + 174),
+
+ SEC_ERROR_BAD_CRL_DP_URL = (SEC_ERROR_BASE + 175),
+-SEC_ERROR_LEGACY_DATABASE = (SEC_ERROR_BASE + 176),
+
+ SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED = (SEC_ERROR_BASE + 176),
+
++SEC_ERROR_LEGACY_DATABASE = (SEC_ERROR_BASE + 177),
++
+ /* Add new error codes above here. */
+ SEC_ERROR_END_OF_LIST
+ } SECErrorCodes;

Powered by Google App Engine
This is Rietveld 408576698