1 files changed, 2 insertions, 3 deletions

diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c
index ef930bf247..8446673ed4 100644
--- a/src/lib/libcrypto/ui/ui_openssl.c
+++ b/src/lib/libcrypto/ui/ui_openssl.c
@@ -396,7 +396,8 @@ static void read_till_nl(FILE *in)
         char buf[SIZE+1];
 
         do      {
-                fgets(buf,SIZE,in);
+                if (fgets(buf,sizeof(buf),in) == NULL)
+                        break;
                 } while (strchr(buf,'\n') == NULL);
         }
 
@@ -677,8 +678,6 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
                 size--;
 #ifdef WIN16TTY
                 i=_inchar();
-#elif defined(_WIN32)
-                i=_getch();
 #else
                 i=getch();
 #endif