generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 03:20:11 +01:00
Code Issues Projects Releases Wiki Activity

manually merge #3448, part 1 (NetSSL)

Browse Source
This commit is contained in:
Günter Obiltschnig
2022-02-07 17:56:05 +01:00
parent 11ffdc7807
commit dbfd27611b
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
View File

@@ -467,7 +467,7 @@ int SecureSocketImpl::handleError(int rc)
if (rc > 0) return rc; if (rc > 0) return rc;
int sslError = SSL_get_error(_pSSL, rc); int sslError = SSL_get_error(_pSSL, rc);
int error = SocketImpl::lastError(); int socketError = SocketImpl::lastError();
switch (sslError) switch (sslError)
{ {
@@ -483,16 +483,36 @@ int SecureSocketImpl::handleError(int rc)
// these should not occur // these should not occur
poco_bugcheck(); poco_bugcheck();
return rc; return rc;
// SSL_GET_ERROR(3ossl):
// On an unexpected EOF, versions before OpenSSL 3.0 returned
// SSL_ERROR_SYSCALL, nothing was added to the error stack, and
// errno was 0. Since OpenSSL 3.0 the returned error is
// SSL_ERROR_SSL with a meaningful error on the error stack.
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
case SSL_ERROR_SSL:
#else
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
if (error != 0) #endif
if (socketError)
{ {
SocketImpl::error(error); SocketImpl::error(socketError);
} }
// fallthrough // fallthrough
default: default:
{ {
long lastError = ERR_get_error(); long lastError = ERR_get_error();
std::string msg;
if (lastError)
{
char buffer[256];
ERR_error_string_n(lastError, buffer, sizeof(buffer));
msg = buffer;
}
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
if (sslError == SSL_ERROR_SSL)
#else
if (lastError == 0) if (lastError == 0)
#endif
{ {
if (rc == 0) if (rc == 0)
{ {
@@ -500,22 +520,19 @@ int SecureSocketImpl::handleError(int rc)
if (_pContext->isForServerUse()) if (_pContext->isForServerUse())
return 0; return 0;
else else
throw SSLConnectionUnexpectedlyClosedException(); throw SSLConnectionUnexpectedlyClosedException(msg);
} }
else if (rc == -1) else if (rc == -1)
{ {
throw SSLConnectionUnexpectedlyClosedException(); throw SSLConnectionUnexpectedlyClosedException(msg);
} }
else else
{ {
SecureStreamSocketImpl::error(Poco::format("The BIO reported an error: %d", rc)); SecureStreamSocketImpl::error(Poco::format("The BIO reported an error: %d", rc));
} }
} }
else else if (lastError)
{ {
char buffer[256];
ERR_error_string_n(lastError, buffer, sizeof(buffer));
std::string msg(buffer);
throw SSLException(msg); throw SSLException(msg);
} }
} }