From: Paul J. Reder <rederpj@apache.org>
Date: Wed, 1 May 2002 19:28:52 +0000 (+0000)
Subject: Fix a case where an invalid pass phrase is entered and an
X-Git-Tag: 2.0.37~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a243a466e804b178c4abf7d12c5e81efd21d39a;p=apache

Fix a case where an invalid pass phrase is entered and an
error message is given, but the prompt is not shown again.
This left the user in an ambiguous state.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94896 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index fd50a8e730..6dba48d8ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.0.37
 
 Changes with Apache 2.0.36
 
+  *) Fix a case where an invalid pass phrase is entered and an
+     error message is given, but the prompt is not shown again.
+     This left the user in an ambiguous state. [Paul J. Reder]
+
   *) Close sockets on worker MPM when doing a graceless restart.
      [Aaron Bannert]
 
diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index e74f8e4d47..6103d4db39 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -732,9 +732,9 @@ int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify, void *srv)
          * (see crypto/pem/pem_lib.c:def_callback() for details)
          */
         prompt = "Enter pass phrase:";
-        apr_file_puts(prompt, writetty);
 
         for (;;) {
+            apr_file_puts(prompt, writetty);
             if (sc->server->pphrase_dialog_type == SSL_PPTYPE_PIPE) {
                 i = pipe_get_passwd_cb(buf, bufsize, "", FALSE); 
             }