wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8961 from douzzer/20250703-fixes-for-multi-test-reports

Browse Source 
20250703-fixes-for-multi-test-reports
This commit is contained in:
David Garske
2025-07-03 11:07:46 -07:00
committed by GitHub
parent 01de7cc04b 1d1a87b0a2
commit 3fe84bf3c0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/dilithium.c
View File

@@ -1386,8 +1386,8 @@ static void dilithium_encode_gamma1_19_bits(const sword32* z, byte* s)
((word64)z2 << 40) | ((word64)z3 << 60); ((word64)z2 << 40) | ((word64)z3 << 60);
#else #else
word32* s32p = (word32*)s; word32* s32p = (word32*)s;
s32p[0] = (word16)( z0 | (z1 << 20) ); s32p[0] = (word32)( z0 | (z1 << 20) );
s32p[1] = (word16)((z1 >> 12) | (z2 << 8) | (z3 << 28)); s32p[1] = (word32)((z1 >> 12) | (z2 << 8) | (z3 << 28));
#endif #endif
s16p[4] = (word16)((z3 >> 4) ); s16p[4] = (word16)((z3 >> 4) );
#else #else

4
wolfcrypt/test/test.c
View File

@@ -23714,7 +23714,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dh_test(void)
} }
#endif #endif
#if (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)) && \ #if !defined(WC_NO_RNG) && (!defined(HAVE_FIPS) || FIPS_VERSION_GE(7,0)) && \
!defined(HAVE_SELFTEST) !defined(HAVE_SELFTEST)
agreeSz = DH_TEST_BUF_SIZE; agreeSz = DH_TEST_BUF_SIZE;
agreeSz2 = DH_TEST_BUF_SIZE; agreeSz2 = DH_TEST_BUF_SIZE;
@@ -23740,7 +23740,7 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dh_test(void)
if (XMEMCMP(agree, agree2, agreeSz) != 0) { if (XMEMCMP(agree, agree2, agreeSz) != 0) {
ERROR_OUT(WC_TEST_RET_ENC_NC, done); ERROR_OUT(WC_TEST_RET_ENC_NC, done);
} }
#endif /* (!HAVE_FIPS || FIPS_VERSION_GE(7,0)) && !HAVE_SELFTEST */ #endif /* !WC_NO_RNG && (!HAVE_FIPS || FIPS_VERSION_GE(7,0)) && !HAVE_SELFTEST */
/* Test DH key import / export */ /* Test DH key import / export */
#if defined(WOLFSSL_DH_EXTRA) && !defined(NO_FILESYSTEM) && \ #if defined(WOLFSSL_DH_EXTRA) && !defined(NO_FILESYSTEM) && \

2
wolfssl/wolfcrypt/tfm.h
View File

@@ -725,7 +725,7 @@ int fp_leading_bit(fp_int *a);
int fp_unsigned_bin_size(const fp_int *a); int fp_unsigned_bin_size(const fp_int *a);
int fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c); int fp_read_unsigned_bin(fp_int *a, const unsigned char *b, int c);
int fp_to_unsigned_bin(fp_int *a, unsigned char *b); int fp_to_unsigned_bin(fp_int *a, unsigned char *b);
int fp_to_unsigned_bin_len_ct(fp_int *a, unsigned char *b, int c); int fp_to_unsigned_bin_len_ct(fp_int *a, unsigned char *out, int outSz);
int fp_to_unsigned_bin_len(fp_int *a, unsigned char *b, int c); int fp_to_unsigned_bin_len(fp_int *a, unsigned char *b, int c);
int fp_to_unsigned_bin_at_pos(int x, fp_int *t, unsigned char *b); int fp_to_unsigned_bin_at_pos(int x, fp_int *t, unsigned char *b);