From 7b7eb4725ead9440e5f68c999e0792098ea82239 Mon Sep 17 00:00:00 2001 From: Viktor Dukhovni Date: Fri, 29 Apr 2016 16:36:32 -0400 Subject: [PATCH] Drop duplicate ctx->verify_cb assignment The right variant is ~18 lines below. Reviewed-by: Matt Caswell --- 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 2b17b29f1d..6fc08c4a26 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) -- GitLab