diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-24 08:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-24 08:47:28 +0200 |
| commit | 35d15484fea001dbe167b675098159a95e2da19b (patch) | |
| tree | b50a3585879436dac6a1b76430eee851d237842e /modules/openssl/stream_peer_openssl.h | |
| parent | 9b3215b97730d6ceb3a9e30711642d66cf81afd0 (diff) | |
| parent | 00c03bdd2b27b1d0214a451e545fefc9affad93c (diff) | |
Merge pull request #11528 from QuLogic/openssl110
Add support for OpenSSL 1.1.0.
Diffstat (limited to 'modules/openssl/stream_peer_openssl.h')
| -rw-r--r-- | modules/openssl/stream_peer_openssl.h | 5 |
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); |