Merge pull request #540 from RangelReale/sslserver

* Allows SecureStreamSocket::attach to be used in server connections
pocoproject · Sep 17, 2014 · 6533fbd · 6533fbd
2 parents 4d4947c + 21f2e11
commit 6533fbd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp
@@ -358,7 +358,7 @@ long SecureSocketImpl::verifyPeerCertificateImpl(const std::string& hostName)
 {
 	Context::VerificationMode mode = _pContext->verificationMode();
 	if (mode == Context::VERIFY_NONE || !_pContext->extendedCertificateVerificationEnabled() ||
-	    (isLocalHost(hostName) && mode != Context::VERIFY_STRICT))
+	    (mode != Context::VERIFY_STRICT && isLocalHost(hostName)))
 	{
 		return X509_V_OK;
 	}

diff --git a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp
@@ -153,7 +153,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket)
 {
 	SecureStreamSocketImpl* pImpl = new SecureStreamSocketImpl(static_cast<StreamSocketImpl*>(streamSocket.impl()), SSLManager::instance().defaultClientContext());
 	SecureStreamSocket result(pImpl);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }
 
@@ -162,7 +165,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket,
 {
 	SecureStreamSocketImpl* pImpl = new SecureStreamSocketImpl(static_cast<StreamSocketImpl*>(streamSocket.impl()), pContext);
 	SecureStreamSocket result(pImpl);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }
 
@@ -172,7 +178,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket,
 	SecureStreamSocketImpl* pImpl = new SecureStreamSocketImpl(static_cast<StreamSocketImpl*>(streamSocket.impl()), pContext);
 	SecureStreamSocket result(pImpl);
 	result.useSession(pSession);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }
 
@@ -182,7 +191,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket,
 	SecureStreamSocketImpl* pImpl = new SecureStreamSocketImpl(static_cast<StreamSocketImpl*>(streamSocket.impl()), SSLManager::instance().defaultClientContext());
 	SecureStreamSocket result(pImpl);
 	result.setPeerHostName(peerHostName);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }
 
@@ -192,7 +204,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket,
 	SecureStreamSocketImpl* pImpl = new SecureStreamSocketImpl(static_cast<StreamSocketImpl*>(streamSocket.impl()), pContext);
 	SecureStreamSocket result(pImpl);
 	result.setPeerHostName(peerHostName);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }
 
@@ -203,7 +218,10 @@ SecureStreamSocket SecureStreamSocket::attach(const StreamSocket& streamSocket,
 	SecureStreamSocket result(pImpl);
 	result.setPeerHostName(peerHostName);
 	result.useSession(pSession);
-	pImpl->connectSSL();
+	if (pImpl->context()->isForServerUse())
+      pImpl->acceptSSL();
+	else
+      pImpl->connectSSL();
 	return result;
 }