From: Andy Polyakov <appro@openssl.org>
Date: Mon, 1 Aug 2016 08:48:13 +0000 (+0200)
Subject: crypto/ui/ui_openssl.c: let new-line through after query in Windows path.
X-Git-Tag: OpenSSL_1_1_0~222
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6ebce6803eccc29d00b8b15a858872a1b94d0cf0;p=oweals%2Fopenssl.git

crypto/ui/ui_openssl.c: let new-line through after query in Windows path.

Originally new-line was suppressed, because double new-line was
observed under wine. But it appears rather to be a wine bug,
because on real Windows new-line is much needed.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 7d1e389de0..98fb0e192e 100644
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -313,7 +313,6 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
                 wresult[numread-2] == L'\r' && wresult[numread-1] == L'\n') {
                 wresult[numread-2] = L'\n';
                 numread--;
-                echo_eol = 0;
             }
             wresult[numread] = '\0';
             if (WideCharToMultiByte(CP_UTF8, 0, wresult, -1,
@@ -329,7 +328,6 @@ static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
                 result[numread-2] == '\r' && result[numread-1] == '\n') {
                 result[numread-2] = '\n';
                 numread--;
-                echo_eol = 0;
             }
             result[numread] = '\0';
             p = result;