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

fix sanitizer-detected uninitialized/null data accesses: wc_SrpComputeKey(), XChaCha20Poly1305_test().

Browse Source
This commit is contained in:
Daniel Pouzzner
2021-07-19 16:29:43 -05:00
parent 77c9b36b5a
commit 4df6fb74b0
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/srp.c
View File

@ -654,8 +654,7 @@ int wc_SrpComputeKey(Srp* srp, byte* clientPubKey, word32 clientPubKeySz,
if (!srp || !clientPubKey || clientPubKeySz == 0 if (!srp || !clientPubKey || clientPubKeySz == 0
|| !serverPubKey || serverPubKeySz == 0) { || !serverPubKey || serverPubKeySz == 0) {
r = BAD_FUNC_ARG; return BAD_FUNC_ARG;
goto out;
} }
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK

23
wolfcrypt/test/test.c
View File

@ -11467,6 +11467,9 @@ WOLFSSL_TEST_SUBROUTINE int XChaCha20Poly1305_test(void) {
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
byte *buf1 = (byte *)XMALLOC(sizeof Ciphertext + sizeof Tag, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); byte *buf1 = (byte *)XMALLOC(sizeof Ciphertext + sizeof Tag, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
byte *buf2 = (byte *)XMALLOC(sizeof Plaintext, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); byte *buf2 = (byte *)XMALLOC(sizeof Plaintext, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if ((buf1 == NULL) || (buf2 == NULL))
ERROR_OUT(-6480, out);
#else #else
byte buf1[sizeof Ciphertext + sizeof Tag]; byte buf1[sizeof Ciphertext + sizeof Tag];
byte buf2[sizeof Plaintext]; byte buf2[sizeof Plaintext];
@ -11479,31 +11482,33 @@ WOLFSSL_TEST_SUBROUTINE int XChaCha20Poly1305_test(void) {
Key, sizeof Key); Key, sizeof Key);
if (ret < 0) if (ret < 0)
ERROR_OUT(-6840, out);
if (XMEMCMP(buf1, Ciphertext, sizeof Plaintext))
ERROR_OUT(-6841, out); ERROR_OUT(-6841, out);
if (XMEMCMP(buf1 + sizeof Plaintext, Tag, CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE)) if (XMEMCMP(buf1, Ciphertext, sizeof Ciphertext))
ERROR_OUT(-6842, out); ERROR_OUT(-6842, out);
if (XMEMCMP(buf1 + sizeof Ciphertext, Tag, CHACHA20_POLY1305_AEAD_AUTHTAG_SIZE))
ERROR_OUT(-6843, out);
ret = wc_XChaCha20Poly1305_Decrypt(buf2, sizeof Plaintext, ret = wc_XChaCha20Poly1305_Decrypt(buf2, sizeof Plaintext,
buf1, sizeof Plaintext + sizeof Tag, buf1, sizeof Ciphertext + sizeof Tag,
AAD, sizeof AAD, AAD, sizeof AAD,
IV, sizeof IV, IV, sizeof IV,
Key, sizeof Key); Key, sizeof Key);
if (ret < 0) if (ret < 0)
ERROR_OUT(-6843, out); ERROR_OUT(-6844, out);
if (XMEMCMP(buf2, Plaintext, sizeof Plaintext)) if (XMEMCMP(buf2, Plaintext, sizeof Plaintext))
ERROR_OUT(-6844, out); ERROR_OUT(-6845, out);
out: out:
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC) #if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
XFREE(buf1, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); if (buf1 != NULL)
XFREE(buf2, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(buf1, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
if (buf2 != NULL)
XFREE(buf2, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
#endif #endif
return ret; return ret;