Commit 54661db6a4db1fe4879f04ec6e747b4953cdd1b8
2019-09-05T17:10:48
allow RSA superclass to be built with tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
diff --git a/demo/opponent.c b/demo/opponent.c
index 69c1c85..dc0893c 100644
--- a/demo/opponent.c
+++ b/demo/opponent.c
@@ -35,9 +35,11 @@ int mtest_opponent(void)
div2_n = mul2_n = inv_n = expt_n = lcm_n = gcd_n = add_n =
sub_n = mul_n = div_n = sqr_n = mul2d_n = div2d_n = add_d_n = sub_d_n = 0;
+#ifndef MP_FIXED_CUTOFFS
/* force KARA and TOOM to enable despite cutoffs */
KARATSUBA_SQR_CUTOFF = KARATSUBA_MUL_CUTOFF = 8;
TOOM_SQR_CUTOFF = TOOM_MUL_CUTOFF = 16;
+#endif
for (;;) {
/* randomly clear and re-init one variable, this has the affect of triming the alloc space */
diff --git a/tommath_superclass.h b/tommath_superclass.h
index cf17866..df23490 100644
--- a/tommath_superclass.h
+++ b/tommath_superclass.h
@@ -4,10 +4,13 @@
/* super class file for PK algos */
/* default ... include all MPI */
+#ifndef LTM_NOTHING
#define LTM_ALL
+#endif
/* RSA only (does not support DH/DSA/ECC) */
/* #define SC_RSA_1 */
+/* #define SC_RSA_1_WITH_TESTS */
/* For reference.... On an Athlon64 optimizing for speed...
@@ -15,11 +18,38 @@
*/
+#ifdef SC_RSA_1_WITH_TESTS
+# define BN_CUTOFFS_C
+# define BN_MP_ERROR_TO_STRING_C
+# define BN_MP_FREAD_C
+# define BN_MP_FWRITE_C
+# define BN_MP_INCR_C
+# define BN_MP_ISEVEN_C
+# define BN_MP_ISODD_C
+# define BN_MP_NEG_C
+# define BN_MP_PRIME_FROBENIUS_UNDERWOOD_C
+# define BN_MP_RADIX_SIZE_C
+# define BN_MP_RADIX_SMAP_C
+# define BN_MP_RAND_C
+# define BN_MP_REDUCE_C
+# define BN_MP_REDUCE_2K_L_C
+# define BN_MP_READ_SIGNED_BIN_C
+# define BN_MP_ROOT_U32_C
+# define BN_MP_SET_L_C
+# define BN_MP_SET_UL_C
+# define BN_MP_SIGNED_BIN_SIZE_C
+# define BN_MP_TO_RADIX_C
+# define BN_MP_TO_SIGNED_BIN_C
+# define BN_S_MP_RAND_JENKINS_C
+# define BN_S_MP_RAND_PLATFORM_C
+#endif
+
/* Works for RSA only, mpi.o is 68KiB */
-#ifdef SC_RSA_1
+#if defined(SC_RSA_1) || defined (SC_RSA_1_WITH_TESTS)
# define BN_MP_SHRINK_C
# define BN_MP_LCM_C
-# define BN_MP_PRIME_RANDOM_EX_C
+# define BN_MP_PRIME_RAND_C
+# define BN_MP_PRIME_IS_PRIME_C
# define BN_MP_INVMOD_C
# define BN_MP_GCD_C
# define BN_MP_MOD_C
@@ -39,6 +69,7 @@
/* other modifiers */
# define BN_MP_DIV_SMALL /* Slower division, not critical */
+
/* here we are on the last pass so we turn things off. The functions classes are still there
* but we remove them specifically from the build. This also invokes tweaks in functions
* like removing support for even moduli, etc...
@@ -48,7 +79,6 @@
# undef BN_S_MP_TOOM_SQR_C
# undef BN_S_MP_KARATSUBA_MUL_C
# undef BN_S_MP_KARATSUBA_SQR_C
-# undef BN_MP_REDUCE_C
# undef BN_MP_REDUCE_SETUP_C
# undef BN_MP_DR_IS_MODULUS_C
# undef BN_MP_DR_SETUP_C
@@ -62,6 +92,10 @@
# undef BN_S_MP_MUL_HIGH_DIGS_FAST_C
# undef BN_S_MP_INVMOD_FAST_C
+# ifndef SC_RSA_1_WITH_TESTS
+# undef BN_MP_REDUCE_C
+# endif
+
/* To safely undefine these you have to make sure your RSA key won't exceed the Comba threshold
* which is roughly 255 digits [7140 bits for 32-bit machines, 15300 bits for 64-bit machines]
* which means roughly speaking you can handle upto 2536-bit RSA keys with these defined without