oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

libtommath: protect functions by tommath_class macros

Browse Source 
libtommath protects the inclusion of functions by wrapping their
declarations by CPP #ifdef tests and defining the matching macros
within libtommath_class.h.

Add missing macros:

  BN_MP_FIND_PRIME_C
  BN_MP_ISPRIME_C

Change-Id: Ic577300114f8e88d7a3af3d9f717a249d57f03b1
This commit is contained in:
Jeffrey Altman
2013-10-07 14:00:21 -05:00
parent b90732860a
commit 1859a85350
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/hcrypto/libtommath/bn_mp_find_prime.c
View File

@@ -5,7 +5,7 @@
* Love Hornquist Astrand <lha@h5l.org> * Love Hornquist Astrand <lha@h5l.org>
*/ */
#include <tommath.h> #include <tommath.h>
#ifdef BN_MP_FIND_PRIME_C
int mp_find_prime(mp_int *a) int mp_find_prime(mp_int *a)
{ {
int res; int res;
@@ -24,3 +24,4 @@ int mp_find_prime(mp_int *a)
return res; return res;
} }
#endif

3
lib/hcrypto/libtommath/bn_mp_isprime.c
View File

@@ -8,7 +8,7 @@
* Tom St Denis, tomstdenis@gmail.com * Tom St Denis, tomstdenis@gmail.com
*/ */
#include <tommath.h> #include <tommath.h>
#ifdef BN_MP_ISPRIME_C
/* a few primes */ /* a few primes */
static const mp_digit primes[256] = { static const mp_digit primes[256] = {
0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013, 0x0002, 0x0003, 0x0005, 0x0007, 0x000B, 0x000D, 0x0011, 0x0013,
@@ -73,3 +73,4 @@ int mp_isprime(mp_int *a)
} }
return MP_YES; return MP_YES;
} }
#endif

2
lib/hcrypto/libtommath/tommath_class.h
View File

@@ -42,6 +42,7 @@
#define BN_MP_EXPTMOD_C #define BN_MP_EXPTMOD_C
#define BN_MP_EXPTMOD_FAST_C #define BN_MP_EXPTMOD_FAST_C
#define BN_MP_EXTEUCLID_C #define BN_MP_EXTEUCLID_C
#define BN_MP_FIND_PRIME_C
#define BN_MP_FREAD_C #define BN_MP_FREAD_C
#define BN_MP_FWRITE_C #define BN_MP_FWRITE_C
#define BN_MP_GCD_C #define BN_MP_GCD_C
@@ -55,6 +56,7 @@
#define BN_MP_INIT_SIZE_C #define BN_MP_INIT_SIZE_C
#define BN_MP_INVMOD_C #define BN_MP_INVMOD_C
#define BN_MP_INVMOD_SLOW_C #define BN_MP_INVMOD_SLOW_C
#define BN_MP_ISPRIME_C
#define BN_MP_IS_SQUARE_C #define BN_MP_IS_SQUARE_C
#define BN_MP_JACOBI_C #define BN_MP_JACOBI_C
#define BN_MP_KARATSUBA_MUL_C #define BN_MP_KARATSUBA_MUL_C