From 6f0892895546881d0ddb49a6e7d868c8bc411061 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 28 Feb 2002 00:10:52 +0000 Subject: [PATCH] add ssl_asn1_table_get() wrapper and change ssl_init_TmpKeysHandle() to use it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93613 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.h | 3 +++ modules/ssl/ssl_engine_ds.c | 6 ++++++ modules/ssl/ssl_engine_init.c | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index 7871e86665..99cfb6895c 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -745,6 +745,9 @@ unsigned char *ssl_asn1_table_set(apr_hash_t *table, const void *key, long int length); +ssl_asn1_t *ssl_asn1_table_get(apr_hash_t *table, + const void *key); + void ssl_asn1_table_unset(apr_hash_t *table, const void *key); diff --git a/modules/ssl/ssl_engine_ds.c b/modules/ssl/ssl_engine_ds.c index 2702d20a8f..403fdc45ec 100644 --- a/modules/ssl/ssl_engine_ds.c +++ b/modules/ssl/ssl_engine_ds.c @@ -231,6 +231,12 @@ unsigned char *ssl_asn1_table_set(apr_hash_t *table, return asn1->cpData; /* caller will assign a value to this */ } +ssl_asn1_t *ssl_asn1_table_get(apr_hash_t *table, + const void *key) +{ + return (ssl_asn1_t *)apr_hash_get(table, key, APR_HASH_KEY_STRING); +} + void ssl_asn1_table_unset(apr_hash_t *table, const void *key) { diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 4876502ec4..18a01ddd95 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -338,7 +338,7 @@ void ssl_init_TmpKeysHandle(int action, server_rec *s, apr_pool_t *p) ssl_log(s, SSL_LOG_INFO, "Init: Configuring temporary RSA private keys (512/1024 bits)"); /* allocate 512 bit RSA key */ - if ((asn1 = (ssl_asn1_t *)apr_hash_get(mc->tTmpKeys, "RSA:512", APR_HASH_KEY_STRING)) != NULL) { + if ((asn1 = ssl_asn1_table_get(mc->tTmpKeys, "RSA:512")) != NULL) { ucp = asn1->cpData; if ((mc->pTmpKeys[SSL_TKPIDX_RSA512] = (void *)d2i_RSAPrivateKey(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { @@ -348,7 +348,7 @@ void ssl_init_TmpKeysHandle(int action, server_rec *s, apr_pool_t *p) } /* allocate 1024 bit RSA key */ - if ((asn1 = (ssl_asn1_t *)apr_hash_get(mc->tTmpKeys, "RSA:1024", APR_HASH_KEY_STRING)) != NULL) { + if ((asn1 = ssl_asn1_table_get(mc->tTmpKeys, "RSA:1024")) != NULL) { ucp = asn1->cpData; if ((mc->pTmpKeys[SSL_TKPIDX_RSA1024] = (void *)d2i_RSAPrivateKey(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { @@ -360,7 +360,7 @@ void ssl_init_TmpKeysHandle(int action, server_rec *s, apr_pool_t *p) ssl_log(s, SSL_LOG_INFO, "Init: Configuring temporary DH parameters (512/1024 bits)"); /* allocate 512 bit DH param */ - if ((asn1 = (ssl_asn1_t *)apr_hash_get(mc->tTmpKeys, "DH:512", APR_HASH_KEY_STRING)) != NULL) { + if ((asn1 = ssl_asn1_table_get(mc->tTmpKeys, "DH:512")) != NULL) { ucp = asn1->cpData; if ((mc->pTmpKeys[SSL_TKPIDX_DH512] = (void *)d2i_DHparams(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { @@ -370,7 +370,7 @@ void ssl_init_TmpKeysHandle(int action, server_rec *s, apr_pool_t *p) } /* allocate 1024 bit DH param */ - if ((asn1 = (ssl_asn1_t *)apr_hash_get(mc->tTmpKeys, "DH:512", APR_HASH_KEY_STRING)) != NULL) { + if ((asn1 = ssl_asn1_table_get(mc->tTmpKeys, "DH:1024")) != NULL) { ucp = asn1->cpData; if ((mc->pTmpKeys[SSL_TKPIDX_DH1024] = (void *)d2i_DHparams(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { -- 2.50.1