Return-Path: Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 6073 invoked by uid 500); 1 May 2002 17:24:51 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 6059 invoked from network); 1 May 2002 17:24:51 -0000 Message-ID: <3CD024DF.7060604@remulak.net> Date: Wed, 01 May 2002 13:24:47 -0400 From: "Paul J. Reder" User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.2.1) Gecko/20010901 X-Accept-Language: en-us MIME-Version: 1.0 To: "Apache Dev." Subject: [Patch]: SSL passphrase prompt after error. Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Is there any reason we can't alter the following code (from ssl_engine_pphrase.c around line 730) to move the "apr_file_puts(prompt, writetty);" inside the for statement so that on errors the prompt is reprinted? This is to answer bug number 8320 (an empty passphrase results in an ambiguous state when an error is displayed, but no new prompt). If there are no complaints, I'll commit this patch this afternoon. Index: httpd-2.0/modules/ssl/ssl_engine_pphrase.c =================================================================== RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_pphrase.c,v retrieving revision 1.35 diff -u -r1.35 ssl_engine_pphrase.c --- httpd-2.0/modules/ssl/ssl_engine_pphrase.c 28 Mar 2002 18:50:07 -0000 1.35 +++ httpd-2.0/modules/ssl/ssl_engine_pphrase.c 1 May 2002 17:20:26 -0000 @@ -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); } -- Paul J. Reder ----------------------------------------------------------- "The strength of the Constitution lies entirely in the determination of each citizen to defend it. Only if every single citizen feels duty bound to do his share in this defense are the constitutional rights secure." -- Albert Einstein