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

openSSLHandshake -> openSSLClientHandshake

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-09-30 21:24:25 -07:00
parent 845bbc5208
commit e5c8e2e7f4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ixwebsocket/IXSocketOpenSSL.cpp
View File

@@ -205,7 +205,7 @@ namespace ix
return true; return true;
} }
bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg) bool SocketOpenSSL::openSSLClientHandshake(const std::string& host, std::string& errMsg)
{ {
while (true) while (true)
{ {
@@ -375,7 +375,7 @@ namespace ix
X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection); X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection);
X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0); X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0);
#endif #endif
handshakeSuccessful = openSSLHandshake(host, errMsg); handshakeSuccessful = openSSLClientHandshake(host, errMsg);
} }
if (!handshakeSuccessful) if (!handshakeSuccessful)

2
ixwebsocket/IXSocketOpenSSL.h
View File

@@ -38,7 +38,7 @@ namespace ix
void openSSLInitialize(); void openSSLInitialize();
std::string getSSLError(int ret); std::string getSSLError(int ret);
SSL_CTX* openSSLCreateContext(std::string& errMsg); SSL_CTX* openSSLCreateContext(std::string& errMsg);
bool openSSLHandshake(const std::string& hostname, std::string& errMsg); bool openSSLClientHandshake(const std::string& hostname, std::string& errMsg);
bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg); bool openSSLCheckServerCert(SSL* ssl, const std::string& hostname, std::string& errMsg);
bool checkHost(const std::string& host, const char* pattern); bool checkHost(const std::string& host, const char* pattern);
bool handleTLSOptions(std::string& errMsg); bool handleTLSOptions(std::string& errMsg);