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

Unified Diff: nss/lib/libpkix/pkix/top/pkix_validate.c

Issue 133273035: Update third_party/nss to 3.15.5 Beta 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 6 years, 11 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
« no previous file with comments | « nss/lib/libpkix/pkix/top/pkix_build.c ('k') | nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/libpkix/pkix/top/pkix_validate.c
===================================================================
--- nss/lib/libpkix/pkix/top/pkix_validate.c (revision 245298)
+++ nss/lib/libpkix/pkix/top/pkix_validate.c (working copy)
@@ -1113,7 +1113,7 @@
pVerifyTree,
plContext);
- if (chainFailed || (reasonCode != 0)) {
+ if (chainFailed) {
/* cert chain failed to validate */
@@ -1129,6 +1129,10 @@
} else {
+ /* XXX Remove this assertion after 2014-12-31.
+ * See bug 946984. */
+ PORT_Assert(reasonCode == 0);
+
/* cert chain successfully validated! */
PKIX_CHECK(pkix_ValidateResult_Create
(finalPubKey,
@@ -1393,7 +1397,7 @@
goto cleanup;
}
- if (chainFailed || (reasonCode != 0)) {
+ if (chainFailed) {
/* cert chain failed to validate */
@@ -1409,6 +1413,10 @@
} else {
+ /* XXX Remove this assertion after 2014-12-31.
+ * See bug 946984. */
+ PORT_Assert(reasonCode == 0);
+
/* cert chain successfully validated! */
PKIX_CHECK(pkix_ValidateResult_Create
(finalPubKey,
« no previous file with comments | « nss/lib/libpkix/pkix/top/pkix_build.c ('k') | nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_aiamgr.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698