The short term hack.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89806 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index aa8e86637611921eff769a63f3e7ba31253d2576..c4799dad7364b234d711e3b806deca6dc1cf4155 100644 (file)
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -207,6 +207,14 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
             if (sc->szPrivateKeyFile[j] != NULL)
                 apr_cpystrn(szPath, sc->szPrivateKeyFile[j++], sizeof(szPath));
 
+            if (sc->szPrivateKeyFile[j] == NULL) {
+                ssl_log(pServ, SSL_LOG_ERROR,
+                        "Init: Server %s should be SSL-aware but "
+                        "too few private key files were specified "
+                        "[Hint: SSLCertificateKeyFile]", cpVHostID);
+                ssl_die();
+            }
+
             /*
              * Try to read the private key file with the help of
              * the callback function which serves the pass
@@ -228,7 +236,7 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
             nPassPhraseDialogCur  = 0;
             bPassPhraseDialogOnce = TRUE;
 
-                       pPrivateKey = NULL;
+            pPrivateKey = NULL;
 
             for (;;) {
                 /*