httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rede...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_pphrase.c
Date Wed, 01 May 2002 19:28:52 GMT
rederpj     02/05/01 12:28:52

  Modified:    .        CHANGES
               modules/ssl ssl_engine_pphrase.c
  Log:
  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.
  
  Revision  Changes    Path
  1.752     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.751
  retrieving revision 1.752
  diff -u -r1.751 -r1.752
  --- CHANGES	1 May 2002 10:37:42 -0000	1.751
  +++ CHANGES	1 May 2002 19:28:51 -0000	1.752
  @@ -2,6 +2,10 @@
   
   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]
   
  
  
  
  1.36      +1 -1      httpd-2.0/modules/ssl/ssl_engine_pphrase.c
  
  Index: ssl_engine_pphrase.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ssl_engine_pphrase.c	28 Mar 2002 18:50:07 -0000	1.35
  +++ ssl_engine_pphrase.c	1 May 2002 19:28:52 -0000	1.36
  @@ -732,9 +732,9 @@
            * (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); 
               }  
  
  
  

Mime
View raw message