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

move server cert/key initialization to ssl_init_server_certs function

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94258 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-28 02:36:05 +00:00
parent 44f93970ac
commit 972e8bdafe
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
modules/ssl/ssl_engine_init.c
View File

@@ -808,45 +808,16 @@ static void ssl_check_public_cert(server_rec *s,
} }
} }
/* static void ssl_init_server_certs(server_rec *s,
* Configure a particular server apr_pool_t *p,
*/ apr_pool_t *ptemp,
void ssl_init_ConfigureServer(server_rec *s, SSLSrvConfigRec *sc)
apr_pool_t *p,
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{ {
const char *rsa_id, *dsa_id; const char *rsa_id, *dsa_id;
const char *vhost_id = sc->szVHostID; const char *vhost_id = sc->szVHostID;
SSL_CTX *ctx;
int i; int i;
int have_rsa, have_dsa; int have_rsa, have_dsa;
ssl_init_check_server(s, p, ptemp, sc);
ctx = ssl_init_ctx(s, p, ptemp, sc);
ssl_init_session_cache_ctx(s, p, ptemp, sc);
ssl_init_verify(s, p, ptemp, sc);
ssl_init_cipher_suite(s, p, ptemp, sc);
ssl_init_crl(s, p, ptemp, sc);
ssl_init_cert_chain(s, p, ptemp, sc);
SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
SSL_CTX_set_tmp_dh_callback(ctx, ssl_callback_TmpDH);
if (sc->nLogLevel >= SSL_LOG_INFO) {
/* this callback only logs if SSLLogLevel >= info */
SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
}
/*
* Configure server certificate(s)
*/
rsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_RSA); rsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_RSA);
dsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_DSA); dsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_DSA);
@@ -876,6 +847,41 @@ void ssl_init_ConfigureServer(server_rec *s,
} }
} }
/*
* Configure a particular server
*/
void ssl_init_ConfigureServer(server_rec *s,
apr_pool_t *p,
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
SSL_CTX *ctx;
ssl_init_check_server(s, p, ptemp, sc);
ctx = ssl_init_ctx(s, p, ptemp, sc);
ssl_init_session_cache_ctx(s, p, ptemp, sc);
ssl_init_verify(s, p, ptemp, sc);
ssl_init_cipher_suite(s, p, ptemp, sc);
ssl_init_crl(s, p, ptemp, sc);
ssl_init_cert_chain(s, p, ptemp, sc);
SSL_CTX_set_tmp_rsa_callback(ctx, ssl_callback_TmpRSA);
SSL_CTX_set_tmp_dh_callback(ctx, ssl_callback_TmpDH);
if (sc->nLogLevel >= SSL_LOG_INFO) {
/* this callback only logs if SSLLogLevel >= info */
SSL_CTX_set_info_callback(ctx, ssl_callback_LogTracingState);
}
ssl_init_server_certs(s, p, ptemp, sc);
}
void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p) void ssl_init_CheckServers(server_rec *base_server, apr_pool_t *p)
{ {
server_rec *s, *ps; server_rec *s, *ps;