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

for the sake of readablity,

Browse Source 
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@93883 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-12 23:05:33 +00:00
parent 52ff7b736e
commit d9d26c6b82
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ssl/ssl_engine_init.c
View File

@ -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,