summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2020-11-16 17:42:35 +0000
committerjsing <jsing@openbsd.org>2020-11-16 17:42:35 +0000
commit8d2344901a6e2dd135f9377f4ac507dcfc11bec7 (patch)
tree106e89a0e1f3f499644742f06352573c6acaa641
parentFix compile error on big-endian machines caused by recent multicast commit. (diff)
downloadwireguard-openbsd-8d2344901a6e2dd135f9377f4ac507dcfc11bec7.tar.xz
wireguard-openbsd-8d2344901a6e2dd135f9377f4ac507dcfc11bec7.zip
Add back an X509_STORE_CTX error code assignment.
This was inadvertently removed in r1.19. Spotted by tb@ ok beck@ tb@
-rw-r--r--lib/libcrypto/x509/x509_verify.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libcrypto/x509/x509_verify.c b/lib/libcrypto/x509/x509_verify.c
index 5f048bee4f6..39f86d383e5 100644
--- a/lib/libcrypto/x509/x509_verify.c
+++ b/lib/libcrypto/x509/x509_verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_verify.c,v 1.20 2020/11/15 17:54:49 beck Exp $ */
+/* $OpenBSD: x509_verify.c,v 1.21 2020/11/16 17:42:35 jsing Exp $ */
/*
* Copyright (c) 2020 Bob Beck <beck@openbsd.org>
*
@@ -1014,8 +1014,9 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name)
ctx->error = X509_V_OK;
if (ctx->xsc != NULL) {
- /* Take the first chain we found. */
+ ctx->xsc->error = ctx->error;
if (ctx->chains_count > 0) {
+ /* Take the first chain we found. */
if (!x509_verify_ctx_set_xsc_chain(ctx, ctx->chains[0], 1))
goto err;
}