| 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,
|
|
|