diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-09-19 21:33:45 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-09-20 06:43:02 +0200 |
| commit | ad1730359220cef5903d16c7f58b602fc3713414 (patch) | |
| tree | f58fce2c90fedd83253298b78e0c913aca9dfe55 /crypto | |
| parent | ae59efc2f60bd839fe80ef50d889c74c4afbb703 (diff) | |
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@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7272)
(cherry picked from commit 276bf8620ce35a613c856f2b70348f65ffe94067)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ui/ui_openssl.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index bfe93a57f1..a25934ccd1 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -436,6 +436,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), |