user_settings: allow multiples HAVE_ECC* defines

wolfSSL · Apr 23, 2024 · 7f4db82 · 7f4db82
1 parent b663ebe
commit 7f4db82
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/include/user_settings.h b/include/user_settings.h
@@ -132,31 +132,36 @@ extern int tolower(int c);
 /* Curve */
 #   ifdef WOLFBOOT_SIGN_ECC256
 #       define HAVE_ECC256
-#       define FP_MAX_BITS (256 + 32)
-#       if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH_ALL)
-#           define WOLFSSL_SP_NO_384
-#           define WOLFSSL_SP_NO_521
-#       endif
 #   elif defined(WOLFBOOT_SIGN_ECC384)
 #       define HAVE_ECC384
-#       define FP_MAX_BITS (384 * 2)
-#       if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH_ALL)
-#           define WOLFSSL_SP_384
-#           define WOLFSSL_SP_NO_256
-#       endif
-#       if !defined(WOLFBOOT_TPM_PARMENC)
-#           define NO_ECC256
-#       endif
+#       define WOLFSSL_SP_384
 #   elif defined(WOLFBOOT_SIGN_ECC521)
 #       define HAVE_ECC521
-#       define FP_MAX_BITS (528 * 2)
-#       if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH_ALL)
-#           define WOLFSSL_SP_521
-#           define WOLFSSL_SP_NO_256
-#       endif
-#       if !defined(WOLFBOOT_TPM_PARMENC)
-#           define NO_ECC256
-#       endif
+#       define WOLFSSL_SP_512
+#   endif
+  /* FP MAX BITS */
+#   if defined(HAVE_ECC512)
+#   define FP_MAX_BITS ((528 * 2))
+#   elif defined(HAVE_ECC384)
+#   define FP_MAX_BITS ((384 * 2))
+#   elif defined(HAVE_ECC256)
+#   define FP_MAX_BITS ((256 + 32))
+#   endif
+
+#   if !defined(HAVE_ECC256) && !defined(WOLFBOOT_TPM_PARMENC)
+#   define NO_ECC256
+#   endif
+
+#   if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH_ALL)
+#      if !defined(HAVE_ECC512)
+#      define WOLFSSL_SP_NO_512
+#      endif
+#      if !defined(HAVE_ECC384)
+#      define WOLFSSL_SP_NO_383
+#      endif
+#      if !defined(HAVE_ECC256)
+#      define WOLFSSL_SP_NO_256
+#      endif
 #   endif
 #endif /* WOLFBOOT_SIGN_ECC521 || WOLFBOOT_SIGN_ECC384 || WOLFBOOT_SIGN_ECC256 */