mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +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:
@@ -402,8 +402,18 @@ const char *ssl_asn1_table_keyfmt(apr_pool_t *p,
|
||||
static apr_thread_mutex_t **lock_cs;
|
||||
static int lock_num_locks;
|
||||
|
||||
#ifdef SSLC_VERSION_NUMBER
|
||||
#if SSLC_VERSION_NUMBER >= 0x2000
|
||||
static int ssl_util_thr_lock(int mode, int type,
|
||||
const char *file, int line)
|
||||
#else
|
||||
static void ssl_util_thr_lock(int mode, int type,
|
||||
const char *file, int line)
|
||||
#endif
|
||||
#else
|
||||
static void ssl_util_thr_lock(int mode, int type,
|
||||
const char *file, int line)
|
||||
#endif
|
||||
{
|
||||
if (type < lock_num_locks) {
|
||||
if (mode & CRYPTO_LOCK) {
|
||||
@@ -412,6 +422,14 @@ static void ssl_util_thr_lock(int mode, int type,
|
||||
else {
|
||||
apr_thread_mutex_unlock(lock_cs[type]);
|
||||
}
|
||||
#ifdef HAVE_SSLC
|
||||
#if SSLC_VERSION_NUMBER > 0x2000
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
return -1;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user