From: Richard Levitte Date: Thu, 14 Nov 2019 11:09:42 +0000 (+0100) Subject: UI_UTIL_wrap_read_pem_callback(): when |cb| is NULL, use PEM_def_callback X-Git-Tag: OpenSSL_1_1_1e~131 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=984cff6ba52655cf8242b3ef6b4e97a5e8b33266;p=oweals%2Fopenssl.git UI_UTIL_wrap_read_pem_callback(): when |cb| is NULL, use PEM_def_callback Fixes #10444 Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10447) (cherry picked from commit 72a5412b4858cc7c5627a121f78685a2a4065521) --- diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c index 6a37b6d287..32a3c4e38d 100644 --- a/crypto/ui/ui_util.c +++ b/crypto/ui/ui_util.c @@ -8,6 +8,7 @@ */ #include +#include /* PEM_def_callback() */ #include "internal/thread_once.h" #include "ui_local.h" @@ -156,7 +157,7 @@ UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag) return NULL; } data->rwflag = rwflag; - data->cb = cb; + data->cb = cb != NULL ? cb : PEM_def_callback; return ui_method; }