From: Rainer Jung <rjung@apache.org>
Date: Sun, 7 Feb 2016 01:03:15 +0000 (+0000)
Subject: Support for OpenSSL 1.1.0
X-Git-Tag: 2.5.0-alpha~2180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=967edd55810e5b3b520dd8df0f7da783420698eb;p=thirdparty%2Fapache%2Fhttpd.git

Support for OpenSSL 1.1.0
- ab


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

diff --git a/support/ab.c b/support/ab.c
index 44e55040b99..ea6bccb0073 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -2352,10 +2352,12 @@ int main(int argc, const char * const argv[])
             case 'f':
                 if (strncasecmp(opt_arg, "ALL", 3) == 0) {
                     meth = SSLv23_client_method();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
 #ifndef OPENSSL_NO_SSL2
                 } else if (strncasecmp(opt_arg, "SSL2", 4) == 0) {
                     meth = SSLv2_client_method();
 #endif
+#endif
 #ifndef OPENSSL_NO_SSL3
                 } else if (strncasecmp(opt_arg, "SSL3", 4) == 0) {
                     meth = SSLv3_client_method();
@@ -2413,7 +2415,11 @@ int main(int argc, const char * const argv[])
 #ifdef RSAREF
     R_malloc_init();
 #else
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
     CRYPTO_malloc_init();
+#else
+    OPENSSL_malloc_init();
+#endif
 #endif
     SSL_load_error_strings();
     SSL_library_init();