summaryrefslogtreecommitdiff
path: root/modules/openssl/stream_peer_openssl.h
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-09-24 01:45:02 -0400
committerElliott Sales de Andrade <quantum.analyst@gmail.com>2017-09-24 02:11:02 -0400
commit00c03bdd2b27b1d0214a451e545fefc9affad93c (patch)
treeb50a3585879436dac6a1b76430eee851d237842e /modules/openssl/stream_peer_openssl.h
parent9b3215b97730d6ceb3a9e30711642d66cf81afd0 (diff)
Add support for OpenSSL 1.1.0.
This release hides many struct members which provides easier forward compatibility but is a break from previous releases. A few small macros provide compatibility between both 1.1.0 and 1.0.x. Fixes #8624.
Diffstat (limited to 'modules/openssl/stream_peer_openssl.h')
-rw-r--r--modules/openssl/stream_peer_openssl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h
index 1e445ef681..535114058d 100644
--- a/modules/openssl/stream_peer_openssl.h
+++ b/modules/openssl/stream_peer_openssl.h
@@ -53,7 +53,12 @@ private:
static int _bio_gets(BIO *b, char *buf, int len);
static int _bio_puts(BIO *b, const char *str);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ static BIO_METHOD *_bio_method;
+#else
static BIO_METHOD _bio_method;
+#endif
+ static BIO_METHOD *_get_bio_method();
static bool _match_host_name(const char *name, const char *hostname);
static Error _match_common_name(const char *hostname, const X509 *server_cert);