make it compile with MP_8BIT

This commit is contained in:
czurnieden 2018-05-04 15:15:13 +02:00 committed by Steffen Jaeckel
parent 44ccca75be
commit fdaad99b1b
3 changed files with 12 additions and 9 deletions

View File

@ -19,13 +19,16 @@
// floor of positive solution of
// (2^16)-1 = (a+4)*(2*a+5)
// TODO: that is too small, would have to use a bigint for a instead
// #define LTM_FROBENIUS_UNDERWOOD_A 177
#error "Frobenius test not usable with MP_8BIT"
#endif
#define LTM_FROBENIUS_UNDERWOOD_A 177
// commented out to allow Travis's tests to run
// Don't forget to switch in back on in production or we'll find it at TDWTF.com!
//#warning "Frobenius test not fully usable with MP_8BIT!"
#else
// floor of positive solution of
// (2^31)-1 = (a+4)*(2*a+5)
// TODO: that might be too small
#define LTM_FROBENIUS_UNDERWOOD_A 32764
#endif
int mp_prime_frobenius_underwood(const mp_int *N, int *result)
{
mp_int T1z,T2z,Np1z,sz,tz;

View File

@ -109,7 +109,8 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
if (res == MP_NO) {
goto LBL_B;
}
// strong Lucas Selfridge test needs some changes to be usable with 8-bit
#ifndef MP_8BIT
// commented out for testing purposes
//#ifdef LTM_USE_STRONG_LUCAS_SELFRIDGE_TEST
if ((err = mp_prime_strong_lucas_selfridge(a, &res)) != MP_OKAY) {
@ -119,7 +120,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
goto LBL_B;
}
//#endif
#endif
//#ifdef LTM_USE_FROBENIUS_UNDERWOOD_TEST
if ((err = mp_prime_frobenius_underwood(a, &res)) != MP_OKAY) {
goto LBL_B;

View File

@ -14,9 +14,8 @@
* guarantee it works.
*/
#ifdef MP_8BIT
#error "BPSW test not for MP_8BIT yet"
#endif
#ifndef MP_8BIT
/*
Strong Lucas-Selfridge test.
returns MP_YES if it is a strong L-S prime, MP_NO if it is composite
@ -354,5 +353,5 @@ LBL_LS_ERR:
mp_clear_multi(&Dz, &gcd, &Np1, &Uz, &Vz, &U2mz, &V2mz, &Qmz, &Q2mz, &Qkdz, &T1z, &T2z, &T3z, &T4z, &Q2kdz, NULL);
return e;
}
#endif
#endif