add MP_NO_DEPRECATED conditional

Furthermore we need _MP_NO_DEPRECATED_WARNING to disable the warning on CI.
The macro is intentionally prefixed by an underscore to emphasise that
its only for internal usage.

Author: minad

bn_deprecated.c

@@ -6,6 +6,7 @@
 
 /* SPDX-License-Identifier: Unlicense */
 #include <tommath_private.h>
+#ifndef MP_NO_DEPRECATED
 #ifdef BN_FAST_MP_INVMOD_C
 int fast_mp_invmod(const mp_int *a, const mp_int *b, mp_int *c)
 {
@@ -85,3 +86,4 @@ void bn_reverse(unsigned char *s, int len)
 }
 #endif
 #endif
+#endif

makefile_include.mk

@@ -49,6 +49,8 @@ endif
 
 CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow
 
+CFLAGS += -D_MP_NO_DEPRECATED_WARNING
+
 ifndef NO_ADDTL_WARNINGS
 # additional warnings
 CFLAGS += -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align

tommath.h

@@ -137,7 +137,6 @@ extern int KARATSUBA_MUL_CUTOFF,
 
 /* size of comba arrays, should be at least 2 * 2**(BITS_PER_WORD - BITS_PER_DIGIT*2) */
 #define _MP_WARRAY_PRIVATE (1u << (((CHAR_BIT * sizeof(mp_word)) - (2 * MP_DIGIT_BIT)) + 1))
-#define MP_WARRAY (MP_DEPRECATED_PRAGMA("MP_WARRAY is an internal macro") _MP_WARRAY_PRIVATE)
 
 /* the infamous mp_int structure */
 typedef struct  {
@@ -148,23 +147,31 @@ typedef struct  {
 /* callback for mp_prime_random, should fill dst with random bytes and return how many read [upto len] */
 typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat);
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 301)
-#  define MP_DEPRECATED(x) __attribute__((deprecated("replaced by " #x)))
-#  define _MP_DEPRECATED_PRAGMA(s) _Pragma(#s)
-#  define MP_DEPRECATED_PRAGMA(s) _MP_DEPRECATED_PRAGMA(GCC warning s)
-#elif defined(_MSC_VER) && _MSC_VER >= 1500
-#  define MP_DEPRECATED(x) __declspec(deprecated("replaced by " #x))
-#  define MP_DEPRECATED_PRAGMA(s) __pragma(message(s))
-#else
-#  define MP_DEPRECATED
-#  define MP_DEPRECATED_PRAGMA(s)
+#ifndef MP_NO_DEPRECATED
+
+#  ifndef _MP_NO_DEPRECATED_WARNING
+#    warning Deprecated functions are enabled, define MP_NO_DEPRECATED!
+#  endif
+
+#  if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 301)
+#    define MP_DEPRECATED(x) __attribute__((deprecated("replaced by " #x)))
+#    define _MP_DEPRECATED_PRAGMA(s) _Pragma(#s)
+#    define MP_DEPRECATED_PRAGMA(s) _MP_DEPRECATED_PRAGMA(GCC warning s)
+#  elif defined(_MSC_VER) && _MSC_VER >= 1500
+#    define MP_DEPRECATED(x) __declspec(deprecated("replaced by " #x))
+#    define MP_DEPRECATED_PRAGMA(s) __pragma(message(s))
+#  else
+#    define MP_DEPRECATED
+#    define MP_DEPRECATED_PRAGMA(s)
+#  endif
+
+#  define DIGIT_BIT   MP_DIGIT_BIT
+#  define USED(m)     (MP_DEPRECATED_PRAGMA("USED macro is deprecated, use z->used instead") (m)->used)
+#  define DIGIT(m, k) (MP_DEPRECATED_PRAGMA("DIGIT macro is deprecated, use z->dp instead") (m)->dp[(k)])
+#  define SIGN(m)     (MP_DEPRECATED_PRAGMA("SIGN macro is deprecated, use z->sign instead") (m)->sign)
+#  define MP_WARRAY   (MP_DEPRECATED_PRAGMA("MP_WARRAY is an internal macro") _MP_WARRAY_PRIVATE)
 #endif
 
-#define DIGIT_BIT   (MP_DEPRECATED_PRAGMA("DIGIT_BIT macro is deprecated, MP_DIGIT_BIT instead") MP_DIGIT_BIT)
-#define USED(m)     (MP_DEPRECATED_PRAGMA("USED macro is deprecated, use z->used instead") (m)->used)
-#define DIGIT(m, k) (MP_DEPRECATED_PRAGMA("DIGIT macro is deprecated, use z->dp instead") (m)->dp[(k)])
-#define SIGN(m)     (MP_DEPRECATED_PRAGMA("SIGN macro is deprecated, use z->sign instead") (m)->sign)
-
 /* error code to char* string */
 const char *mp_error_to_string(int code);
 

tommath_private.h

@@ -89,6 +89,7 @@ int func_name (mp_int * a, type b)                       \
 }
 
 /* deprecated functions */
+#ifndef MP_NO_DEPRECATED
 MP_DEPRECATED(s_mp_invmod_fast) int fast_mp_invmod(const mp_int *a, const mp_int *b, mp_int *c);
 MP_DEPRECATED(s_mp_montgomery_reduce_fast) int fast_mp_montgomery_reduce(mp_int *x, const mp_int *n, mp_digit rho);
 MP_DEPRECATED(s_mp_mul_digs_fast) int fast_s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs);
@@ -104,6 +105,7 @@ MP_DEPRECATED(s_mp_karatsuba_sqr) int mp_karatsuba_sqr(const mp_int *a, mp_int *
 MP_DEPRECATED(s_mp_toom_mul) int mp_toom_mul(const mp_int *a, const mp_int *b, mp_int *c);
 MP_DEPRECATED(s_mp_toom_sqr) int mp_toom_sqr(const mp_int *a, mp_int *b);
 MP_DEPRECATED(s_mp_reverse) void bn_reverse(unsigned char *s, int len);
+#endif
 
 #ifdef __cplusplus
 }