Commit 7996ee92 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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/modules/ssl@93613 13f79535-47bb-0310-9956-ffa450edef68
parent cc078aae

mod_ssl.h

+3 −0
Changes for mod_ssl.h: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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);

ssl_engine_ds.c

+6 −0
Changes for ssl_engine_ds.c: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)

{

ssl_engine_init.c

+4 −4
Changes for ssl_engine_init.c: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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) {