diff options
author | Stefan Eissing <icing@apache.org> | 2021-04-20 12:16:05 +0000 |
---|---|---|
committer | Stefan Eissing <icing@apache.org> | 2021-04-20 12:16:05 +0000 |
commit | 8951949163612ad2f4ec936ac4a61154af0edce3 (patch) | |
tree | 80de0386c95cc48d3ea06a4f82606c5bded9aa10 /include/http_ssl.h | |
parent | 4754347970e03e5181a6618db158f509693ed280 (diff) | |
download | httpd-8951949163612ad2f4ec936ac4a61154af0edce3.tar.gz |
core/ap_ssl_*: changes after review by rpluem
- removed no longer needed (char*) casts when looking
up ssl variables.
- move 'goto cleanup;' on separate source line
- fixed check for wrong optional function in ap_run_ssl_var_lookup
- remove ap_bytes_t again from httpd.h and passes now ocsp
identifier as separate const char* and apr_size_t. This
follows more how such data is passed in the rest of the
server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1889009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_ssl.h')
-rw-r--r-- | include/http_ssl.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/http_ssl.h b/include/http_ssl.h index d238439e9a..556a58bdb7 100644 --- a/include/http_ssl.h +++ b/include/http_ssl.h @@ -200,7 +200,8 @@ AP_DECLARE(void) ap_setup_ssl_optional_fns(apr_pool_t *pool); * @return OK iff stapling is being provided */ AP_DECLARE_HOOK(int, ssl_ocsp_prime_hook, (server_rec *s, apr_pool_t *p, - const ap_bytes_t *id, const char *pem)) + const char *id, apr_size_t id_len, + const char *pem)) /** * Registering a certificate for Provisioning of OCSP responses. It is the caller's @@ -218,7 +219,7 @@ AP_DECLARE_HOOK(int, ssl_ocsp_prime_hook, (server_rec *s, apr_pool_t *p, * APR_ENOENT when no provided was found or took responsibility. */ AP_DECLARE(apr_status_t) ap_ssl_ocsp_prime(server_rec *s, apr_pool_t *p, - const ap_bytes_t *id, + const char *id, apr_size_t id_len, const char *pem); /** @@ -242,7 +243,7 @@ typedef void ap_ssl_ocsp_copy_resp(const unsigned char *der, apr_size_t der_len, * @return OK iff response data has been provided, DECLINED otherwise */ AP_DECLARE_HOOK(int, ssl_ocsp_get_resp_hook, - (server_rec *s, conn_rec *c, const ap_bytes_t *id, + (server_rec *s, conn_rec *c, const char *id, apr_size_t id_len, ap_ssl_ocsp_copy_resp *cb, void *userdata)) /** @@ -268,7 +269,7 @@ AP_DECLARE_HOOK(int, ssl_ocsp_get_resp_hook, * @return APR_SUCCESS iff data has been provided */ AP_DECLARE(apr_status_t) ap_ssl_ocsp_get_resp(server_rec *s, conn_rec *c, - const ap_bytes_t *id, + const char *id, apr_size_t id_len, ap_ssl_ocsp_copy_resp *cb, void *userdata); #ifdef __cplusplus |