summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2021-04-28 17:53:34 +0000
committertb <>2021-04-28 17:53:34 +0000
commit83b76ed417b8b5f76bcd75ebddd3441a55c890ce (patch)
tree181fc8a0ecd5653ebb51797c268818c40b4bf7f8 /src/lib
parent9a6275ff251f261dce1f56d6b354a82ba5bfcebd (diff)
downloadopenbsd-83b76ed417b8b5f76bcd75ebddd3441a55c890ce.tar.gz
openbsd-83b76ed417b8b5f76bcd75ebddd3441a55c890ce.tar.bz2
openbsd-83b76ed417b8b5f76bcd75ebddd3441a55c890ce.zip
Revert "Handle X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE in new
verifier." (r1.27). While this may have "fixed" one corner case, it broke expectations of Perl Net::SSLeay and Ruby OpenSSL regression tests. ok bcook
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509_verify.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c
index 9c34e31ee3..57c52aa240 100644
--- a/src/lib/libcrypto/x509/x509_verify.c
+++ b/src/lib/libcrypto/x509/x509_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_verify.c,v 1.36 2021/03/13 23:01:49 tobhe Exp $ */ 1/* $OpenBSD: x509_verify.c,v 1.37 2021/04/28 17:53:34 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -558,9 +558,6 @@ x509_verify_build_chains(struct x509_verify_ctx *ctx, X509 *cert,
558 (void) ctx->xsc->verify_cb(1, ctx->xsc); 558 (void) ctx->xsc->verify_cb(1, ctx->xsc);
559 } 559 }
560 } else if (ctx->error_depth == depth && !ctx->dump_chain) { 560 } else if (ctx->error_depth == depth && !ctx->dump_chain) {
561 if (depth == 0 &&
562 ctx->error == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY)
563 ctx->error = X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE;
564 if (!x509_verify_ctx_set_xsc_chain(ctx, current_chain, 0, 0)) 561 if (!x509_verify_ctx_set_xsc_chain(ctx, current_chain, 0, 0))
565 return; 562 return;
566 (void) x509_verify_cert_error(ctx, cert, depth, 563 (void) x509_verify_cert_error(ctx, cert, depth,