The branch master has been updated
via 082394839ea32386abc7ee33aaa9da864287064c (commit)
from 88b15ed9a54c591c3962149560d4f851322a54c4 (commit)
- Log -----------------------------------------------------------------
commit 082394839ea32386abc7ee33aaa9da864287064c
Author: Maxim Zakharov <[email protected]>
Date: Fri May 8 14:58:10 2020 +1000
TTY_get() in crypto/ui/ui_openssl.c open_console() can also return errno 1
(EPERM, Linux)
Signed-off-by: Maxim Zakharov <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/11767)
-----------------------------------------------------------------------
Summary of changes:
crypto/ui/ui_openssl.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index cf873431f7..e41a719e65 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -435,6 +435,16 @@ static int open_console(UI *ui)
is_a_tty = 0;
else
# endif
+# ifdef EPERM
+ /*
+ * Linux can return EPERM (Operation not permitted),
+ * e.g. if a daemon executes openssl via fork()+execve()
+ * This should be ok
+ */
+ if (errno == EPERM)
+ is_a_tty = 0;
+ else
+# endif
# ifdef ENODEV
/*
* MacOS X returns ENODEV (Operation not supported by device),
