The branch master has been updated
via 7b7eb4725ead9440e5f68c999e0792098ea82239 (commit)
from fb015ca6f05e09b11a3932f89d25bae697c8af1e (commit)
- Log -----------------------------------------------------------------
commit 7b7eb4725ead9440e5f68c999e0792098ea82239
Author: Viktor Dukhovni <openssl-us...@dukhovni.org>
Date: Fri Apr 29 16:36:32 2016 -0400
Drop duplicate ctx->verify_cb assignment
The right variant is ~18 lines below.
Reviewed-by: Matt Caswell <m...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/x509_vfy.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index 2b17b29..6fc08c4 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -2171,11 +2171,10 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE
*store, X509 *x509,
/* Zero ex_data to make sure we're cleanup-safe */
memset(&ctx->ex_data, 0, sizeof(ctx->ex_data));
- if (store) {
- ctx->verify_cb = store->verify_cb;
- /* Seems to always be 0 in OpenSSL, else must be idempotent */
+ /* store->cleanup is always 0 in OpenSSL, if set must be idempotent */
+ if (store)
ctx->cleanup = store->cleanup;
- } else
+ else
ctx->cleanup = 0;
if (store && store->check_issued)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
