From: Doug MacEachern <dougm@apache.org>
Date: Wed, 13 Mar 2002 18:50:17 +0000 (+0000)
Subject: use ssl_asn1_table_keyfmt() function
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=070f67c04929f12701ff98452eb11a071a7d9392;p=thirdparty%2Fapache%2Fhttpd.git

use ssl_asn1_table_keyfmt() function


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

diff --git a/ssl_engine_pphrase.c b/ssl_engine_pphrase.c
index 56237c0658f..35c29968da2 100644
--- a/ssl_engine_pphrase.c
+++ b/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);