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

Merge pull request #4221 from douzzer/sanitizer-fixes-20210719

Browse Source 
misc sanitizer fixes etc
This commit is contained in:
JacobBarthelmeh
2021-07-21 00:40:09 +07:00
committed by GitHub
parent 673becee74 a43cc4ebfa
commit aedd2a33db
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autogen.sh
View File

@ -8,8 +8,12 @@ if test -d .git; then
if ! test -d .git/hooks; then if ! test -d .git/hooks; then
mkdir .git/hooks mkdir .git/hooks
fi fi
ln -s -f ../../pre-commit.sh .git/hooks/pre-commit if [ ! -e .git/hooks/pre-commit ]; then
ln -s -f ../../pre-push.sh .git/hooks/pre-push ln -s ../../pre-commit.sh .git/hooks/pre-commit
fi
if [ ! -e .git/hooks/pre-push ]; then
ln -s ../../pre-push.sh .git/hooks/pre-push
fi
fi fi
# touch options.h (make sure it exists) # touch options.h (make sure it exists)

8
configure.ac
View File

@ -95,16 +95,16 @@ AC_ARG_ENABLE([reproducible-build],
xxx_ar_flags=$(ar --help 2>&1) xxx_ar_flags=$(ar --help 2>&1)
if test "$ENABLED_REPRODUCIBLE_BUILD" = "yes" if test "$ENABLED_REPRODUCIBLE_BUILD" = "yes"
then then
AS_CASE([$xxx_ar_flags],[*'use zero for timestamps and uids/gids'*],[: ${AR_FLAGS="Dcr"}]) AS_CASE([$xxx_ar_flags],[*'use zero for timestamps and uids/gids'*],[AR_FLAGS="Dcr"])
else else
AS_CASE([$xxx_ar_flags],[*'use actual timestamps and uids/gids'*],[: ${AR_FLAGS="Ucru"}]) AS_CASE([$xxx_ar_flags],[*'use actual timestamps and uids/gids'*],[AR_FLAGS="Ucru"])
fi fi
xxx_ranlib_flags=$(ranlib --help 2>&1) xxx_ranlib_flags=$(ranlib --help 2>&1)
if test "$ENABLED_REPRODUCIBLE_BUILD" = "yes" if test "$ENABLED_REPRODUCIBLE_BUILD" = "yes"
then then
AS_CASE([$xxx_ranlib_flags],[*'Use zero for symbol map timestamp'*],[: ${RANLIB="ranlib -D"}]) AS_CASE([$xxx_ranlib_flags],[*'Use zero for symbol map timestamp'*],[RANLIB="ranlib -D"])
else else
AS_CASE([$xxx_ranlib_flags],[*'Use actual symbol map timestamp'*],[: ${RANLIB="ranlib -U"}]) AS_CASE([$xxx_ranlib_flags],[*'Use actual symbol map timestamp'*],[RANLIB="ranlib -U"])
fi fi

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;

2
wolfssl/openssl/sha.h
View File

@ -158,7 +158,7 @@ typedef WOLFSSL_SHA256_CTX SHA256_CTX;
typedef struct WOLFSSL_SHA384_CTX { typedef struct WOLFSSL_SHA384_CTX {
/* big enough to hold wolfCrypt Sha384, but check on init */ /* big enough to hold wolfCrypt Sha384, but check on init */
void* holder[(256 + WC_ASYNC_DEV_SIZE) / sizeof(void*)]; void* holder[(268 + WC_ASYNC_DEV_SIZE) / sizeof(void*)];
} WOLFSSL_SHA384_CTX; } WOLFSSL_SHA384_CTX;
WOLFSSL_API int wolfSSL_SHA384_Init(WOLFSSL_SHA384_CTX*); WOLFSSL_API int wolfSSL_SHA384_Init(WOLFSSL_SHA384_CTX*);