diff options
author | beck <> | 2022-06-28 16:05:42 +0000 |
---|---|---|
committer | beck <> | 2022-06-28 16:05:42 +0000 |
commit | 4b57b59ced3d3988203fa4192fa308ecd157c506 (patch) | |
tree | 13ba0e484e3cec5e8465b03f2e0d51dd31c58736 /src | |
parent | 06541dc716a2b85a3c7ba70e85fcc4eca1f70fb9 (diff) | |
download | openbsd-4b57b59ced3d3988203fa4192fa308ecd157c506.tar.gz openbsd-4b57b59ced3d3988203fa4192fa308ecd157c506.tar.bz2 openbsd-4b57b59ced3d3988203fa4192fa308ecd157c506.zip |
Take away bogus error assignment before callback call.
Keep the depth which was needed.
This went an error too far, and broke openssl-ruby's callback
and error code sensitivity in it's tests.
With this removed, both my newly committed regress to verify
the same error codes and depths in the callback, and
openssl-ruby's tests pass again.
ok tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/x509_verify.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_verify.c b/src/lib/libcrypto/x509/x509_verify.c index aa14bc1933..a9c54e664f 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.58 2022/06/28 07:56:34 beck Exp $ */ | 1 | /* $OpenBSD: x509_verify.c,v 1.59 2022/06/28 16:05:42 beck 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 | * |
@@ -1193,7 +1193,6 @@ x509_verify(struct x509_verify_ctx *ctx, X509 *leaf, char *name) | |||
1193 | * on failure and will be needed for | 1193 | * on failure and will be needed for |
1194 | * that. | 1194 | * that. |
1195 | */ | 1195 | */ |
1196 | ctx->xsc->error = ctx->error; | ||
1197 | ctx->xsc->error_depth = ctx->error_depth; | 1196 | ctx->xsc->error_depth = ctx->error_depth; |
1198 | if (!x509_verify_ctx_save_xsc_error(ctx)) { | 1197 | if (!x509_verify_ctx_save_xsc_error(ctx)) { |
1199 | x509_verify_chain_free(current_chain); | 1198 | x509_verify_chain_free(current_chain); |