diff options
author | jsing <> | 2020-11-16 17:42:35 +0000 |
---|---|---|
committer | jsing <> | 2020-11-16 17:42:35 +0000 |
commit | 6ba36f769980f2d0ef8a398b5bf7d1f8430b962d (patch) | |
tree | 6cb9eb520e94609bd2118085fc13f32a4a28bd1c | |
parent | e681f33cab66602fd8f3f572d86bdce2b13b2de9 (diff) | |
download | openbsd-6ba36f769980f2d0ef8a398b5bf7d1f8430b962d.tar.gz openbsd-6ba36f769980f2d0ef8a398b5bf7d1f8430b962d.tar.bz2 openbsd-6ba36f769980f2d0ef8a398b5bf7d1f8430b962d.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-- | src/lib/libcrypto/x509/x509_verify.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c index 5f048bee4f..39f86d383e 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.20 2020/11/15 17:54:49 beck Exp $ */ | 1 | /* $OpenBSD: x509_verify.c,v 1.21 2020/11/16 17:42:35 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2020 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -1014,8 +1014,9 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name) | |||
1014 | ctx->error = X509_V_OK; | 1014 | ctx->error = X509_V_OK; |
1015 | 1015 | ||
1016 | if (ctx->xsc != NULL) { | 1016 | if (ctx->xsc != NULL) { |
1017 | /* Take the first chain we found. */ | 1017 | ctx->xsc->error = ctx->error; |
1018 | if (ctx->chains_count > 0) { | 1018 | if (ctx->chains_count > 0) { |
1019 | /* Take the first chain we found. */ | ||
1019 | if (!x509_verify_ctx_set_xsc_chain(ctx, ctx->chains[0], 1)) | 1020 | if (!x509_verify_ctx_set_xsc_chain(ctx, ctx->chains[0], 1)) |
1020 | goto err; | 1021 | goto err; |
1021 | } | 1022 | } |