Download-Tools/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-01-04 09:03:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Call ERR_clear_error() before OpenSSL I/O functions.

Browse Source 
Use ERR_get_error() with ERR_error_string().
This commit is contained in:
Tatsuhiro Tsujikawa 2012-05-08 01:02:18 +09:00
parent c046573ab8
commit a998e32f95
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SocketCore.cc
View File

@ -730,14 +730,14 @@ ssize_t SocketCore::writeData(const char* data, size_t len)
} }
} else { } else {
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
ERR_clear_error();
ret = SSL_write(ssl, data, len); ret = SSL_write(ssl, data, len);
if(ret < 0) { if(ret < 0) {
ret = sslHandleEAGAIN(ret); ret = sslHandleEAGAIN(ret);
} }
if(ret < 0) { if(ret < 0) {
throw DL_RETRY_EX throw DL_RETRY_EX
(fmt(EX_SOCKET_SEND, (fmt(EX_SOCKET_SEND, ERR_error_string(ERR_get_error(), 0)));
ERR_error_string(SSL_get_error(ssl, ret), 0)));
} }
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
@ -777,13 +777,14 @@ void SocketCore::readData(char* data, size_t& len)
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
// for SSL // for SSL
// TODO handling len == 0 case required // TODO handling len == 0 case required
ERR_clear_error();
ret = SSL_read(ssl, data, len); ret = SSL_read(ssl, data, len);
if(ret < 0) { if(ret < 0) {
ret = sslHandleEAGAIN(ret); ret = sslHandleEAGAIN(ret);
} }
if(ret < 0) { if(ret < 0) {
throw DL_RETRY_EX throw DL_RETRY_EX
(fmt(EX_SOCKET_RECV, ERR_error_string(SSL_get_error(ssl, ret), 0))); (fmt(EX_SOCKET_RECV, ERR_error_string(ERR_get_error(), 0)));
} }
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
@ -843,6 +844,7 @@ bool SocketCore::initiateSecureConnection(const std::string& hostname)
wantRead_ = false; wantRead_ = false;
wantWrite_ = false; wantWrite_ = false;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
ERR_clear_error();
int e = SSL_connect(ssl); int e = SSL_connect(ssl);
if (e <= 0) { if (e <= 0) {