use ssl_asn1_table_keyfmt() function

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

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 56237c0658f087614c47d9b02f86aa98e5869d89..35c29968da2aff419c9169de29c84283942735d3 100644 (file)
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -336,12 +336,12 @@ void ssl_pphrase_Handle(server_rec *s, apr_pool_t *p)
                  * are used to give a better idea as to what failed.
                  */
                 if (pkey_mtime) {
-                    const char *key_types[] = {"RSA", "DSA", NULL};
+                    const char *key_types[] = {"RSA", "DSA"};
                     int i;
 
-                    for (i=0; key_types[i]; i++) {
-                        char *key_id =
-                            apr_psprintf(p, "%s:%s", cpVHostID, key_types[i]);
+                    for (i=0; i < SSL_AIDX_MAX; i++) {
+                        const char *key_id =
+                            ssl_asn1_table_keyfmt(p, cpVHostID, i);
                         ssl_asn1_t *asn1 = 
                             ssl_asn1_table_get(mc->tPrivateKey, key_id);