diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-08-23 13:56:50 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-08-23 13:56:50 -0500 |
| commit | 1428061993f54aceb3f7df1cb5abab9816a2d4dd (patch) | |
| tree | e641745a41df596792204316d63eb3b14a0d3b6d /cpp/src/IceSSL/OpenSSLTransceiverI.cpp | |
| parent | Yet another fix for Matlab timeout test failure (diff) | |
| download | ice-1428061993f54aceb3f7df1cb5abab9816a2d4dd.tar.bz2 ice-1428061993f54aceb3f7df1cb5abab9816a2d4dd.tar.xz ice-1428061993f54aceb3f7df1cb5abab9816a2d4dd.zip | |
Removed work-around for OpenSSL error on AIX, as it's no longer needed with OpenSSL 1.0.2.1801.
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLTransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp index 2050f304a0f..8acfe25a67e 100644 --- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp @@ -443,21 +443,6 @@ OpenSSL::TransceiverI::write(IceInternal::Buffer& buf) if(ret <= 0) { -#if defined(_AIX) - // - // WORKAROUND: OpenSSL SSL_write on AIX sometime ends up reporting a error - // with SSL_get_error but there's no error in the error queue. This occurs - // when SSL_write can't write more data. So we just return SocketOperationWrite - // in this case. - // - if(SSL_get_error(_ssl, ret) == SSL_ERROR_SSL && ERR_peek_error() == 0) - { - if(SSL_want_write(_ssl)) - { - return IceInternal::SocketOperationWrite; - } - } -#endif switch(SSL_get_error(_ssl, ret)) { case SSL_ERROR_NONE: @@ -568,21 +553,6 @@ OpenSSL::TransceiverI::read(IceInternal::Buffer& buf) int ret = SSL_read(_ssl, reinterpret_cast<void*>(&*buf.i), packetSize); if(ret <= 0) { -#if defined(_AIX) - // - // WORKAROUND: OpenSSL SSL_read on AIX sometime ends up reporting a error - // with SSL_get_error but there's no error in the error queue. This occurs - // when SSL_read needs more data. So we just return SocketOperationRead in - // this case. - // - if(SSL_get_error(_ssl, ret) == SSL_ERROR_SSL && ERR_peek_error() == 0) - { - if(SSL_want_read(_ssl)) - { - return IceInternal::SocketOperationRead; - } - } -#endif switch(SSL_get_error(_ssl, ret)) { case SSL_ERROR_NONE: |