Bug 923277, backout changeset 5349343fa84a because it causes NSS test automation failures as a side effect
--- a/cmd/lib/secutil.c
+++ b/cmd/lib/secutil.c
@@ -3206,19 +3206,18 @@ SECU_displayVerifyLog(FILE *outfile, CER
do {
fprintf(outfile, "%s\n", emailAddr);
emailAddr = CERT_GetNextEmailAddress(node->cert,
emailAddr);
} while (emailAddr);
}
}
}
- fprintf(outfile, " ERROR %s (%ld): %s\n",
- PORT_ErrorToName(node->error), node->error,
- SECU_Strerror(node->error));
+ fprintf(outfile, " ERROR %ld: %s\n", node->error,
+ SECU_Strerror(node->error));
errstr = NULL;
switch (node->error) {
case SEC_ERROR_INADEQUATE_KEY_USAGE:
flags = (unsigned int)node->arg;
switch (flags) {
case KU_DIGITAL_SIGNATURE:
errstr = "Cert cannot sign.";
break;
--- a/cmd/vfychain/vfychain.c
+++ b/cmd/vfychain/vfychain.c
@@ -704,20 +704,18 @@ breakout:
break;
}
issuerCert = cvout[0].value.pointer.cert;
builtChain = cvout[1].value.pointer.chain;
} while (0);
/* Display validation results */
if (secStatus != SECSuccess || log.count > 0) {
- PRErrorCode error = PR_GetError();
CERTVerifyLogNode *node = NULL;
- fprintf(stderr, "Chain is bad!:\nERROR %s (%ld): %s\n",
- PORT_ErrorToName(error), error, SECU_Strerror(error));
+ fprintf(stderr, "Chain is bad!\n");
SECU_displayVerifyLog(stderr, &log, verbose);
/* Have cert refs in the log only in case of failure.
* Destroy them. */
for (node = log.head; node; node = node->next) {
if (node->cert)
CERT_DestroyCertificate(node->cert);
}