Commit ca6816a0 authored by Rainer Jung's avatar Rainer Jung
Browse files

Support for OpenSSL 1.1.0 

- ab

Backport of r1728907 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755813 13f79535-47bb-0310-9956-ffa450edef68
parent f009e753

support/ab.c

+6 −0
Original line number Diff line number Diff line
@@ -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();