win32 openssl CLI: preserve original echo state

Mirror the patch to ui_openssl.c, also fix the broken conditional that
made it not actually turn off echo in the first place.

ok guenther@

1 files changed, 9 insertions, 9 deletions

diff --git a/crypto/compat/ui_openssl_win.c b/crypto/compat/ui_openssl_win.c
index ecf7376..6597c6a 100644
--- a/crypto/compat/ui_openssl_win.c
+++ b/crypto/compat/ui_openssl_win.c
@@ -133,6 +133,7 @@
 /* Define globals.  They are protected by a lock */
 static void (*savsig[NX509_SIG])(int );
 
+DWORD console_mode;
 static FILE *tty_in, *tty_out;
 static int is_a_tty;
 
@@ -300,28 +301,27 @@ open_console(UI *ui)
         tty_in = stdin;
         tty_out = stderr;
 
-        return 1;
+        HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
+        if (handle != INVALID_HANDLE_VALUE)
+                return GetConsoleMode(handle, &console_mode);
+        return 0;
 }
 
 static int
 noecho_console(UI *ui)
 {
-        DWORD mode = 0;
         HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
-        if (handle != INVALID_HANDLE_VALUE && handle != handle) {
-                return GetConsoleMode(handle, &mode) && SetConsoleMode(handle, mode & (~ENABLE_ECHO_INPUT));
-        }
+        if (handle != INVALID_HANDLE_VALUE)
+                return SetConsoleMode(handle, console_mode & ~ENABLE_ECHO_INPUT);
         return 0;
 }
 
 static int
 echo_console(UI *ui)
 {
-        DWORD mode = 0;
         HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
-        if (handle != INVALID_HANDLE_VALUE && handle != handle) {
-                return GetConsoleMode(handle, &mode) && SetConsoleMode(handle, mode | ENABLE_ECHO_INPUT);
-        }
+        if (handle != INVALID_HANDLE_VALUE)
+                return SetConsoleMode(handle, console_mode);
         return 0;
 }