QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-03 21:19:39 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Richard Levitte 2020-11-08 10:25:47 +01:00
parent 457856f27a
commit 00eae3f9cf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/pem/pem_pkey.c
View File

@ -48,12 +48,9 @@ static EVP_PKEY *pem_read_bio_key(BIO *bp, EVP_PKEY **x,
return NULL; return NULL;
} }
if (u != NULL && cb == NULL)
cb = PEM_def_callback;
if (cb == NULL) if (cb == NULL)
ui_method = UI_null(); cb = PEM_def_callback;
else ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0);
ui_method = allocated_ui_method = UI_UTIL_wrap_read_pem_callback(cb, 0);
if (ui_method == NULL) if (ui_method == NULL)
return NULL; return NULL;