[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c901bccec6f747467e1af31473655c8290e32309 (commit)
      from  4984448648f69ed4425df68900b1fd6f17c6c271 (commit)


- Log -----------------------------------------------------------------
commit c901bccec6f747467e1af31473655c8290e32309
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)

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

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 a9acd98..00ad2b6 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -429,6 +429,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
             {
                 char tmp_num[10];
                 BIO_snprintf(tmp_num, sizeof(tmp_num) - 1, "%d", errno);