[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  226e6a2cf2797aed7ed59eeb05858b5a7491a0ad (commit)
      from  1766493bbd92cfcee6fca068ffe972092d43892c (commit)


- Log -----------------------------------------------------------------
commit 226e6a2cf2797aed7ed59eeb05858b5a7491a0ad
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Sep 19 21:33:45 2018 +0200

    crypto/ui/ui_openssl.c: make sure to recognise ENXIO and EIO too
    
    These both indicate that the file descriptor we're trying to use as a
    terminal isn't, in fact, a terminal.
    
    Fixes #7271
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7272)
    
    (cherry picked from commit 276bf8620ce35a613c856f2b70348f65ffe94067)

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

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

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 45d4820..6b99613 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -415,6 +415,24 @@ static int open_console(UI *ui)
             is_a_tty = 0;
         else
 #  endif
+#  ifdef ENXIO
+            /*
+             * Solaris can return ENXIO.
+             * This should be ok
+             */
+        if (errno == ENXIO)
+            is_a_tty = 0;
+        else
+#  endif
+#  ifdef EIO
+            /*
+             * Linux can return EIO.
+             * This should be ok
+             */
+        if (errno == EIO)
+            is_a_tty = 0;
+        else
+#  endif
 #  ifdef ENODEV
             /*
              * MacOS X returns ENODEV (Operation not supported by device),