From: Richard Levitte <levitte@openssl.org>
Date: Sun, 8 Nov 2020 09:25:47 +0000 (+0100)
Subject: PEM: Always use PEM_def_callback() when cb == NULL in pem_read_bio_key()
X-Git-Tag: openssl-3.0.0-alpha9~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00eae3f9cf4c45f3d0c6561512a51aef74ac8b3d;p=thirdparty%2Fopenssl.git

PEM: Always use PEM_def_callback() when cb == NULL in pem_read_bio_key()

Too many other functions depend on this being done.

Fixes #13340

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13346)
---

diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c
index 214fd1267ca..91f6f30cf61 100644
--- a/crypto/pem/pem_pkey.c
+++ b/crypto/pem/pem_pkey.c
@@ -48,12 +48,9 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
         return NULL;
     }
 
-    if (u != NULL && cb == NULL)
-        cb = PEM_def_callback;
     if (cb == NULL)
-        ui_method = UI_null();
-    else
-        ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0);
+        cb = PEM_def_callback;
+    ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0);
     if (ui_method == NULL)
         return NULL;