mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-08-02 12:14:38 +02:00
Fix build issue with ML-DSA 44 only. Fix --enable-mlkem=all to enable features (keygen/enc/dec) to match --enable-dilithium behavior and allow uses like: --enable-mlkem=all,512,small
. Fix issue building mem track with missing PRINT_HEAP_ADDRESS
(reproduced with --enable-trackmemory=verbose --enable-stacksize=verbose
).
``` wolfcrypt/src/dilithium.c:6696:21: error: expected expression before '}' token 6696 | } | ```
This commit is contained in:
14
configure.ac
14
configure.ac
@@ -1470,18 +1470,20 @@ ENABLED_MLKEM_DECAPSULATE=no
|
|||||||
for v in `echo $ENABLED_MLKEM | tr "," " "`
|
for v in `echo $ENABLED_MLKEM | tr "," " "`
|
||||||
do
|
do
|
||||||
case $v in
|
case $v in
|
||||||
yes|all)
|
yes)
|
||||||
ENABLED_MLKEM512=yes
|
ENABLED_MLKEM512=yes
|
||||||
ENABLED_MLKEM768=yes
|
ENABLED_MLKEM768=yes
|
||||||
ENABLED_MLKEM1024=yes
|
ENABLED_MLKEM1024=yes
|
||||||
ENABLED_MLKEM_MAKE_KEY=yes
|
ENABLED_MLKEM_MAKE_KEY=yes
|
||||||
ENABLED_MLKEM_ENCAPSULATE=yes
|
ENABLED_MLKEM_ENCAPSULATE=yes
|
||||||
ENABLED_MLKEM_DECAPSULATE=yes
|
ENABLED_MLKEM_DECAPSULATE=yes
|
||||||
if test "$v" = "all"
|
;;
|
||||||
then
|
all)
|
||||||
ENABLED_ML_KEM=yes
|
ENABLED_MLKEM_MAKE_KEY=yes
|
||||||
ENABLED_ORIGINAL=yes
|
ENABLED_MLKEM_ENCAPSULATE=yes
|
||||||
fi
|
ENABLED_MLKEM_DECAPSULATE=yes
|
||||||
|
ENABLED_ML_KEM=yes
|
||||||
|
ENABLED_ORIGINAL=yes
|
||||||
;;
|
;;
|
||||||
no)
|
no)
|
||||||
;;
|
;;
|
||||||
|
@@ -6682,7 +6682,6 @@ static int dilithium_sign_with_seed_mu(dilithium_key* key,
|
|||||||
ze += DILITHIUM_GAMMA1_17_ENC_BITS / 2 *
|
ze += DILITHIUM_GAMMA1_17_ENC_BITS / 2 *
|
||||||
DILITHIUM_N / 4;
|
DILITHIUM_N / 4;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
#endif
|
#endif
|
||||||
#if !defined(WOLFSSL_NO_ML_DSA_65) || \
|
#if !defined(WOLFSSL_NO_ML_DSA_65) || \
|
||||||
!defined(WOLFSSL_NO_ML_DSA_87)
|
!defined(WOLFSSL_NO_ML_DSA_87)
|
||||||
|
@@ -110,6 +110,8 @@ const byte const_byte_array[] = "A+Gd\0\0\0";
|
|||||||
heap_baselineAllocs = wolfCrypt_heap_peakAllocs_checkpoint(); \
|
heap_baselineAllocs = wolfCrypt_heap_peakAllocs_checkpoint(); \
|
||||||
heap_baselineBytes = wolfCrypt_heap_peakBytes_checkpoint(); \
|
heap_baselineBytes = wolfCrypt_heap_peakBytes_checkpoint(); \
|
||||||
}
|
}
|
||||||
|
#define PRINT_HEAP_ADDRESS(p) \
|
||||||
|
printf("Allocated address: %p", (void *)(p));
|
||||||
#else
|
#else
|
||||||
#define PRINT_HEAP_CHECKPOINT(b, i) WC_DO_NOTHING;
|
#define PRINT_HEAP_CHECKPOINT(b, i) WC_DO_NOTHING;
|
||||||
#define PRINT_HEAP_ADDRESS(p) WC_DO_NOTHING;
|
#define PRINT_HEAP_ADDRESS(p) WC_DO_NOTHING;
|
||||||
|
Reference in New Issue
Block a user