TeaSpeak/tommath
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make astyle + some manual adjustments

Browse Source
This commit is contained in:
Steffen Jaeckel 2018-12-25 15:15:30 +01:00
parent a79a7eda65
commit 3ed524048f
8 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bn_mp_prime_frobenius_underwood.c
View File

@ -153,7 +153,9 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
* sz = temp * sz = temp
*/ */
if (a == 0) { if (a == 0) {
if ((e = mp_mul_2(&sz,&T1z)) != MP_OKAY) { goto LBL_FU_ERR; } if ((e = mp_mul_2(&sz,&T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
} else { } else {
if ((e = mp_mul_d(&sz, (mp_digit) ap2, &T1z)) != MP_OKAY) { if ((e = mp_mul_d(&sz, (mp_digit) ap2, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR; goto LBL_FU_ERR;

9
bn_mp_prime_is_prime.c
View File

@ -192,23 +192,22 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
Sorenson, Jonathan; Webster, Jonathan (2015). Sorenson, Jonathan; Webster, Jonathan (2015).
"Strong Pseudoprimes to Twelve Prime Bases". "Strong Pseudoprimes to Twelve Prime Bases".
*/ */
/* 318665857834031151167461 */ /* 0x437ae92817f9fc85b7e5 = 318665857834031151167461 */
if ((err = mp_read_radix(&b, "437ae92817f9fc85b7e5", 16)) != MP_OKAY) { if ((err = mp_read_radix(&b, "437ae92817f9fc85b7e5", 16)) != MP_OKAY) {
goto LBL_B; goto LBL_B;
} }
if (mp_cmp(a,&b) == MP_LT) { if (mp_cmp(a,&b) == MP_LT) {
p_max = 12; p_max = 12;
} } else {
else { /* 3317044064679887385961981 */ /* 0x2be6951adc5b22410a5fd = 3317044064679887385961981 */
if ((err = mp_read_radix(&b, "2be6951adc5b22410a5fd", 16)) != MP_OKAY) { if ((err = mp_read_radix(&b, "2be6951adc5b22410a5fd", 16)) != MP_OKAY) {
goto LBL_B; goto LBL_B;
} }
if (mp_cmp(a,&b) == MP_LT) { if (mp_cmp(a,&b) == MP_LT) {
p_max = 13; p_max = 13;
} } else {
else {
err = MP_VAL; err = MP_VAL;
goto LBL_B; goto LBL_B;
} }

4
bn_mp_prime_strong_lucas_selfridge.c
View File

@ -118,7 +118,7 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
/* if 1 < GCD < N then N is composite with factor "D", and /* if 1 < GCD < N then N is composite with factor "D", and
Jacobi(D,N) is technically undefined (but often returned Jacobi(D,N) is technically undefined (but often returned
as zero). */ as zero). */
if ( mp_cmp_d(&gcd,1u) == MP_GT && mp_cmp(&gcd,a) == MP_LT) { if ((mp_cmp_d(&gcd,1u) == MP_GT) && (mp_cmp(&gcd,a) == MP_LT)) {
goto LBL_LS_ERR; goto LBL_LS_ERR;
} }
if (Ds < 0) { if (Ds < 0) {
@ -313,7 +313,7 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
if ((e = mp_div_2(&Uz,&Uz)) != MP_OKAY) { if ((e = mp_div_2(&Uz,&Uz)) != MP_OKAY) {
goto LBL_LS_ERR; goto LBL_LS_ERR;
} }
if (Uz.sign == MP_NEG && mp_isodd(&Uz)) { if ((Uz.sign == MP_NEG) && mp_isodd(&Uz)) {
if ((e = mp_sub_d(&Uz,1u,&Uz)) != MP_OKAY) { if ((e = mp_sub_d(&Uz,1u,&Uz)) != MP_OKAY) {
goto LBL_LS_ERR; goto LBL_LS_ERR;
} }

10
demo/demo.c
View File

@ -307,8 +307,7 @@ int main(void)
if (k < 0) { if (k < 0) {
mp_set_int(&a, (unsigned long)(-k)); mp_set_int(&a, (unsigned long)(-k));
mp_neg(&a, &a); mp_neg(&a, &a);
} } else {
else {
mp_set_int(&a, (unsigned long) k); mp_set_int(&a, (unsigned long) k);
} }
/* only test positive values of a */ /* only test positive values of a */
@ -316,8 +315,7 @@ int main(void)
if (m < 0) { if (m < 0) {
mp_set_int(&b,(unsigned long)(-m)); mp_set_int(&b,(unsigned long)(-m));
mp_neg(&b, &b); mp_neg(&b, &b);
} } else {
else {
mp_set_int(&b, (unsigned long) m); mp_set_int(&b, (unsigned long) m);
} }
if ((err = mp_kronecker(&a, &b, &i)) != MP_OKAY) { if ((err = mp_kronecker(&a, &b, &i)) != MP_OKAY) {
@ -676,7 +674,9 @@ int main(void)
/* strong Miller-Rabin pseudoprime to the first 200 primes (F. Arnault) */ /* strong Miller-Rabin pseudoprime to the first 200 primes (F. Arnault) */
puts("Testing mp_prime_is_prime() with Arnault's pseudoprime 803...901 \n"); puts("Testing mp_prime_is_prime() with Arnault's pseudoprime 803...901 \n");
mp_read_radix(&a,"91xLNF3roobhzgTzoFIG6P13ZqhOVYSN60Fa7Cj2jVR1g0k89zdahO9/kAiRprpfO1VAp1aBHucLFV/qLKLFb+zonV7R2Vxp1K13ClwUXStpV0oxTNQVjwybmFb5NBEHImZ6V7P6+udRJuH8VbMEnS0H8/pSqQrg82OoQQ2fPpAk6G1hkjqoCv5s/Yr",64); mp_read_radix(&a,
"91xLNF3roobhzgTzoFIG6P13ZqhOVYSN60Fa7Cj2jVR1g0k89zdahO9/kAiRprpfO1VAp1aBHucLFV/qLKLFb+zonV7R2Vxp1K13ClwUXStpV0oxTNQVjwybmFb5NBEHImZ6V7P6+udRJuH8VbMEnS0H8/pSqQrg82OoQQ2fPpAk6G1hkjqoCv5s/Yr",
64);
mp_prime_is_prime(&a, 8, &cnt); mp_prime_is_prime(&a, 8, &cnt);
if (cnt == MP_YES) { if (cnt == MP_YES) {
printf("Arnault's pseudoprime is not prime but mp_prime_is_prime says it is.\n"); printf("Arnault's pseudoprime is not prime but mp_prime_is_prime says it is.\n");

4
demo/timing.c
View File

@ -130,7 +130,9 @@ int main(void)
for (m = 0; m < 2; ++m) { for (m = 0; m < 2; ++m) {
if (m == 0) { if (m == 0) {
name = " Arnault"; name = " Arnault";
mp_read_radix(&a,"91xLNF3roobhzgTzoFIG6P13ZqhOVYSN60Fa7Cj2jVR1g0k89zdahO9/kAiRprpfO1VAp1aBHucLFV/qLKLFb+zonV7R2Vxp1K13ClwUXStpV0oxTNQVjwybmFb5NBEHImZ6V7P6+udRJuH8VbMEnS0H8/pSqQrg82OoQQ2fPpAk6G1hkjqoCv5s/Yr",64); mp_read_radix(&a,
"91xLNF3roobhzgTzoFIG6P13ZqhOVYSN60Fa7Cj2jVR1g0k89zdahO9/kAiRprpfO1VAp1aBHucLFV/qLKLFb+zonV7R2Vxp1K13ClwUXStpV0oxTNQVjwybmFb5NBEHImZ6V7P6+udRJuH8VbMEnS0H8/pSqQrg82OoQQ2fPpAk6G1hkjqoCv5s/Yr",
64);
} else { } else {
name = "2^1119 + 53"; name = "2^1119 + 53";
mp_set(&a,1u); mp_set(&a,1u);