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

more tls in memory certs doc + bump file format

Browse Source
This commit is contained in:
Benjamin Sergeant
2020-04-24 15:50:39 -07:00
parent 9f770b10c0
commit 2802cad8c4
7 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ixwebsocket/IXSocketMbedTLS.cpp
View File

@ -1,6 +1,6 @@
/*
* IXSocketMbedTLS.cpp
* Author: Benjamin Sergeant
* Author: Benjamin Sergeant, Max Weisel
* Copyright (c) 2019-2020 Machine Zone, Inc. All rights reserved.
*
* Some code taken from

2
ixwebsocket/IXSocketOpenSSL.cpp
View File

@ -1,6 +1,6 @@
/*
* IXSocketOpenSSL.cpp
* Author: Benjamin Sergeant, Matt DeBoer
* Author: Benjamin Sergeant, Matt DeBoer, Max Weisel
* Copyright (c) 2017-2020 Machine Zone, Inc. All rights reserved.
*
* Adapted from Satori SDK OpenSSL code.

3
ixwebsocket/IXSocketTLSOptions.cpp
View File

@ -15,6 +15,7 @@ namespace ix
const char* kTLSCAFileUseSystemDefaults = "SYSTEM";
const char* kTLSCAFileDisableVerify = "NONE";
const char* kTLSCiphersUseDefault = "DEFAULT";
const char* kTLSInMemoryMarker = "-----BEGIN CERTIFICATE-----";
bool SocketTLSOptions::isValid() const
{
@ -60,7 +61,7 @@ namespace ix
bool SocketTLSOptions::isUsingInMemoryCAs() const
{
return caFile.find("-----BEGIN CERTIFICATE-----") != std::string::npos;
return caFile.find(kTLSInMemoryMarker) != std::string::npos;
}
bool SocketTLSOptions::isPeerVerifyDisabled() const

2
ixwebsocket/IXWebSocketVersion.h
View File

@ -6,4 +6,4 @@
#pragma once
#define IX_WEBSOCKET_VERSION "9.3.3"
#define IX_WEBSOCKET_VERSION "9.4.0"