wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for getting export buffer size

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-05-29 01:10:30 +07:00
parent 64f53c4e1b
commit 1929024029
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/internal.c
View File

@ -1836,7 +1836,7 @@ int wolfSSL_session_export_internal(WOLFSSL* ssl, byte* buf, word32* sz,
WOLFSSL_ENTER("wolfSSL_session_export_internal"); WOLFSSL_ENTER("wolfSSL_session_export_internal");
if (buf == NULL || ssl == NULL) { if (ssl == NULL) {
WOLFSSL_MSG("unexpected null argument"); WOLFSSL_MSG("unexpected null argument");
ret = BAD_FUNC_ARG; ret = BAD_FUNC_ARG;
} }
@ -1855,8 +1855,8 @@ int wolfSSL_session_export_internal(WOLFSSL* ssl, byte* buf, word32* sz,
} }
/* check is at least the minimum size needed, TLS cipher states add more */ /* check is at least the minimum size needed, TLS cipher states add more */
if (ret == 0 && totalLen > *sz) { if (ret == 0 && (totalLen > *sz || buf == NULL)) {
WOLFSSL_MSG("export buffer was too small"); WOLFSSL_MSG("export buffer was too small or null");
*sz = totalLen; *sz = totalLen;
/* possible AES state needed */ /* possible AES state needed */
@ -1921,7 +1921,7 @@ int wolfSSL_session_export_internal(WOLFSSL* ssl, byte* buf, word32* sz,
} }
} }
if (ret != 0) { if (ret != 0 && buf != NULL) {
/*in a fail case clear the buffer which could contain partial key info*/ /*in a fail case clear the buffer which could contain partial key info*/
XMEMSET(buf, 0, *sz); XMEMSET(buf, 0, *sz);
} }
@ -1942,6 +1942,10 @@ int wolfSSL_session_export_internal(WOLFSSL* ssl, byte* buf, word32* sz,
#endif /* WOLFSSL_SESSION_EXPORT_DEBUG */ #endif /* WOLFSSL_SESSION_EXPORT_DEBUG */
} }
if (ret >= 0) {
*sz = ret;
}
WOLFSSL_LEAVE("wolfSSL_session_export_internal", ret); WOLFSSL_LEAVE("wolfSSL_session_export_internal", ret);
return ret; return ret;
} }