feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2652 from ejohnstown/maintenance-error

Browse Source 
Maintenance: Error Strings
This commit is contained in:
David Garske
2019-12-13 15:03:32 -08:00
committed by GitHub
parent 1a594d92ba 19a4371d48
commit f2115b2c2b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal.c
View File

@@ -17298,8 +17298,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
return "TLS Extension Trusted CA ID response absent"; return "TLS Extension Trusted CA ID response absent";
case TSIP_MAC_DIGSZ_E: case TSIP_MAC_DIGSZ_E:
return "Invalid MAC size is specified. \ return "TSIP MAC size invalid, must be sized for SHA-1 or SHA-256";
TSIP can only handle SHA1 and SHA256 digest size";
case CLIENT_CERT_CB_ERROR: case CLIENT_CERT_CB_ERROR:
return "Error importing client cert or key from callback"; return "Error importing client cert or key from callback";
@@ -17314,6 +17313,7 @@ const char* wolfSSL_ERR_reason_error_string(unsigned long e)
void SetErrorString(int error, char* str) void SetErrorString(int error, char* str)
{ {
XSTRNCPY(str, wolfSSL_ERR_reason_error_string(error), WOLFSSL_MAX_ERROR_SZ); XSTRNCPY(str, wolfSSL_ERR_reason_error_string(error), WOLFSSL_MAX_ERROR_SZ);
str[WOLFSSL_MAX_ERROR_SZ-1] = 0;
} }
#ifndef NO_ERROR_STRINGS #ifndef NO_ERROR_STRINGS

1
wolfcrypt/src/error.c
View File

@@ -521,6 +521,7 @@ const char* wc_GetErrorString(int error)
void wc_ErrorString(int error, char* buffer) void wc_ErrorString(int error, char* buffer)
{ {
XSTRNCPY(buffer, wc_GetErrorString(error), WOLFSSL_MAX_ERROR_SZ); XSTRNCPY(buffer, wc_GetErrorString(error), WOLFSSL_MAX_ERROR_SZ);
buffer[WOLFSSL_MAX_ERROR_SZ-1] = 0;
} }
#endif /* !NO_ERROR_STRINGS */ #endif /* !NO_ERROR_STRINGS */

2
wolfcrypt/test/test.c
View File

@@ -1336,6 +1336,8 @@ int error_test(void)
return -1103; return -1103;
if (XSTRNCMP(errStr, out, XSTRLEN(errStr)) != 0) if (XSTRNCMP(errStr, out, XSTRLEN(errStr)) != 0)
return -1104; return -1104;
if (XSTRLEN(errStr) >= WOLFSSL_MAX_ERROR_SZ)
return -1109;
} }
else { else {
j++; j++;