mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Changed ap_ssl_answer_challenge() and its hook to provide PEM data for
certificate and key instead of file names. Added support for this in mod_ssl and verified with a local mod_md version that uses it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1887151 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -199,12 +199,12 @@ static void ssl_add_version_components(apr_pool_t *ptemp, apr_pool_t *pconf,
|
||||
|
||||
int ssl_is_challenge(conn_rec *c, const char *servername,
|
||||
X509 **pcert, EVP_PKEY **pkey,
|
||||
const char **pcert_file, const char **pkey_file)
|
||||
const char **pcert_pem, const char **pkey_pem)
|
||||
{
|
||||
*pcert = NULL;
|
||||
*pkey = NULL;
|
||||
*pcert_file = *pkey_file = NULL;
|
||||
if (ap_ssl_answer_challenge(c, servername, pcert_file, pkey_file)) {
|
||||
*pcert_pem = *pkey_pem = NULL;
|
||||
if (ap_ssl_answer_challenge(c, servername, pcert_pem, pkey_pem)) {
|
||||
return 1;
|
||||
}
|
||||
else if (OK == ssl_run_answer_challenge(c, servername, pcert, pkey)) {
|
||||
|
Reference in New Issue
Block a user