[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  10a50374bfcff8fd27e8b39a0de20869d64ca346 (commit)
      from  78a3e80a31b9c2b66bd8e1d33903d386915aefbb (commit)


- Log -----------------------------------------------------------------
commit 10a50374bfcff8fd27e8b39a0de20869d64ca346
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Dec 7 20:28:43 2016 +0100

    UI_OpenSSL()'s session opener fails on MacOS X
    
    If on a non-tty stdin, TTY_get() will fail with errno == ENODEV.
    We didn't catch that.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2039)
    (cherry picked from commit c901bccec6f747467e1af31473655c8290e32309)

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

Summary of changes:
 crypto/ui/ui_openssl.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 377384b..17d14f5 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -509,6 +509,15 @@ static int open_console(UI *ui)
             is_a_tty = 0;
         else
 # endif
+# ifdef ENODEV
+            /*
+             * MacOS X returns ENODEV (Operation not supported by device),
+             * which seems appropriate.
+             */
+        if (errno == ENODEV)
+            is_a_tty = 0;
+        else
+# endif
             return 0;
     }
 #endif