Commit f4d7c621 authored by Joe Orton's avatar Joe Orton
Browse files

Fix a cosmetic issue where OpenSSL 0.9.7 will dump the error stack 

during pass phrase entry.

* ssl_engine_pphrase.c (ssl_pphrase_Handle): Clear the OpenSSL error
stack before reading the private key.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@101515 13f79535-47bb-0310-9956-ffa450edef68
parent ac8c3031

ssl_engine_pphrase.c

+4 −0
Original line number Diff line number Diff line
@@ -374,6 +374,10 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p) 
                cpPassPhraseCur = NULL;

                ssl_pphrase_server_rec = s; /* to make up for sslc flaw */



                /* Ensure that the error stack is empty; otherwise the

                 * OpenSSL UI code may dump it to stderr. */

                ERR_clear_error();



                bReadable = ((pPrivateKey = SSL_read_PrivateKey(szPath, NULL,

                            ssl_pphrase_Handle_CB, s)) != NULL ? TRUE : FALSE);