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

use ssl_asn1_table_keyfmt() function and only format each (rsa,dsa)

Browse Source 
lookup key once, rather than twice.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93911 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2002-03-13 18:51:35 +00:00
parent 98786b66c7
commit 9432ed4273
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
modules/ssl/ssl_engine_init.c
View File

@@ -395,7 +395,8 @@ void ssl_init_ConfigureServer(server_rec *s,
{ {
SSLModConfigRec *mc = myModConfig(s); SSLModConfigRec *mc = myModConfig(s);
int verify = SSL_VERIFY_NONE; int verify = SSL_VERIFY_NONE;
char *cp, *vhost_id; char *cp;
const char *vhost_id, *rsa_id, *dsa_id;
EVP_PKEY *pkey; EVP_PKEY *pkey;
SSL_CTX *ctx; SSL_CTX *ctx;
STACK_OF(X509_NAME) *ca_list; STACK_OF(X509_NAME) *ca_list;
@@ -611,9 +612,10 @@ void ssl_init_ConfigureServer(server_rec *s,
/* /*
* Configure server certificate(s) * Configure server certificate(s)
*/ */
cp = apr_psprintf(p, "%s:RSA", vhost_id); rsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_RSA);
dsa_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_DSA);
if ((asn1 = ssl_asn1_table_get(mc->tPublicCert, cp))) { if ((asn1 = ssl_asn1_table_get(mc->tPublicCert, rsa_id))) {
ssl_log(s, SSL_LOG_TRACE, ssl_log(s, SSL_LOG_TRACE,
"Init: (%s) Configuring RSA server certificate", "Init: (%s) Configuring RSA server certificate",
vhost_id); vhost_id);
@@ -638,9 +640,7 @@ void ssl_init_ConfigureServer(server_rec *s,
ok = TRUE; ok = TRUE;
} }
cp = apr_psprintf(p, "%s:DSA", vhost_id); if ((asn1 = ssl_asn1_table_get(mc->tPublicCert, dsa_id))) {
if ((asn1 = ssl_asn1_table_get(mc->tPublicCert, cp))) {
ssl_log(s, SSL_LOG_TRACE, ssl_log(s, SSL_LOG_TRACE,
"Init: (%s) Configuring DSA server certificate", "Init: (%s) Configuring DSA server certificate",
vhost_id); vhost_id);
@@ -737,9 +737,8 @@ void ssl_init_ConfigureServer(server_rec *s,
* Configure server private key(s) * Configure server private key(s)
*/ */
ok = FALSE; ok = FALSE;
cp = apr_psprintf(p, "%s:RSA", vhost_id);
if ((asn1 = ssl_asn1_table_get(mc->tPrivateKey, cp))) { if ((asn1 = ssl_asn1_table_get(mc->tPrivateKey, rsa_id))) {
ssl_log(s, SSL_LOG_TRACE, ssl_log(s, SSL_LOG_TRACE,
"Init: (%s) Configuring RSA server private key", "Init: (%s) Configuring RSA server private key",
vhost_id); vhost_id);
@@ -764,9 +763,7 @@ void ssl_init_ConfigureServer(server_rec *s,
ok = TRUE; ok = TRUE;
} }
cp = apr_psprintf(p, "%s:DSA", vhost_id); if ((asn1 = ssl_asn1_table_get(mc->tPrivateKey, dsa_id))) {
if ((asn1 = ssl_asn1_table_get(mc->tPrivateKey, cp))) {
ssl_log(s, SSL_LOG_TRACE, ssl_log(s, SSL_LOG_TRACE,
"Init: (%s) Configuring DSA server private key", "Init: (%s) Configuring DSA server private key",
vhost_id); vhost_id);