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

revert r1352596, for the reasons explained in

Browse Source 
https://mail-archives.apache.org/mod_mbox/httpd-dev/201304.mbox/%3C515FED7C.5010009%40velox.ch%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1468131 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kaspar Brand
2013-04-15 15:56:07 +00:00
parent 4ffceed48e
commit 1c780f18be
5 changed files with 4 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/ssl/ssl_engine_init.c
View File

@@ -1022,8 +1022,7 @@ static void ssl_init_ctx(server_rec *s,
static int ssl_server_import_cert(server_rec *s,
modssl_ctx_t *mctx,
const char *id,
int idx,
const char *authz_file)
int idx)
{
SSLModConfigRec *mc = myModConfig(s);
ssl_asn1_t *asn1;
@@ -1062,24 +1061,6 @@ static int ssl_server_import_cert(server_rec *s,
}
#endif
if (authz_file) {
#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x10002000L
if (!SSL_CTX_use_authz_file(mctx->ssl_ctx, authz_file)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Unable to initialize TLS authz extension");
ssl_log_ssl_error(SSLLOG_MARK, APLOG_ERR, s);
ssl_die(s);
}
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, "Set %s authz_file to %s",
type, authz_file);
#else
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Unable to initialize TLS authz extension: "
"OpenSSL version too low");
ssl_die(s);
#endif
}
mctx->pks->certs[idx] = cert;
return TRUE;
@@ -1217,13 +1198,10 @@ static void ssl_init_server_certs(server_rec *s,
ecc_id = ssl_asn1_table_keyfmt(ptemp, vhost_id, SSL_AIDX_ECC);
#endif
have_rsa = ssl_server_import_cert(s, mctx, rsa_id, SSL_AIDX_RSA,
mctx->rsa_authz_file);
have_dsa = ssl_server_import_cert(s, mctx, dsa_id, SSL_AIDX_DSA,
mctx->dsa_authz_file);
have_rsa = ssl_server_import_cert(s, mctx, rsa_id, SSL_AIDX_RSA);
have_dsa = ssl_server_import_cert(s, mctx, dsa_id, SSL_AIDX_DSA);
#ifndef OPENSSL_NO_EC
have_ecc = ssl_server_import_cert(s, mctx, ecc_id, SSL_AIDX_ECC,
mctx->ec_authz_file);
have_ecc = ssl_server_import_cert(s, mctx, ecc_id, SSL_AIDX_ECC);
#endif
if (!(have_rsa || have_dsa