Commit b19c0842 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

for the sake of readablity, 

change: SSL_TKPIDX_{DH,RSA}{512,1024}
to:     SSL_TMP_KEY_{DH,RSA}_{512,1024}


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

mod_ssl.h

+6 −6
Changes for mod_ssl.h: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -299,11 +299,11 @@ typedef int ssl_algo_t; 
 * Define IDs for the temporary RSA keys and DH params

 */



#define SSL_TKPIDX_RSA512  (0)

#define SSL_TKPIDX_RSA1024 (1)

#define SSL_TKPIDX_DH512   (2)

#define SSL_TKPIDX_DH1024  (3)

#define SSL_TKPIDX_MAX     (4)

#define SSL_TMP_KEY_RSA_512  (0)

#define SSL_TMP_KEY_RSA_1024 (1)

#define SSL_TMP_KEY_DH_512   (2)

#define SSL_TMP_KEY_DH_1024  (3)

#define SSL_TMP_KEY_MAX      (4)



/*

 * Define the SSL options
@@ -513,7 +513,7 @@ typedef struct { 
    apr_lock_t     *pMutex;

    apr_array_header_t   *aRandSeed;

    apr_hash_t     *tVHostKeys;

    void           *pTmpKeys[SSL_TKPIDX_MAX];

    void           *pTmpKeys[SSL_TMP_KEY_MAX];

    apr_hash_t     *tPublicCert;

    apr_hash_t     *tPrivateKey;

#ifdef SSL_EXPERIMENTAL_ENGINE

ssl_engine_init.c

+6 −6
Changes for ssl_engine_init.c: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static void ssl_init_SSLLibrary(server_rec *s) 
    }



#define MODSSL_TMP_KEYS_FREE(mc, type) \

    MODSSL_TMP_KEY_FREE(mc, type, SSL_TKPIDX_##type##512); \

    MODSSL_TMP_KEY_FREE(mc, type, SSL_TKPIDX_##type##1024)

    MODSSL_TMP_KEY_FREE(mc, type, SSL_TMP_KEY_##type##_512); \

    MODSSL_TMP_KEY_FREE(mc, type, SSL_TMP_KEY_##type##_1024)



static void ssl_tmp_keys_free(server_rec *s)

{
@@ -153,7 +153,7 @@ static void ssl_tmp_keys_init(server_rec *s, apr_pool_t *p) 
            "Init: Generating temporary RSA private keys (512/1024 bits)");



    /* generate 512 bit RSA key */

    if (!(mc->pTmpKeys[SSL_TKPIDX_RSA512] = 

    if (!(mc->pTmpKeys[SSL_TMP_KEY_RSA_512] = 

          RSA_generate_key(512, RSA_F4, NULL, NULL)))

    {

        ssl_log(s, SSL_LOG_ERROR,
@@ -163,7 +163,7 @@ static void ssl_tmp_keys_init(server_rec *s, apr_pool_t *p) 
    }



    /* generate 1024 bit RSA key */

    if (!(mc->pTmpKeys[SSL_TKPIDX_RSA1024] = 

    if (!(mc->pTmpKeys[SSL_TMP_KEY_RSA_1024] = 

          RSA_generate_key(1024, RSA_F4, NULL, NULL)))

    {

        ssl_log(s, SSL_LOG_ERROR,
@@ -177,7 +177,7 @@ static void ssl_tmp_keys_init(server_rec *s, apr_pool_t *p) 
            "DH parameters (512/1024 bits)");



    /* generate 512 bit DH param */

    if (!(mc->pTmpKeys[SSL_TKPIDX_DH512] = 

    if (!(mc->pTmpKeys[SSL_TMP_KEY_DH_512] = 

          ssl_dh_GetTmpParam(512)))

    {

        ssl_log(s, SSL_LOG_ERROR,
@@ -187,7 +187,7 @@ static void ssl_tmp_keys_init(server_rec *s, apr_pool_t *p) 
    }



    /* generate 1024 bit DH param */

    if (!(mc->pTmpKeys[SSL_TKPIDX_DH1024] = 

    if (!(mc->pTmpKeys[SSL_TMP_KEY_DH_1024] = 

          ssl_dh_GetTmpParam(1024)))

    {

        ssl_log(s, SSL_LOG_ERROR,

ssl_engine_kernel.c

+8 −8
Changes for ssl_engine_kernel.c: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -1226,19 +1226,19 @@ RSA *ssl_callback_TmpRSA(SSL *ssl, int export, int keylen) 
    if (export) {

        /* It's because an export cipher is used */

        if (keylen == 512) {

            rsa = (RSA *)mc->pTmpKeys[SSL_TKPIDX_RSA512];

            rsa = (RSA *)mc->pTmpKeys[SSL_TMP_KEY_RSA_512];

        }

        else if (keylen == 1024) {

            rsa = (RSA *)mc->pTmpKeys[SSL_TKPIDX_RSA1024];

            rsa = (RSA *)mc->pTmpKeys[SSL_TMP_KEY_RSA_1024];

        }

        else {

            /* it's too expensive to generate on-the-fly, so keep 1024bit */

            rsa = (RSA *)mc->pTmpKeys[SSL_TKPIDX_RSA1024];

            rsa = (RSA *)mc->pTmpKeys[SSL_TMP_KEY_RSA_1024];

        }

    }

    else {

        /* It's because a sign-only certificate situation exists */

        rsa = (RSA *)mc->pTmpKeys[SSL_TKPIDX_RSA1024];

        rsa = (RSA *)mc->pTmpKeys[SSL_TMP_KEY_RSA_1024];

    }



    return rsa;
@@ -1256,19 +1256,19 @@ DH *ssl_callback_TmpDH(SSL *ssl, int export, int keylen) 
    if (export) {

        /* It's because an export cipher is used */

        if (keylen == 512) {

            dh = (DH *)mc->pTmpKeys[SSL_TKPIDX_DH512];

            dh = (DH *)mc->pTmpKeys[SSL_TMP_KEY_DH_512];

        }

        else if (keylen == 1024) {

            dh = (DH *)mc->pTmpKeys[SSL_TKPIDX_DH1024];

            dh = (DH *)mc->pTmpKeys[SSL_TMP_KEY_DH_1024];

        }

        else {

            /* it's too expensive to generate on-the-fly, so keep 1024bit */

            dh = (DH *)mc->pTmpKeys[SSL_TKPIDX_DH1024];

            dh = (DH *)mc->pTmpKeys[SSL_TMP_KEY_DH_1024];

        }

    }

    else {

        /* It's because a sign-only certificate situation exists */

        dh = (DH *)mc->pTmpKeys[SSL_TKPIDX_DH1024];

        dh = (DH *)mc->pTmpKeys[SSL_TMP_KEY_DH_1024];

    }



    return dh;