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

Unified Diff: nss/mozilla/security/nss/lib/certhigh/certvfypkix.c

Issue 11193042: Update NSS to NSS 3.14 RC1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 2 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
Index: nss/mozilla/security/nss/lib/certhigh/certvfypkix.c
===================================================================
--- nss/mozilla/security/nss/lib/certhigh/certvfypkix.c (revision 162724)
+++ nss/mozilla/security/nss/lib/certhigh/certvfypkix.c (working copy)
@@ -1522,6 +1522,7 @@
PKIX_TrustAnchor *trustAnchor = NULL;
PKIX_PL_Date *revDate = NULL;
PKIX_RevocationChecker *revChecker = NULL;
+ PKIX_PL_NssContext *nssContext = (PKIX_PL_NssContext *)plContext;
/* XXX we need a way to map generic PKIX error to generic NSS errors */
@@ -1695,7 +1696,21 @@
(PRBool)(param->value.scalar.b != 0),
plContext);
break;
-
+
+ case cert_pi_chainVerifyCallback:
+ {
+ const CERTChainVerifyCallback *chainVerifyCallback =
+ param->value.pointer.chainVerifyCallback;
+ if (!chainVerifyCallback || !chainVerifyCallback->isChainValid) {
+ PORT_SetError(errCode);
+ r = SECFailure;
+ break;
+ }
+
+ nssContext->chainVerifyCallback = *chainVerifyCallback;
+ }
+ break;
wtc 2012/10/18 21:20:42 This break statement should be inside the {} block
Ryan Sleevi 2012/10/18 21:28:51 I don't think it matters, and Chromium style actua
wtc 2012/10/18 21:53:04 The code example in the Google C++ Style Guide put
+
default:
PORT_SetError(errCode);
r = SECFailure;

Powered by Google App Engine
This is Rietveld 408576698