From d805a5c6818846040573bef78c66233fb56104a9 Mon Sep 17 00:00:00 2001 From: Sean Parkinson Date: Thu, 25 Feb 2021 10:01:27 +1000 Subject: [PATCH] SP int: get keygen working with SP math again ./configure --enable-sp --enable-sp-math --enable-keygen --- configure.ac | 13 ++++++++----- wolfcrypt/src/sp_int.c | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 90229e422..33caccf6f 100644 --- a/configure.ac +++ b/configure.ac @@ -6530,13 +6530,16 @@ echo " * Fast RSA: $ENABLED_FAST_RSA" echo " * Single Precision: $ENABLED_SP" if test "$ENABLED_SP_MATH_ALL" != "no" then - echo " * SP math implementation: all" -elif test "$ENABLED_SP_MATH" != "no" -then - echo " * SP math implementation: restricted" + ENABLED_SP_MATH_DESC="all" else - echo " * SP math implementation: no" + if test "$ENABLED_SP_MATH" != "no" + then + ENABLED_SP_MATH_DESC="restricted" + else + ENABLED_SP_MATH_DESC="no" + fi fi +echo " * SP math implementation: $ENABLED_SP_MATH_DESC" echo " * Async Crypto: $ENABLED_ASYNCCRYPT" echo " * PKCS#11: $ENABLED_PKCS11" echo " * PKCS#12: $ENABLED_PKCS12" diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c index 934037b97..a4de243f4 100644 --- a/wolfcrypt/src/sp_int.c +++ b/wolfcrypt/src/sp_int.c @@ -13230,7 +13230,7 @@ int sp_prime_is_prime_ex(sp_int* a, int t, int* result, WC_RNG* rng) } #endif /* WOLFSSL_SP_MATH_ALL || WOLFSSL_HAVE_SP_DH */ -#if defined(WOLFSSL_SP_MATH_ALL) && !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) +#if !defined(NO_RSA) && defined(WOLFSSL_KEY_GEN) /* Calculates the Greatest Common Denominator (GCD) of a and b into r. *