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 fd50a8e730438f71a9d1ab699fe83c9f239ff17c..6dba48d8ad105ac2ccbf00b81d02c4134b5c57f5 100644 (file)
--- 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 e74f8e4d4778bf9f948b9195df7252bccc617cbd..6103d4db39e52721e17923d365b74484957aaeb1 100644 (file)
--- 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); 
             }