Skip to content

Commit

Permalink
Merge pull request #6517 from douzzer/20230615-opensslextra-wolfSSL_E…
Browse files Browse the repository at this point in the history
…RR_reason_error_string

20230615-opensslextra-wolfSSL_ERR_reason_error_string
  • Loading branch information
dgarske authored Jun 21, 2023
2 parents aaf2408 + 970663f commit 9204101
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions src/internal.c
Original file line number Diff line number Diff line change
Expand Up @@ -23100,12 +23100,11 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
#else

int error = (int)e;
#ifdef OPENSSL_EXTRA

/* OpenSSL uses positive error codes */
if (error > 0) {
error = -error;
}
#endif

/* pass to wolfCrypt */
if (error < MAX_CODE_E && error > MIN_CODE_E) {
Expand Down Expand Up @@ -23204,7 +23203,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
return "peer ip address mismatch";

case WANT_READ :
case WOLFSSL_ERROR_WANT_READ :
case -WOLFSSL_ERROR_WANT_READ :
return "non-blocking socket wants data to be read";

case NOT_READY_ERROR :
Expand All @@ -23214,9 +23213,22 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
return "record layer version error";

case WANT_WRITE :
case WOLFSSL_ERROR_WANT_WRITE :
case -WOLFSSL_ERROR_WANT_WRITE :
return "non-blocking socket write buffer full";

case -WOLFSSL_ERROR_WANT_CONNECT:
case -WOLFSSL_ERROR_WANT_ACCEPT:
return "The underlying BIO was not yet connected";

case -WOLFSSL_ERROR_SYSCALL:
return "fatal I/O error in TLS layer";

case -WOLFSSL_ERROR_WANT_X509_LOOKUP:
return "application client cert callback asked to be called again";

case -WOLFSSL_ERROR_SSL:
return "fatal TLS protocol error";

case BUFFER_ERROR :
return "malformed buffer input error";

Expand Down Expand Up @@ -23254,7 +23266,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
return "can't decode peer key";

case ZERO_RETURN:
case WOLFSSL_ERROR_ZERO_RETURN:
case -WOLFSSL_ERROR_ZERO_RETURN:
return "peer sent close notify alert";

case ECC_CURVETYPE_ERROR:
Expand Down

0 comments on commit 9204101

Please sign in to comment.