mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
Introduce a number of SSLC hints to mod_ssl, including the following
type overrides; MODSSL_CLIENT_CERT_CB_ARG_TYPE MODSSL_PCHAR_CAST (for a host of non-void/const sslc values) modssl_read_bio_cb_fn (for several callbacks with same prototypes) Declare callback functions appropriately. And protect us from indetermineant toolkits with #error "Unrecognized SSL Toolkit!" git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99183 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -638,7 +638,7 @@ int ssl_hook_Access(request_rec *r)
|
||||
* we put it back here for the purpose of quick_renegotiation.
|
||||
*/
|
||||
cert_stack = sk_new_null();
|
||||
sk_X509_push(cert_stack, cert);
|
||||
sk_X509_push(cert_stack, MODSSL_PCHAR_CAST cert);
|
||||
}
|
||||
|
||||
if (!cert_stack || (sk_X509_num(cert_stack) == 0)) {
|
||||
@@ -1531,7 +1531,7 @@ static void modssl_proxy_info_log(server_rec *s,
|
||||
*pkey = info->x_pkey->dec_pkey; \
|
||||
EVP_PKEY_reference_inc(*pkey)
|
||||
|
||||
int ssl_callback_proxy_cert(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
|
||||
int ssl_callback_proxy_cert(SSL *ssl, MODSSL_CLIENT_CERT_CB_ARG_TYPE **x509, EVP_PKEY **pkey)
|
||||
{
|
||||
conn_rec *c = (conn_rec *)SSL_get_app_data(ssl);
|
||||
server_rec *s = c->base_server;
|
||||
|
Reference in New Issue
Block a user