From: Matt Caswell <matt@openssl.org>
Date: Tue, 25 May 2021 14:19:56 +0000 (+0100)
Subject: Fix CTLOG_new_from_base64_ex()
X-Git-Tag: openssl-3.0.0-beta1~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7834d50fa92c622e3a1b29a38abbbec2afd1290d;p=thirdparty%2Fopenssl.git

Fix CTLOG_new_from_base64_ex()

Ensure that the libctx/propq are passed to d2i_PUBKEY_ex()

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15504)
---

diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c
index 8dd137096ce..5dae44d5eff 100644
--- a/crypto/ct/ct_b64.c
+++ b/crypto/ct/ct_b64.c
@@ -153,7 +153,7 @@ int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
     }
 
     p = pkey_der;
-    pkey = d2i_PUBKEY(NULL, &p, pkey_der_len);
+    pkey = d2i_PUBKEY_ex(NULL, &p, pkey_der_len, libctx, propq);
     OPENSSL_free(pkey_der);
     if (pkey == NULL) {
         ERR_raise(ERR_LIB_CT, CT_R_LOG_CONF_INVALID_KEY);