www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

add ssl_asn1_table_get() wrapper and change ssl_init_TmpKeysHandle()

Browse Source 
to use it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93613 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-02-28 00:10:52 +00:00
parent d6a76369d5
commit 01b903dfc4
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ssl/mod_ssl.h
View File

@@ -745,6 +745,9 @@ unsigned char *ssl_asn1_table_set(apr_hash_t *table,
const void *key, const void *key,
long int length); 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, void ssl_asn1_table_unset(apr_hash_t *table,
const void *key); const void *key);

6
modules/ssl/ssl_engine_ds.c
View File

@@ -231,6 +231,12 @@ unsigned char *ssl_asn1_table_set(apr_hash_t *table,
return asn1->cpData; /* caller will assign a value to this */ 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, void ssl_asn1_table_unset(apr_hash_t *table,
const void *key) const void *key)
{ {

8
modules/ssl/ssl_engine_init.c
View File

@@ -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)"); ssl_log(s, SSL_LOG_INFO, "Init: Configuring temporary RSA private keys (512/1024 bits)");
/* allocate 512 bit RSA key */ /* 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; ucp = asn1->cpData;
if ((mc->pTmpKeys[SSL_TKPIDX_RSA512] = if ((mc->pTmpKeys[SSL_TKPIDX_RSA512] =
(void *)d2i_RSAPrivateKey(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { (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 */ /* 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; ucp = asn1->cpData;
if ((mc->pTmpKeys[SSL_TKPIDX_RSA1024] = if ((mc->pTmpKeys[SSL_TKPIDX_RSA1024] =
(void *)d2i_RSAPrivateKey(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { (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)"); ssl_log(s, SSL_LOG_INFO, "Init: Configuring temporary DH parameters (512/1024 bits)");
/* allocate 512 bit DH param */ /* 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; ucp = asn1->cpData;
if ((mc->pTmpKeys[SSL_TKPIDX_DH512] = if ((mc->pTmpKeys[SSL_TKPIDX_DH512] =
(void *)d2i_DHparams(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { (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 */ /* 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; ucp = asn1->cpData;
if ((mc->pTmpKeys[SSL_TKPIDX_DH1024] = if ((mc->pTmpKeys[SSL_TKPIDX_DH1024] =
(void *)d2i_DHparams(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) { (void *)d2i_DHparams(NULL, SSL_UCP_CAST(&ucp), asn1->nData)) == NULL) {