diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2017-06-24 22:51:45 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2017-06-24 22:51:45 +0800 |
| commit | 6ac5ea2a9f8bad30909e30ed196879ddbd118310 (patch) | |
| tree | 4c43cdca57c6b70f2c509e6b15e269b13afa5ffc /libtomcrypt/src/math/tfm_desc.c | |
| parent | 17a9b8802f0306010f5d1f071dce2b3ca80ae415 (diff) | |
| parent | 364fb6019c1931de3d181f21ea491ec112161577 (diff) | |
merge from main (libtommath/libtomcrypt/curve25510-donna updates)
--HG--
branch : fuzz
Diffstat (limited to 'libtomcrypt/src/math/tfm_desc.c')
| -rw-r--r-- | libtomcrypt/src/math/tfm_desc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libtomcrypt/src/math/tfm_desc.c b/libtomcrypt/src/math/tfm_desc.c index 023756d..f568044 100644 --- a/libtomcrypt/src/math/tfm_desc.c +++ b/libtomcrypt/src/math/tfm_desc.c @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com + * Tom St Denis, tomstdenis@gmail.com, http://libtom.org */ #define DESC_DEF_ONLY @@ -403,7 +403,7 @@ static int isprime(void *a, int *b) return CRYPT_OK; } -#if defined(MECC) && defined(MECC_ACCEL) +#if defined(LTC_MECC) && defined(LTC_MECC_ACCEL) static int tfm_ecc_projective_dbl_point(ecc_point *P, ecc_point *R, void *modulus, void *Mp) { @@ -733,34 +733,34 @@ const ltc_math_descriptor tfm_desc = { &exptmod, &isprime, -#ifdef MECC -#ifdef MECC_FP +#ifdef LTC_MECC +#ifdef LTC_MECC_FP <c_ecc_fp_mulmod, #else <c_ecc_mulmod, -#endif /* MECC_FP */ -#ifdef MECC_ACCEL +#endif /* LTC_MECC_FP */ +#ifdef LTC_MECC_ACCEL &tfm_ecc_projective_add_point, &tfm_ecc_projective_dbl_point, #else <c_ecc_projective_add_point, <c_ecc_projective_dbl_point, -#endif /* MECC_ACCEL */ +#endif /* LTC_MECC_ACCEL */ <c_ecc_map, #ifdef LTC_ECC_SHAMIR -#ifdef MECC_FP +#ifdef LTC_MECC_FP <c_ecc_fp_mul2add, #else <c_ecc_mul2add, -#endif /* MECC_FP */ +#endif /* LTC_MECC_FP */ #else NULL, #endif /* LTC_ECC_SHAMIR */ #else NULL, NULL, NULL, NULL, NULL, -#endif /* MECC */ +#endif /* LTC_MECC */ -#ifdef MRSA +#ifdef LTC_MRSA &rsa_make_key, &rsa_exptmod, #else @@ -772,6 +772,6 @@ const ltc_math_descriptor tfm_desc = { #endif -/* $Source: /cvs/libtom/libtomcrypt/src/math/tfm_desc.c,v $ */ -/* $Revision: 1.26 $ */ -/* $Date: 2006/12/03 00:39:56 $ */ +/* $Source$ */ +/* $Revision$ */ +/* $Date$ */ |