diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-09-08 12:20:16 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-09-08 12:20:16 +0000 |
| commit | 5d7c48237a36e3c5bfe3d939e404f6dd3ae784fe (patch) | |
| tree | e560482cb13534744ab69b0b680d47eff548389c /support | |
| parent | 8a61107f4aa77580f3293e5a00b2b869b3717f1f (diff) | |
| download | httpd-5d7c48237a36e3c5bfe3d939e404f6dd3ae784fe.tar.gz | |
Merge r1803392, r1803396, r1803398 from trunk:
mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined. PR 61206.
Submitted by: Michael Schlenker <msc contact.de>
mod_ssl, ab: compatibility with LibreSSL. PR 61184.
LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with
all of the latest OpenSSL 1.1 API.
Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for
anything but OpenSSL >= 1.1 (for now).
Proposed by: Bernard Spil <brnrd freebsd.org>
Reviewed by: ylavic
Follow up to r1803396: CHANGES entry.
Reviewed by: ylavic, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1807734 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support')
| -rw-r--r-- | support/ab.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/support/ab.c b/support/ab.c index daba92e83d..0d0cf1125f 100644 --- a/support/ab.c +++ b/support/ab.c @@ -197,6 +197,14 @@ typedef STACK_OF(X509) X509_STACK_TYPE; #if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_set_tlsext_host_name) #define HAVE_TLSEXT #endif +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2060000f +#define SSL_CTRL_SET_MIN_PROTO_VERSION 123 +#define SSL_CTRL_SET_MAX_PROTO_VERSION 124 +#define SSL_CTX_set_min_proto_version(ctx, version) \ + SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL) +#define SSL_CTX_set_max_proto_version(ctx, version) \ + SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL) +#endif #endif #include <math.h> |