From bc1c3f3d88bc1fd89620f7299552ffae1f140c4c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 22 Oct 2003 15:04:11 +0000 Subject: [PATCH] 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@101515 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_pphrase.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c index f83a9899b9..35b7764124 100644 --- a/modules/ssl/ssl_engine_pphrase.c +++ b/modules/ssl/ssl_engine_pphrase.c @@ -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); -- 2.50.1