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

RFC 5878 support.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1352596 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ben Laurie
2012-06-21 16:17:41 +00:00
parent 17c0d7a6ad
commit d79a70a76a
5 changed files with 101 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/ssl/ssl_engine_init.c
View File

@@ -1002,7 +1002,8 @@ 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)
int idx,
const char *authz_file)
{
SSLModConfigRec *mc = myModConfig(s);
ssl_asn1_t *asn1;
@@ -1041,6 +1042,24 @@ 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;
@@ -1223,10 +1242,13 @@ 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);
have_dsa = ssl_server_import_cert(s, mctx, dsa_id, SSL_AIDX_DSA);
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);
#ifndef OPENSSL_NO_EC
have_ecc = ssl_server_import_cert(s, mctx, ecc_id, SSL_AIDX_ECC);
have_ecc = ssl_server_import_cert(s, mctx, ecc_id, SSL_AIDX_ECC,
mctx->ec_authz_file);
#endif
if (!(have_rsa || have_dsa