mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-18 16:53:02 +08:00
[websocketpp] Add patch for openssl 1.1.0 compatibility
This commit is contained in:
parent
bc18ea6622
commit
1fb5313a88
@ -1,4 +1,4 @@
|
||||
Source: websocketpp
|
||||
Version: 0.7.0
|
||||
Version: 0.7.0-1
|
||||
Build-Depends: zlib, openssl, boost
|
||||
Description: Library that implements RFC6455 The WebSocket Protocol
|
19
ports/websocketpp/openssl_110.patch
Normal file
19
ports/websocketpp/openssl_110.patch
Normal file
@ -0,0 +1,19 @@
|
||||
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
|
@ -9,6 +9,12 @@ vcpkg_download_distfile(ARCHIVE
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
${CMAKE_CURRENT_LIST_DIR}/openssl_110.patch
|
||||
)
|
||||
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
|
||||
|
||||
# Put the license file where vcpkg expects it
|
||||
|
Loading…
Reference in New Issue
Block a user