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

Unified Diff: mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c

Issue 12197027: Merge NSS_3_14_2_RTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 10 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: mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c
===================================================================
--- mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c (revision 180567)
+++ mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c (working copy)
@@ -3315,7 +3315,7 @@
PKIX_ERROR(PKIX_CERTISCERTTRUSTEDFAILED);
}
- if (trustOnlyUserAnchors) {
+ if (trustOnlyUserAnchors || cert->isUserTrustAnchor) {
/* discard our |trusted| value since we are using the anchors */
*pTrusted = cert->isUserTrustAnchor;
goto cleanup;

Powered by Google App Engine
This is Rietveld 408576698