root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

UI_UTIL_wrap_read_pem_callback(): when |cb| is NULL, use PEM_def_callback 

Fixes #10444

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10447)
This commit is contained in:
Richard Levitte 2019-11-14 12:09:42 +01:00
parent 3478a2102e
commit 72a5412b48
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/ui/ui_util.c
View File

@ -8,6 +8,7 @@
*/
#include <string.h>
#include <openssl/pem.h> /* 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;
}