mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
RFC 5878 support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1352596 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -125,6 +125,10 @@ static void modssl_ctx_init(modssl_ctx_t *mctx)
|
||||
mctx->crl_file = NULL;
|
||||
mctx->crl_check_mode = SSL_CRLCHECK_UNSET;
|
||||
|
||||
mctx->rsa_authz_file = NULL;
|
||||
mctx->dsa_authz_file = NULL;
|
||||
mctx->ec_authz_file = NULL;
|
||||
|
||||
mctx->auth.ca_cert_path = NULL;
|
||||
mctx->auth.ca_cert_file = NULL;
|
||||
mctx->auth.cipher_suite = NULL;
|
||||
@@ -257,6 +261,10 @@ static void modssl_ctx_cfg_merge(modssl_ctx_t *base,
|
||||
cfgMerge(crl_file, NULL);
|
||||
cfgMerge(crl_check_mode, SSL_CRLCHECK_UNSET);
|
||||
|
||||
cfgMergeString(rsa_authz_file);
|
||||
cfgMergeString(dsa_authz_file);
|
||||
cfgMergeString(ec_authz_file);
|
||||
|
||||
cfgMergeString(auth.ca_cert_path);
|
||||
cfgMergeString(auth.ca_cert_file);
|
||||
cfgMergeString(auth.cipher_suite);
|
||||
@@ -840,6 +848,54 @@ const char *ssl_cmd_SSLPKCS7CertificateFile(cmd_parms *cmd,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char *ssl_cmd_SSLRSAAuthzFile(cmd_parms *cmd,
|
||||
void *dcfg,
|
||||
const char *arg)
|
||||
{
|
||||
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
|
||||
const char *err;
|
||||
|
||||
if ((err = ssl_cmd_check_file(cmd, &arg))) {
|
||||
return err;
|
||||
}
|
||||
|
||||
sc->server->rsa_authz_file = arg;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char *ssl_cmd_SSLDSAAuthzFile(cmd_parms *cmd,
|
||||
void *dcfg,
|
||||
const char *arg)
|
||||
{
|
||||
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
|
||||
const char *err;
|
||||
|
||||
if ((err = ssl_cmd_check_file(cmd, &arg))) {
|
||||
return err;
|
||||
}
|
||||
|
||||
sc->server->dsa_authz_file = arg;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char *ssl_cmd_SSLECAuthzFile(cmd_parms *cmd,
|
||||
void *dcfg,
|
||||
const char *arg)
|
||||
{
|
||||
SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
|
||||
const char *err;
|
||||
|
||||
if ((err = ssl_cmd_check_file(cmd, &arg))) {
|
||||
return err;
|
||||
}
|
||||
|
||||
sc->server->ec_authz_file = arg;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef HAVE_TLS_SESSION_TICKETS
|
||||
const char *ssl_cmd_SSLSessionTicketKeyFile(cmd_parms *cmd,
|
||||
void *dcfg,
|
||||
|
Reference in New Issue
Block a user