generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 00:07:59 +02:00
Code Issues Projects Releases Wiki Activity

fix openssl session resumption, add quiet shutdown option, support FTPS with hostname (#4103)

Browse Source
This commit is contained in:
chrisbednarski
2023-11-27 04:12:11 +11:00
committed by GitHub
parent 11de40399c
commit 388a3b4010
6 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
NetSSL_OpenSSL/src/Context.cpp
View File

@@ -229,6 +229,26 @@ void Context::setSecurityLevel(SecurityLevel level)
#endif
}
void Context::ignoreUnexpectedEof(bool flag)
{
if (flag)
{
#if defined(SSL_OP_IGNORE_UNEXPECTED_EOF)
SSL_CTX_set_options(_pSSLContext, SSL_OP_IGNORE_UNEXPECTED_EOF);
#endif
}
else
{
#if defined(SSL_OP_IGNORE_UNEXPECTED_EOF)
SSL_CTX_clear_options(_pSSLContext, SSL_OP_IGNORE_UNEXPECTED_EOF);
#endif
}
}
void Context::setQuietShutdown(bool flag)
{
SSL_CTX_set_quiet_shutdown(_pSSLContext, flag ? 1 : 0);
}
void Context::useCertificate(const Poco::Crypto::X509Certificate& certificate)
{

4
NetSSL_OpenSSL/src/FTPSClientSession.cpp
View File

@@ -96,7 +96,7 @@ void FTPSClientSession::afterCreateControlSocket()
try
{
if (!_pContext) _pContext = Poco::Net::SSLManager::instance().defaultClientContext();
Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(*_pControlSocket, _pContext));
Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(*_pControlSocket, getHost(), _pContext));
*_pControlSocket = sss;
}
catch (Poco::Exception&)
@@ -125,7 +125,7 @@ StreamSocket FTPSClientSession::establishDataConnection(const std::string& comma
Poco::Net::SecureStreamSocketImpl* pSecure = dynamic_cast<Poco::Net::SecureStreamSocketImpl*>(_pControlSocket->impl());
if (pSecure != nullptr)
{
Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(ss, pSecure->context(), pSecure->currentSession()));
Poco::Net::SecureStreamSocket sss(Poco::Net::SecureStreamSocket::attach(ss, getHost(), pSecure->context(), pSecure->currentSession()));
ss = sss;
if (_forceSessionReuse)
{

1
NetSSL_OpenSSL/src/SSLManager.cpp
View File

@@ -103,6 +103,7 @@ void SSLManager::shutdown()
ServerVerificationError.clear();
_ptrDefaultServerContext = 0;
_ptrDefaultClientContext = 0;
_socketIndex = _contextIndex = -1;
}