diff options
| author | Stefan Eissing <icing@apache.org> | 2021-03-03 15:52:18 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2021-03-03 15:52:18 +0000 |
| commit | 695140822068a20a7016b26b2c2c41f45efbac68 (patch) | |
| tree | 4ca2a76f75aca7e5edd31de08d62b41a22e571a3 /server/protocol.c | |
| parent | 33af74c29fbd85890f1f6e6454a81bab7a01de41 (diff) | |
| download | httpd-695140822068a20a7016b26b2c2c41f45efbac68.tar.gz | |
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
Diffstat (limited to 'server/protocol.c')
| -rw-r--r-- | server/protocol.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/protocol.c b/server/protocol.c index 4ce2b6172a..d18ca01b95 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -2717,9 +2717,9 @@ AP_DECLARE(apr_status_t) ap_ssl_add_fallback_cert_files(server_rec *s, apr_pool_ } AP_DECLARE(int) ap_ssl_answer_challenge(conn_rec *c, const char *server_name, - const char **pcert_file, const char **pkey_file) + const char **pcert_pem, const char **pkey_pem) { - return (ap_run_ssl_answer_challenge(c, server_name, pcert_file, pkey_file) == OK); + return (ap_run_ssl_answer_challenge(c, server_name, pcert_pem, pkey_pem) == OK); } AP_IMPLEMENT_HOOK_VOID(pre_read_request, @@ -2761,6 +2761,6 @@ AP_IMPLEMENT_HOOK_RUN_ALL(int, ssl_add_fallback_cert_files, apr_array_header_t *cert_files, apr_array_header_t *key_files), (s, p, cert_files, key_files), OK, DECLINED) AP_IMPLEMENT_HOOK_RUN_FIRST(int, ssl_answer_challenge, - (conn_rec *c, const char *server_name, const char **pcert_file, const char **pkey_file), - (c, server_name, pcert_file, pkey_file), DECLINED) + (conn_rec *c, const char *server_name, const char **pcert_pem, const char **pkey_pem), + (c, server_name, pcert_pem, pkey_pem), DECLINED) |