From 58f5f4157bc3533ed7cace90e4e9a89e19497cba Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 7 Dec 2016 20:28:43 +0100 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/2039) (cherry picked from commit c901bccec6f747467e1af31473655c8290e32309) --- 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 cd25a6d971..1965d1e19d 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -423,6 +423,15 @@ static int open_console(UI *ui) if (errno == EINVAL) 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]; -- 2.25.1