[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  984cff6ba52655cf8242b3ef6b4e97a5e8b33266 (commit)
      from  b4378fd6a250cd4c57d78e6df48ef5c0ca08ed86 (commit)


- Log -----------------------------------------------------------------
commit 984cff6ba52655cf8242b3ef6b4e97a5e8b33266
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Nov 14 12:09:42 2019 +0100

    UI_UTIL_wrap_read_pem_callback(): when |cb| is NULL, use PEM_def_callback
    
    Fixes #10444
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10447)
    
    (cherry picked from commit 72a5412b4858cc7c5627a121f78685a2a4065521)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ui/ui_util.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 <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;
 }