Skip to content

Commit 2c6c1ed

Browse files
committed
(tls) add a simple description of the TLS configuration routine for debugging
1 parent 9799e7e commit 2c6c1ed

5 files changed

+21
-1
lines changed

docs/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [7.6.3] - 2019-12-20
5+
6+
(tls) add a simple description of the TLS configuration routine for debugging
7+
48
## [7.6.2] - 2019-12-20
59

610
(mbedtls) correct support for using own certificate and private key

ixcobra/ixcobra/IXCobraMetricsThreadedPublisher.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ namespace ix
9898
{
9999
_channel = channel;
100100

101+
ix::IXCoreLogger::Log(socketTLSOptions.getDescription().c_str());
102+
101103
ix::WebSocketPerMessageDeflateOptions webSocketPerMessageDeflateOptions(enablePerMessageDeflate);
102104
_cobra_connection.configure(appkey, endpoint,
103105
rolename, rolesecret,

ixwebsocket/IXSocketTLSOptions.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <assert.h>
1010
#include <fstream>
11+
#include <sstream>
1112

1213
namespace ix
1314
{
@@ -71,4 +72,15 @@ namespace ix
7172
{
7273
return _errMsg;
7374
}
75+
76+
std::string SocketTLSOptions::getDescription() const
77+
{
78+
std::stringstream ss;
79+
ss << "TLS Options:" << std::endl;
80+
ss << " certFile = " << certFile << std::endl;
81+
ss << " keyFile = " << keyFile << std::endl;
82+
ss << " caFile = " << caFile << std::endl;
83+
ss << " ciphers = " << ciphers << std::endl;
84+
return ss.str();
85+
}
7486
} // namespace ix

ixwebsocket/IXSocketTLSOptions.h

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ namespace ix
4343

4444
const std::string& getErrorMsg() const;
4545

46+
std::string getDescription() const;
47+
4648
private:
4749
mutable std::string _errMsg;
4850
mutable bool _validated = false;

ixwebsocket/IXWebSocketVersion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
#pragma once
88

9-
#define IX_WEBSOCKET_VERSION "7.6.2"
9+
#define IX_WEBSOCKET_VERSION "7.6.3"

0 commit comments

Comments
 (0)