summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2021-02-15 17:57:58 +0000
committerjsing <>2021-02-15 17:57:58 +0000
commit972d2a7aab0f7cf4db8798e6f47311550728f254 (patch)
tree4f7df905594a53f16c4b2bead80bdd37fe666d4c
parent8d0019e0ef2b64cb2c762a1b3515a73c2f3c95ac (diff)
downloadopenbsd-972d2a7aab0f7cf4db8798e6f47311550728f254.tar.gz
openbsd-972d2a7aab0f7cf4db8798e6f47311550728f254.tar.bz2
openbsd-972d2a7aab0f7cf4db8798e6f47311550728f254.zip
Only print the certificate file once on verifification failure.
Noted by Steffen Ullrich. ok tb@
-rw-r--r--src/usr.bin/openssl/verify.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/verify.c b/src/usr.bin/openssl/verify.c
index 22b5aa663c..dd321761d3 100644
--- a/src/usr.bin/openssl/verify.c
+++ b/src/usr.bin/openssl/verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: verify.c,v 1.13 2020/11/03 18:50:25 tb Exp $ */ 1/* $OpenBSD: verify.c,v 1.14 2021/02/15 17:57:58 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -379,8 +379,6 @@ check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
379 if (x == NULL) 379 if (x == NULL)
380 goto end; 380 goto end;
381 381
382 fprintf(stdout, "%s: ", certfile);
383
384 if ((csc = X509_STORE_CTX_new()) == NULL) 382 if ((csc = X509_STORE_CTX_new()) == NULL)
385 goto end; 383 goto end;
386 X509_STORE_set_flags(ctx, vflags); 384 X509_STORE_set_flags(ctx, vflags);
@@ -395,7 +393,7 @@ check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain,
395 verify_err = X509_STORE_CTX_get_error(csc); 393 verify_err = X509_STORE_CTX_get_error(csc);
396 394
397 if (i > 0 && verify_err == X509_V_OK) { 395 if (i > 0 && verify_err == X509_V_OK) {
398 fprintf(stdout, "OK\n"); 396 fprintf(stdout, "%s: OK\n", certfile);
399 ret = 1; 397 ret = 1;
400 } else { 398 } else {
401 fprintf(stdout, "%s: verification failed: %d (%s)\n", certfile, 399 fprintf(stdout, "%s: verification failed: %d (%s)\n", certfile,