2nd arg to SSL_set_cipher_list in sslc is char *

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94205 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index f26a3ffb90fe8922b2b966a81571945e40cb8c40..5e89e758e3cca8c3acaa6801d6fa89e121b2aae2 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -410,7 +410,7 @@ int ssl_hook_Access(request_rec *r)
         }
 
         /* configure new state */
-        if (!SSL_set_cipher_list(ssl, dc->szCipherSuite)) {
+        if (!modssl_set_cipher_list(ssl, dc->szCipherSuite)) {
             ssl_log(r->server, SSL_LOG_WARN|SSL_ADD_SSLERR,
                     "Unable to reconfigure (per-directory) "
                     "permitted SSL ciphers");

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 6b225d83087165f268c84e1f01b784873db69178..2a415ba71491035219942b8e1bb0f78bfe027cd9 100644 (file)
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -57,11 +57,16 @@
 
 #define modssl_X509_verify_cert(c) X509_verify_cert(c, NULL)
 
+#define modssl_set_cipher_list SSL_set_cipher_list
+
 /* XXX: add configure check */
 #ifndef HAVE_SSL_SET_STATE
 #define SSL_set_state(ssl, state)
 #endif
 
+#define modssl_set_cipher_list(ssl, l) \
+   SSL_set_cipher_list(ssl, (char *)l)
+
 #if SSLC_VERSION < 0x2000
 
 #define X509_STORE_CTX_set_depth(st, d)