Commit 840ec64e authored by Doug MacEachern's avatar Doug MacEachern
Browse files

add ssl_asn1_table_keyfmt() function for clarity 


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

mod_ssl.h

+3 −0
Changes for mod_ssl.h: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -713,6 +713,9 @@ 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_table_keyfmt(apr_pool_t *p,

                                  const char *id,

                                  int keytype);

/*  Mutex Support  */

int          ssl_mutex_init(server_rec *, apr_pool_t *);

int          ssl_mutex_reinit(server_rec *, apr_pool_t *);

ssl_util.c

+14 −0
Changes for ssl_util.c: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -373,6 +373,20 @@ void ssl_asn1_table_unset(apr_hash_t *table, 
    apr_hash_set(table, key, klen, NULL);

}



static const char *ssl_asn1_key_types[] = {"RSA", "DSA"};



const char *ssl_asn1_table_keyfmt(apr_pool_t *p,

                                  const char *id,

                                  int keytype)

{

    if (keytype >= SSL_AIDX_MAX) {

        return NULL;

    }



    return apr_pstrcat(p, id, ":",

                       ssl_asn1_key_types[keytype], NULL);

}



#if APR_HAS_THREADS

/*

 * To ensure thread-safetyness in OpenSSL - work in progress