From e5c8e2e7f455510af32fc0fba709c4333129ee2a Mon Sep 17 00:00:00 2001 From: Benjamin Sergeant Date: Mon, 30 Sep 2019 21:24:25 -0700 Subject: [PATCH] openSSLHandshake -> openSSLClientHandshake --- ixwebsocket/IXSocketOpenSSL.cpp | 4 ++-- ixwebsocket/IXSocketOpenSSL.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ixwebsocket/IXSocketOpenSSL.cpp b/ixwebsocket/IXSocketOpenSSL.cpp index 17a5c642..6d11c3ff 100644 --- a/ixwebsocket/IXSocketOpenSSL.cpp +++ b/ixwebsocket/IXSocketOpenSSL.cpp @@ -205,7 +205,7 @@ namespace ix return true; } - bool SocketOpenSSL::openSSLHandshake(const std::string& host, std::string& errMsg) + bool SocketOpenSSL::openSSLClientHandshake(const std::string& host, std::string& errMsg) { while (true) { @@ -375,7 +375,7 @@ namespace ix X509_VERIFY_PARAM* param = SSL_get0_param(_ssl_connection); X509_VERIFY_PARAM_set1_host(param, host.c_str(), 0); #endif - handshakeSuccessful = openSSLHandshake(host, errMsg); + handshakeSuccessful = openSSLClientHandshake(host, errMsg); } if (!handshakeSuccessful) diff --git a/ixwebsocket/IXSocketOpenSSL.h b/ixwebsocket/IXSocketOpenSSL.h index ca4a42c5..3a0d6251 100644 --- a/ixwebsocket/IXSocketOpenSSL.h +++ b/ixwebsocket/IXSocketOpenSSL.h @@ -38,7 +38,7 @@ namespace ix void openSSLInitialize(); std::string getSSLError(int ret); 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 checkHost(const std::string& host, const char* pattern); bool handleTLSOptions(std::string& errMsg);