From c1403df74abfe9979259d9c8d216e28fd6b71a4d Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Fri, 8 May 2020 09:31:53 -0700 Subject: [PATCH] (cmake) default TLS back to mbedtls on Windows Universal Platform --- CMakeLists.txt | 5 +++++ docs/CHANGELOG.md | 4 ++++ ixwebsocket/IXWebSocketVersion.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d640df41..5df926cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,11 @@ if (USE_TLS) if (NOT USE_MBED_TLS AND NOT USE_OPEN_SSL) # unless we want something else set(USE_SECURE_TRANSPORT ON) endif() + # default to mbedtls on uwp (universal windows platform) if nothing is configured + elseif (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + if (NOT USE_OPEN_SSL) # unless we want something else + set(USE_MBED_TLS ON) + endif() else() # default to OpenSSL on all other platforms if (NOT USE_MBED_TLS) # Unless mbedtls is requested set(USE_OPEN_SSL ON) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 11419815..746f0658 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All changes to this project will be documented in this file. +## [9.5.7] - 2020-05-08 + +(cmake) default TLS back to mbedtls on Windows Universal Platform + ## [9.5.6] - 2020-05-06 (cobra bots) add a --heartbeat_timeout option to specify when the bot should terminate because no events are received diff --git a/ixwebsocket/IXWebSocketVersion.h b/ixwebsocket/IXWebSocketVersion.h index 6977e475..cc4b859a 100644 --- a/ixwebsocket/IXWebSocketVersion.h +++ b/ixwebsocket/IXWebSocketVersion.h @@ -6,4 +6,4 @@ #pragma once -#define IX_WEBSOCKET_VERSION "9.5.6" +#define IX_WEBSOCKET_VERSION "9.5.7"