From fe7502a50e3f42c587e8727c3377a3d0d4bee8ce Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 13 Jun 2023 11:39:24 -0700 Subject: [PATCH] Fix for SP math all and ECC with compressed keys (missing sp_add_d). Reproduce using: `./configure --disable-rsa --disable-dh --enable-compkey --disable-pkcs12 && make`. --- configure.ac | 1 + wolfcrypt/src/sp_int.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7a09d9b6a..931fb89c0 100644 --- a/configure.ac +++ b/configure.ac @@ -8950,6 +8950,7 @@ echo " * XCHACHA: $ENABLED_XCHACHA" echo " * Hash DRBG: $ENABLED_HASHDRBG" echo " * MmemUse Entropy: $ENABLED_ENTROPY_MEMUSE" echo " * PWDBASED: $ENABLED_PWDBASED" +echo " * Encrypted keys: $ENABLED_ENCKEYS" echo " * scrypt: $ENABLED_SCRYPT" echo " * wolfCrypt Only: $ENABLED_CRYPTONLY" echo " * HKDF: $ENABLED_HKDF" diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c index 85fc455b7..393237073 100644 --- a/wolfcrypt/src/sp_int.c +++ b/wolfcrypt/src/sp_int.c @@ -4780,7 +4780,7 @@ static void _sp_mont_setup(const sp_int* m, sp_int_digit* rho); /* Determine when mp_add_d is required. */ #if !defined(NO_PWDBASED) || defined(WOLFSSL_KEY_GEN) || !defined(NO_DH) || \ - !defined(NO_DSA) || \ + !defined(NO_DSA) || (defined(HAVE_ECC) && defined(HAVE_COMP_KEY)) || \ (!defined(NO_RSA) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || \ defined(OPENSSL_EXTRA) #define WOLFSSL_SP_ADD_D