diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-11-16 17:42:36 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-11-16 17:42:36 +0000 |
| commit | b055e6951f6134128c27c3829e2dd1d88cc65a8e (patch) | |
| tree | cbdedc3564a3976e718a423513cbf39bde162e6e /lib | |
| parent | 561f368829863ce5b84396188c48952e11b7e9b9 (diff) | |
Add back an X509_STORE_CTX error code assignment.
This was inadvertently removed in r1.19.
Spotted by tb@
ok beck@ tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/x509/x509_verify.c | 5 |
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; } |