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

Fix error handling with OpenSSL 3.0 in SecureSocketImpl.cpp (#3971)

Browse Source
This commit is contained in:
Conor Burgess
2023-03-17 15:07:37 +00:00
committed by GitHub
parent feb1e24cfd
commit 9a374ca2de
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
View File

@@ -537,11 +537,13 @@ int SecureSocketImpl::handleError(int rc)
// SSL_ERROR_SYSCALL, nothing was added to the error stack, and // SSL_ERROR_SYSCALL, nothing was added to the error stack, and
// errno was 0. Since OpenSSL 3.0 the returned error is // errno was 0. Since OpenSSL 3.0 the returned error is
// SSL_ERROR_SSL with a meaningful error on the error stack. // SSL_ERROR_SSL with a meaningful error on the error stack.
// However, we still need to check for socket errors in both
// cases with OpenSSL 3.0 or later.
#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if OPENSSL_VERSION_NUMBER >= 0x30000000L
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
#else // fallthrough to handle socket errors first
case SSL_ERROR_SYSCALL:
#endif #endif
case SSL_ERROR_SYSCALL:
if (socketError) if (socketError)
{ {
SocketImpl::error(socketError); SocketImpl::error(socketError);
@@ -557,6 +559,11 @@ int SecureSocketImpl::handleError(int rc)
ERR_error_string_n(lastError, buffer, sizeof(buffer)); ERR_error_string_n(lastError, buffer, sizeof(buffer));
msg = buffer; msg = buffer;
} }
// 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 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
if (sslError == SSL_ERROR_SSL) if (sslError == SSL_ERROR_SSL)
#else #else