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

Merge pull request #7776 from douzzer/20240722-fixes

Browse Source 
20240722-fixes
This commit is contained in:
David Garske
2024-07-23 06:46:38 -07:00
committed by GitHub
parent 7c6eb7c4a1 367508f498
commit 8f908e76f9
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -894,7 +894,6 @@ then
test "$enable_blake2s" = "" && enable_blake2s=yes test "$enable_blake2s" = "" && enable_blake2s=yes
test "$enable_md2" = "" && enable_md2=yes test "$enable_md2" = "" && enable_md2=yes
test "$enable_md4" = "" && enable_md4=yes test "$enable_md4" = "" && enable_md4=yes
test "$enable_cryptocb" = "" && enable_cryptocb=yes
test "$enable_anon" = "" && enable_anon=yes test "$enable_anon" = "" && enable_anon=yes
test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes
@ -960,6 +959,7 @@ then
if test "$ENABLED_FIPS" = "no" if test "$ENABLED_FIPS" = "no"
then then
test "$enable_cryptocb" = "" && enable_cryptocb=yes
test "$enable_pkcallbacks" = "" && enable_pkcallbacks=yes test "$enable_pkcallbacks" = "" && enable_pkcallbacks=yes
test "$enable_xchacha" = "" && test "$enable_chacha" != "no" && enable_xchacha=yes test "$enable_xchacha" = "" && test "$enable_chacha" != "no" && enable_xchacha=yes
test "$enable_scep" = "" && enable_scep=yes test "$enable_scep" = "" && enable_scep=yes
@ -1085,7 +1085,6 @@ then
test "$enable_blake2s" = "" && enable_blake2s=yes test "$enable_blake2s" = "" && enable_blake2s=yes
test "$enable_md2" = "" && enable_md2=yes test "$enable_md2" = "" && enable_md2=yes
test "$enable_md4" = "" && enable_md4=yes test "$enable_md4" = "" && enable_md4=yes
test "$enable_cryptocb" = "" && enable_cryptocb=yes
test "$enable_anon" = "" && enable_anon=yes test "$enable_anon" = "" && enable_anon=yes
test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes test "$enable_ssh" = "" && test "$enable_hmac" != "no" && enable_ssh=yes
test "$enable_srtp_kdf" = "" && enable_srtp_kdf=yes test "$enable_srtp_kdf" = "" && enable_srtp_kdf=yes
@ -1107,6 +1106,7 @@ then
if test "$ENABLED_FIPS" = "no" if test "$ENABLED_FIPS" = "no"
then then
test "$enable_cryptocb" = "" && enable_cryptocb=yes
test "$enable_pkcallbacks" = "" && enable_pkcallbacks=yes test "$enable_pkcallbacks" = "" && enable_pkcallbacks=yes
test "$enable_xchacha" = "" && test "$enable_chacha" != "no" && enable_xchacha=yes test "$enable_xchacha" = "" && test "$enable_chacha" != "no" && enable_xchacha=yes
test "$enable_pkcs7" = "" && enable_pkcs7=yes test "$enable_pkcs7" = "" && enable_pkcs7=yes

4
wolfcrypt/src/asn.c
View File

@ -33720,9 +33720,9 @@ static int EccSpecifiedECDomainDecode(const byte* input, word32 inSz,
#else #else
if (ret == 0) { if (ret == 0) {
/* Base X-ordinate */ /* Base X-ordinate */
DataToHexString(base + 1, curve->size, curve->Gx); DataToHexString(base + 1, (word32)curve->size, curve->Gx);
/* Base Y-ordinate */ /* Base Y-ordinate */
DataToHexString(base + 1 + curve->size, curve->size, curve->Gy); DataToHexString(base + 1 + curve->size, (word32)curve->size, curve->Gy);
/* Prime */ /* Prime */
DataToHexString(dataASN[ECCSPECIFIEDASN_IDX_PRIME_P].data.ref.data, DataToHexString(dataASN[ECCSPECIFIEDASN_IDX_PRIME_P].data.ref.data,
dataASN[ECCSPECIFIEDASN_IDX_PRIME_P].data.ref.length, dataASN[ECCSPECIFIEDASN_IDX_PRIME_P].data.ref.length,

2
wolfcrypt/src/dh.c
View File

@ -1153,7 +1153,7 @@ static int GeneratePrivateDh186(DhKey* key, WC_RNG* rng, byte* priv,
} }
#ifdef WOLFSSL_CHECK_MEM_ZERO #ifdef WOLFSSL_CHECK_MEM_ZERO
wc_MemZero_Add("GeneratePrivateDh186 cBuf", cBuf, cSz); wc_MemZero_Add("GeneratePrivateDh186 cBuf", cBuf, cSz); /* cppcheck-suppress uninitvar */
mp_memzero_add("GeneratePrivateDh186 tmpX", tmpX); mp_memzero_add("GeneratePrivateDh186 tmpX", tmpX);
#endif #endif
do { do {

3
wolfcrypt/test/test.c
View File

@ -51147,6 +51147,9 @@ static wc_test_ret_t mp_test_param(mp_int* a, mp_int* b, mp_int* r, WC_RNG* rng)
if (ret != 0) if (ret != 0)
return WC_TEST_RET_ENC_EC(ret); return WC_TEST_RET_ENC_EC(ret);
/* clear buffer to avoid provoking uninitvar errors. */
XMEMSET(buffer, 0, sizeof(buffer));
ret = mp_read_unsigned_bin(NULL, NULL, sizeof(buffer)); ret = mp_read_unsigned_bin(NULL, NULL, sizeof(buffer));
if (ret != MP_VAL) if (ret != MP_VAL)
return WC_TEST_RET_ENC_EC(ret); return WC_TEST_RET_ENC_EC(ret);