wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 13:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

make sure converted errors are handled by string output

Browse Source
This commit is contained in:
toddouska
2012-11-28 11:54:25 -08:00
parent 77bf77dfd7
commit 6280aa9c91
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@@ -4336,6 +4336,7 @@ void SetErrorString(int error, char* str)
break; break;
case WANT_READ : case WANT_READ :
case SSL_ERROR_WANT_READ :
XSTRNCPY(str, "non-blocking socket wants data to be read", max); XSTRNCPY(str, "non-blocking socket wants data to be read", max);
break; break;
@@ -4352,6 +4353,7 @@ void SetErrorString(int error, char* str)
break; break;
case WANT_WRITE : case WANT_WRITE :
case SSL_ERROR_WANT_WRITE :
XSTRNCPY(str, "non-blocking socket write buffer full", max); XSTRNCPY(str, "non-blocking socket write buffer full", max);
break; break;
@@ -4432,6 +4434,7 @@ void SetErrorString(int error, char* str)
break; break;
case ZERO_RETURN: case ZERO_RETURN:
case SSL_ERROR_ZERO_RETURN:
XSTRNCPY(str, "peer sent close notify alert", max); XSTRNCPY(str, "peer sent close notify alert", max);
break; break;

1
src/ssl.c
View File

@@ -486,6 +486,7 @@ int CyaSSL_get_error(CYASSL* ssl, int ret)
if (ret > 0) if (ret > 0)
return SSL_ERROR_NONE; return SSL_ERROR_NONE;
/* make sure converted types are handled in SetErrorString() too */
if (ssl->error == WANT_READ) if (ssl->error == WANT_READ)
return SSL_ERROR_WANT_READ; /* convert to OpenSSL type */ return SSL_ERROR_WANT_READ; /* convert to OpenSSL type */
else if (ssl->error == WANT_WRITE) else if (ssl->error == WANT_WRITE)