add ssl_asn1_keystr() util function that returns string representation

(RSA or DSA) of the key index.

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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 39a7261973e120608f74c62cfa46e2c2ddd6c5b8..3e372191a90ec4b3856eaf5b40fafd9251cedf62 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -713,6 +713,8 @@ ssl_asn1_t *ssl_asn1_table_get(apr_hash_t *table,
 void ssl_asn1_table_unset(apr_hash_t *table,
                           const char *key);
 
+const char *ssl_asn1_keystr(int keytype);
+
 const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
                                   const char *id,
                                   int keytype);

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 4555f934e298fa8973348a65b787f4a82d260337..1fa18ae27cf22791617fda8e7faf57c2e1d1ef53 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -375,18 +375,25 @@ void ssl_asn1_table_unset(apr_hash_t *table,
 
 static const char *ssl_asn1_key_types[] = {"RSA", "DSA"};
 
-const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
-                                  const char *id,
-                                  int keytype)
+const char *ssl_asn1_keystr(int keytype)
 {
     if (keytype >= SSL_AIDX_MAX) {
         return NULL;
     }
 
-    return apr_pstrcat(p, id, ":",
-                       ssl_asn1_key_types[keytype], NULL);
+    return ssl_asn1_key_types[keytype];
 }
 
+const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
+                                  const char *id,
+                                  int keytype)
+{
+    const char *keystr = ssl_asn1_keystr(keytype);
+
+    return apr_pstrcat(p, id, ":", keystr, NULL);
+}
+
+
 #if APR_HAS_THREADS
 /*
  * To ensure thread-safetyness in OpenSSL - work in progress