kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to use OpenSSL on apple platforms.

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-29 15:34:58 -07:00
parent 3a91894d62
commit 28c4b83ab9
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ixwebsocket/IXSocketFactory.cpp
View File

@ -10,12 +10,12 @@
#ifdef IXWEBSOCKET_USE_MBED_TLS
#include <ixwebsocket/IXSocketMbedTLS.h>
#elif __APPLE__
#include <ixwebsocket/IXSocketAppleSSL.h>
#elif defined(_WIN32)
#include <ixwebsocket/IXSocketSChannel.h>
#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
#include <ixwebsocket/IXSocketOpenSSL.h>
#elif __APPLE__
#include <ixwebsocket/IXSocketAppleSSL.h>
#endif
#else
@ -42,12 +42,12 @@ namespace ix
#ifdef IXWEBSOCKET_USE_TLS
#if defined(IXWEBSOCKET_USE_MBED_TLS)
socket = std::make_shared<SocketMbedTLS>(tlsOptions);
#elif defined(__APPLE__)
socket = std::make_shared<SocketAppleSSL>(tlsOptions);
#elif defined(IXWEBSOCKET_USE_OPEN_SSL)
socket = std::make_shared<SocketOpenSSL>(tlsOptions);
#elif defined(_WIN32)
socket = std::make_shared<SocketSChannel>(tlsOptions);
#else
socket = std::make_shared<SocketOpenSSL>(tlsOptions);
#elif defined(__APPLE__)
socket = std::make_shared<SocketAppleSSL>(tlsOptions);
#endif
#else
errorMsg = "TLS support is not enabled on this platform.";

2
ixwebsocket/IXWebSocketVersion.h
View File

@ -6,4 +6,4 @@
#pragma once
#define IX_WEBSOCKET_VERSION "6.3.0"
#define IX_WEBSOCKET_VERSION "6.3.1"