summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2020-10-26 12:01:01 +0000
committertb <>2020-10-26 12:01:01 +0000
commit7df3dd01de26ca0cd2d9564f78d3beea427d540a (patch)
treebd0ad62ec5fb3aebc53bd19ebed57d3b32a4da59 /src/lib
parent5035742c50e7ba71002226f107cc1ba6ae270c99 (diff)
downloadopenbsd-7df3dd01de26ca0cd2d9564f78d3beea427d540a.tar.gz
openbsd-7df3dd01de26ca0cd2d9564f78d3beea427d540a.tar.bz2
openbsd-7df3dd01de26ca0cd2d9564f78d3beea427d540a.zip
Add a safety net to ensure that we set an error on the store context.
Suggested by and discussed with beck
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509_verify.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c
index 74316cb941..124d4ba34e 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.15 2020/10/26 11:59:16 tb Exp $ */ 1/* $OpenBSD: x509_verify.c,v 1.16 2020/10/26 12:01:01 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -932,6 +932,8 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name)
932 return (ctx->chains_count); 932 return (ctx->chains_count);
933 933
934 err: 934 err:
935 if (ctx->error == X509_V_OK)
936 ctx->error = X509_V_ERR_UNSPECIFIED;
935 if (ctx->xsc != NULL) 937 if (ctx->xsc != NULL)
936 ctx->xsc->error = ctx->error; 938 ctx->xsc->error = ctx->error;
937 return 0; 939 return 0;