wolfssl/wolfcrypt/error-crypt.h: when !WOLFSSL_DEBUG_TRACE_ERROR_CODE…

…S, use macros for the MPI error codes, for backward compat; wolfssl/wolfcrypt/sp_int.h: include wolfssl/wolfcrypt/error-crypt.h, to assure MPI error codes are defined.
wolfSSL · Aug 21, 2024 · 77c5aab · 77c5aab
1 parent a7998a2
commit 77c5aab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/wolfssl/wolfcrypt/error-crypt.h b/wolfssl/wolfcrypt/error-crypt.h
@@ -46,11 +46,21 @@ enum {
     MAX_CODE_E         =   -1,  /* errors -2 - -299 */
     WC_FIRST_E         =   -2,  /* errors -2 - -299 */
 
+#ifdef WOLFSSL_DEBUG_TRACE_ERROR_CODES
     MP_MEM             =   -2,  /* MP dynamic memory allocation failed. */
     MP_VAL             =   -3,  /* MP value passed is not able to be used. */
     MP_WOULDBLOCK      =   -4,  /* MP non-blocking operation is returning after
                                  * partial completion. */
     MP_NOT_INF         =   -5,  /* MP point not at infinity */
+#else /* !WOLFSSL_DEBUG_TRACE_ERROR_CODES */
+    /* by default, use macros to define the MPI error codes, for backward
+     * compatibility.
+     */
+    #define MP_MEM (-2)
+    #define MP_VAL (-3)
+    #define MP_WOULDBLOCK (-4)
+    #define MP_NOT_INF (-5)
+#endif /* !WOLFSSL_DEBUG_TRACE_ERROR_CODES */
 
     OPEN_RAN_E         = -101,  /* opening random device error */
     READ_RAN_E         = -102,  /* reading random device error */

diff --git a/wolfssl/wolfcrypt/sp_int.h b/wolfssl/wolfcrypt/sp_int.h
@@ -30,8 +30,9 @@ This library provides single precision (SP) integer math functions.
 #ifndef WOLFSSL_LINUXKM
 #include <limits.h>
 #endif
-#include  <wolfssl/wolfcrypt/settings.h>
-#include  <wolfssl/wolfcrypt/hash.h>
+#include <wolfssl/wolfcrypt/types.h>
+#include <wolfssl/wolfcrypt/error-crypt.h>
+#include <wolfssl/wolfcrypt/hash.h>
 
 #ifdef __cplusplus
 extern "C" {