[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  e8d3f50249a7bd7a80a585830a318635834f435d (commit)
      from  e00fa4ee53e05fac63b5a25f8e9ea71a1ec59c33 (commit)


- Log -----------------------------------------------------------------
commit e8d3f50249a7bd7a80a585830a318635834f435d
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 26 15:27:54 2018 +0200

    Fix no-ui
    
    In a recent commit, a OPENSSL_NO_UI guard was dropped by mistake in
    PEM_def_callback(), so this puts it back.  At the same time, that
    previous commit got rid of the necessity to have a OPENSSL_NO_STDIO
    guard, so we drop that instead.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6096)

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

Summary of changes:
 crypto/pem/pem_lib.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 04d374b..fdf2b00 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -30,8 +30,11 @@ int pem_check_suffix(const char *pem_str, const char *suffix);
 
 int PEM_def_callback(char *buf, int num, int rwflag, void *userdata)
 {
-    int i, min_len;
+    int i;
+#ifndef OPENSSL_NO_UI
+    int min_len;
     const char *prompt;
+#endif
 
     /* We assume that the user passes a default password as userdata */
     if (userdata) {
@@ -41,7 +44,7 @@ int PEM_def_callback(char *buf, int num, int rwflag, void *userdata)
         return i;
     }
 
-#if defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_UI)
+#ifdef OPENSSL_NO_UI
     PEMerr(PEM_F_PEM_DEF_CALLBACK, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
     return -1;
 #else