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

clang-format

Browse Source
This commit is contained in:
Benjamin Sergeant 2019-09-30 17:52:39 -07:00
parent e023dd9c36
commit 0539d2df2e
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ixwebsocket/IXHttpClient.h
View File

@ -8,8 +8,8 @@
#include "IXHttp.h" #include "IXHttp.h"
#include "IXSocket.h" #include "IXSocket.h"
#include "IXWebSocketHttpHeaders.h"
#include "IXSocketTLSOptions.h" #include "IXSocketTLSOptions.h"
#include "IXWebSocketHttpHeaders.h"
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <condition_variable> #include <condition_variable>

19
ixwebsocket/IXSocketOpenSSL.cpp
View File

@ -245,8 +245,7 @@ namespace ix
ERR_clear_error(); ERR_clear_error();
if (_tlsOptions.hasCertAndKey()) if (_tlsOptions.hasCertAndKey())
{ {
if (SSL_CTX_use_certificate_chain_file(_ssl_context, if (SSL_CTX_use_certificate_chain_file(_ssl_context, _tlsOptions.certFile.c_str()) != 1)
_tlsOptions.certFile.c_str()) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" + errMsg = "OpenSSL failed - SSL_CTX_use_certificate_chain_file(\"" +
@ -257,8 +256,8 @@ namespace ix
_ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1) _ssl_context, _tlsOptions.keyFile.c_str(), SSL_FILETYPE_PEM) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" + errMsg = "OpenSSL failed - SSL_CTX_use_PrivateKey_file(\"" + _tlsOptions.keyFile +
_tlsOptions.keyFile + "\") failed: "; "\") failed: ";
errMsg += ERR_error_string(sslErr, nullptr); errMsg += ERR_error_string(sslErr, nullptr);
} }
else if (!SSL_CTX_check_private_key(_ssl_context)) else if (!SSL_CTX_check_private_key(_ssl_context))
@ -287,8 +286,8 @@ namespace ix
_ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1) _ssl_context, _tlsOptions.caFile.c_str(), NULL) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + errMsg = "OpenSSL failed - SSL_CTX_load_verify_locations(\"" + _tlsOptions.caFile +
_tlsOptions.caFile + "\") failed: "; "\") failed: ";
errMsg += ERR_error_string(sslErr, nullptr); errMsg += ERR_error_string(sslErr, nullptr);
return false; return false;
} }
@ -308,8 +307,8 @@ namespace ix
if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1) if (SSL_CTX_set_cipher_list(_ssl_context, kDefaultCiphers.c_str()) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + kDefaultCiphers +
kDefaultCiphers + "\") failed: "; "\") failed: ";
errMsg += ERR_error_string(sslErr, nullptr); errMsg += ERR_error_string(sslErr, nullptr);
return false; return false;
} }
@ -317,8 +316,8 @@ namespace ix
else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1) else if (SSL_CTX_set_cipher_list(_ssl_context, _tlsOptions.ciphers.c_str()) != 1)
{ {
auto sslErr = ERR_get_error(); auto sslErr = ERR_get_error();
errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + errMsg = "OpenSSL failed - SSL_CTX_set_cipher_list(\"" + _tlsOptions.ciphers +
_tlsOptions.ciphers + "\") failed: "; "\") failed: ";
errMsg += ERR_error_string(sslErr, nullptr); errMsg += ERR_error_string(sslErr, nullptr);
return false; return false;
} }

2
ws/ws_http_client.cpp
View File

@ -7,8 +7,8 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <ixwebsocket/IXHttpClient.h> #include <ixwebsocket/IXHttpClient.h>
#include <ixwebsocket/IXWebSocketHttpHeaders.h>
#include <ixwebsocket/IXSocketTLSOptions.h> #include <ixwebsocket/IXSocketTLSOptions.h>
#include <ixwebsocket/IXWebSocketHttpHeaders.h>
#include <sstream> #include <sstream>
namespace ix namespace ix