diff options
| author | Rainer Jung <rjung@apache.org> | 2016-02-07 01:03:15 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-02-07 01:03:15 +0000 |
| commit | 967edd55810e5b3b520dd8df0f7da783420698eb (patch) | |
| tree | 5baf219511714b3c227e6ed9c8aa04f1a7febc4d /support/ab.c | |
| parent | 97b57ec0b08519e61e18fa7a5eb58432e72ec647 (diff) | |
| download | httpd-967edd55810e5b3b520dd8df0f7da783420698eb.tar.gz | |
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
Diffstat (limited to 'support/ab.c')
| -rw-r--r-- | support/ab.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/support/ab.c b/support/ab.c index 44e55040b9..ea6bccb007 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(); |