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

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

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 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
Index: nss/mozilla/security/nss/lib/certhigh/certvfypkix.c
===================================================================
--- nss/mozilla/security/nss/lib/certhigh/certvfypkix.c (revision 142244)
+++ nss/mozilla/security/nss/lib/certhigh/certvfypkix.c (working copy)
@@ -1426,8 +1426,8 @@
/* This needs to be part of the PKIX_PL_* */
/* This definitely needs to go away, and be replaced with
a real accessor function in PKIX */
-CERTCertificate *
-cert_NSSCertFromPKIXCert(const PKIX_PL_Cert *pkix_cert, void *plContext)
+static CERTCertificate *
+cert_NSSCertFromPKIXCert(const PKIX_PL_Cert *pkix_cert)
{
struct fake_PKIX_PL_CertStruct *fcert = NULL;
@@ -2218,10 +2218,12 @@
goto cleanup;
}
- error = PKIX_TrustAnchor_GetTrustedCert( trustAnchor, &trustAnchorCert,
- plContext);
- if (error != NULL) {
- goto cleanup;
+ if (trustAnchor != NULL) {
+ error = PKIX_TrustAnchor_GetTrustedCert( trustAnchor, &trustAnchorCert,
+ plContext);
+ if (error != NULL) {
+ goto cleanup;
+ }
}
#ifdef PKIX_OBJECT_LEAK_TEST
@@ -2232,8 +2234,12 @@
oparam = cert_pkix_FindOutputParam(paramsOut, cert_po_trustAnchor);
if (oparam != NULL) {
- oparam->value.pointer.cert =
- cert_NSSCertFromPKIXCert(trustAnchorCert,plContext);
+ if (trustAnchorCert != NULL) {
+ oparam->value.pointer.cert =
+ cert_NSSCertFromPKIXCert(trustAnchorCert);
+ } else {
+ oparam->value.pointer.cert = NULL;
+ }
}
error = PKIX_BuildResult_GetCertChain( buildResult, &builtCertList,

Powered by Google App Engine
This is Rietveld 408576698