diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/websocketpp/openssl_110.patch | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/websocketpp/openssl_110.patch')
| -rw-r--r-- | ports/websocketpp/openssl_110.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/ports/websocketpp/openssl_110.patch b/ports/websocketpp/openssl_110.patch deleted file mode 100644 index 93f4302e0..000000000 --- a/ports/websocketpp/openssl_110.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp -index 7b32db8..37173b7 100644 ---- a/websocketpp/transport/asio/security/tls.hpp -+++ b/websocketpp/transport/asio/security/tls.hpp -@@ -355,7 +355,13 @@ protected: - template <typename ErrorCodeType> - lib::error_code translate_ec(ErrorCodeType ec) { - if (ec.category() == lib::asio::error::get_ssl_category()) { -- if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) { -+ if ( -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ -+#else -+ false -+#endif -+ ) { - return make_error_code(transport::error::tls_short_read); - } else { - // We know it is a TLS related error, but otherwise don't know |