Commit 0f53ceb4cb207d270bc31d7221fea214c98eb1cf
2018-12-26T08:47:47
improve indentation
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 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385
diff --git a/bn_mp_jacobi.c b/bn_mp_jacobi.c
index 65fb2d2..f62e1e4 100644
--- a/bn_mp_jacobi.c
+++ b/bn_mp_jacobi.c
@@ -28,7 +28,7 @@ int mp_jacobi(const mp_int *a, const mp_int *n, int *c)
return MP_VAL;
}
- return mp_kronecker(a,n,c);
+ return mp_kronecker(a, n, c);
}
#endif
diff --git a/bn_mp_kronecker.c b/bn_mp_kronecker.c
index f3a423a..e873daa 100644
--- a/bn_mp_kronecker.c
+++ b/bn_mp_kronecker.c
@@ -116,7 +116,7 @@ int mp_kronecker(const mp_int *a, const mp_int *p, int *c)
}
}
- if ((e = mp_copy(&a1,&r)) != MP_OKAY) {
+ if ((e = mp_copy(&a1, &r)) != MP_OKAY) {
goto LBL_KRON;
}
r.sign = MP_ZPOS;
diff --git a/bn_mp_prime_frobenius_underwood.c b/bn_mp_prime_frobenius_underwood.c
index 6a2a51d..541c694 100644
--- a/bn_mp_prime_frobenius_underwood.c
+++ b/bn_mp_prime_frobenius_underwood.c
@@ -35,14 +35,14 @@
#endif
int mp_prime_frobenius_underwood(const mp_int *N, int *result)
{
- mp_int T1z,T2z,Np1z,sz,tz;
+ mp_int T1z, T2z, Np1z, sz, tz;
int a, ap2, length, i, j, isset;
int e;
*result = MP_NO;
- if ((e = mp_init_multi(&T1z,&T2z,&Np1z,&sz,&tz, NULL)) != MP_OKAY) {
+ if ((e = mp_init_multi(&T1z, &T2z, &Np1z, &sz, &tz, NULL)) != MP_OKAY) {
return e;
}
@@ -53,11 +53,11 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
continue;
}
/* (32764^2 - 4) < 2^31, no bigint for >MP_8BIT needed) */
- if ((e = mp_set_long(&T1z,(unsigned long)a)) != MP_OKAY) {
+ if ((e = mp_set_long(&T1z, (unsigned long)a)) != MP_OKAY) {
goto LBL_FU_ERR;
}
- if ((e = mp_sqr(&T1z,&T1z)) != MP_OKAY) {
+ if ((e = mp_sqr(&T1z, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
@@ -88,7 +88,7 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
goto LBL_FU_ERR;
}
- if ((e = mp_gcd(N,&T1z,&T1z)) != MP_OKAY) {
+ if ((e = mp_gcd(N, &T1z, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
@@ -111,16 +111,16 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
* tz = ((tz-sz)*(tz+sz))%N;
* sz = temp;
*/
- if ((e = mp_mul_2(&tz,&T2z)) != MP_OKAY) {
+ if ((e = mp_mul_2(&tz, &T2z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
/* a = 0 at about 50% of the cases (non-square and odd input) */
if (a != 0) {
- if ((e = mp_mul_d(&sz,(mp_digit)a,&T1z)) != MP_OKAY) {
+ if ((e = mp_mul_d(&sz, (mp_digit)a, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
- if ((e = mp_add(&T1z,&T2z,&T2z)) != MP_OKAY) {
+ if ((e = mp_add(&T1z, &T2z, &T2z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
}
@@ -143,7 +143,7 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
if ((e = mp_mod(&T1z, N, &sz)) != MP_OKAY) {
goto LBL_FU_ERR;
}
- if ((isset = mp_get_bit(&Np1z,i)) == MP_VAL) {
+ if ((isset = mp_get_bit(&Np1z, i)) == MP_VAL) {
e = isset;
goto LBL_FU_ERR;
}
@@ -154,11 +154,11 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
* sz = temp
*/
if (a == 0) {
- if ((e = mp_mul_2(&sz,&T1z)) != MP_OKAY) {
+ if ((e = mp_mul_2(&sz, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
} 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;
}
}
@@ -171,14 +171,14 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
if ((e = mp_sub(&T2z, &sz, &tz)) != MP_OKAY) {
goto LBL_FU_ERR;
}
- mp_exch(&sz,&T1z);
+ mp_exch(&sz, &T1z);
}
}
if ((e = mp_set_long(&T1z, (unsigned long)((2 * a) + 5))) != MP_OKAY) {
goto LBL_FU_ERR;
}
- if ((e = mp_mod(&T1z,N,&T1z)) != MP_OKAY) {
+ if ((e = mp_mod(&T1z, N, &T1z)) != MP_OKAY) {
goto LBL_FU_ERR;
}
if ((mp_iszero(&sz) != MP_NO) && (mp_cmp(&tz, &T1z) == MP_EQ)) {
@@ -187,7 +187,7 @@ int mp_prime_frobenius_underwood(const mp_int *N, int *result)
}
LBL_FU_ERR:
- mp_clear_multi(&tz,&sz,&Np1z,&T2z,&T1z, NULL);
+ mp_clear_multi(&tz, &sz, &Np1z, &T2z, &T1z, NULL);
return e;
}
diff --git a/bn_mp_prime_is_prime.c b/bn_mp_prime_is_prime.c
index 99f8d04..4915ab8 100644
--- a/bn_mp_prime_is_prime.c
+++ b/bn_mp_prime_is_prime.c
@@ -197,7 +197,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
goto LBL_B;
}
- if (mp_cmp(a,&b) == MP_LT) {
+ if (mp_cmp(a, &b) == MP_LT) {
p_max = 12;
} else {
/* 0x2be6951adc5b22410a5fd = 3317044064679887385961981 */
@@ -205,7 +205,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
goto LBL_B;
}
- if (mp_cmp(a,&b) == MP_LT) {
+ if (mp_cmp(a, &b) == MP_LT) {
p_max = 13;
} else {
err = MP_VAL;
@@ -224,7 +224,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
}
/* we did bases 2 and 3 already, skip them */
for (ix = 2; ix < p_max; ix++) {
- mp_set(&b,ltm_prime_tab[ix]);
+ mp_set(&b, ltm_prime_tab[ix]);
if ((err = mp_prime_miller_rabin(a, &b, &res)) != MP_OKAY) {
goto LBL_B;
}
diff --git a/bn_mp_prime_strong_lucas_selfridge.c b/bn_mp_prime_strong_lucas_selfridge.c
index 579baff..0f5bf70 100644
--- a/bn_mp_prime_strong_lucas_selfridge.c
+++ b/bn_mp_prime_strong_lucas_selfridge.c
@@ -109,7 +109,7 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
for (;;) {
Ds = sign * D;
sign = -sign;
- if ((e = mp_set_long(&Dz,(unsigned long) D)) != MP_OKAY) {
+ if ((e = mp_set_long(&Dz, (unsigned long)D)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if ((e = mp_gcd(a, &Dz, &gcd)) != MP_OKAY) {
@@ -205,14 +205,14 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
if (Q < 0) {
Q = -Q;
- if ((e = mp_set_long(&Qmz, (unsigned long) Q)) != MP_OKAY) {
+ if ((e = mp_set_long(&Qmz, (unsigned long)Q)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if ((e = mp_mul_2(&Qmz, &Q2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
/* Initializes calculation of Q^d */
- if ((e = mp_set_long(&Qkdz, (unsigned long) Q)) != MP_OKAY) {
+ if ((e = mp_set_long(&Qkdz, (unsigned long)Q)) != MP_OKAY) {
goto LBL_LS_ERR;
}
Qmz.sign = MP_NEG;
@@ -220,14 +220,14 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
Qkdz.sign = MP_NEG;
Q = -Q;
} else {
- if ((e = mp_set_long(&Qmz, (unsigned long) Q)) != MP_OKAY) {
+ if ((e = mp_set_long(&Qmz, (unsigned long)Q)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if ((e = mp_mul_2(&Qmz, &Q2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
/* Initializes calculation of Q^d */
- if ((e = mp_set_long(&Qkdz, (unsigned long) Q)) != MP_OKAY) {
+ if ((e = mp_set_long(&Qkdz, (unsigned long)Q)) != MP_OKAY) {
goto LBL_LS_ERR;
}
}
@@ -242,34 +242,34 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
* V_2m = V_m*V_m - 2*Q^m
*/
- if ((e = mp_mul(&U2mz,&V2mz,&U2mz)) != MP_OKAY) {
+ if ((e = mp_mul(&U2mz, &V2mz, &U2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&U2mz,a,&U2mz)) != MP_OKAY) {
+ if ((e = mp_mod(&U2mz, a, &U2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_sqr(&V2mz,&V2mz)) != MP_OKAY) {
+ if ((e = mp_sqr(&V2mz, &V2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_sub(&V2mz,&Q2mz,&V2mz)) != MP_OKAY) {
+ if ((e = mp_sub(&V2mz, &Q2mz, &V2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&V2mz,a,&V2mz)) != MP_OKAY) {
+ if ((e = mp_mod(&V2mz, a, &V2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
/* Must calculate powers of Q for use in V_2m, also for Q^d later */
- if ((e = mp_sqr(&Qmz,&Qmz)) != MP_OKAY) {
+ if ((e = mp_sqr(&Qmz, &Qmz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
/* prevents overflow */ /* CZ still necessary without a fixed prealloc'd mem.? */
- if ((e = mp_mod(&Qmz,a,&Qmz)) != MP_OKAY) {
+ if ((e = mp_mod(&Qmz, a, &Qmz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mul_2(&Qmz,&Q2mz)) != MP_OKAY) {
+ if ((e = mp_mul_2(&Qmz, &Q2mz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((isset = mp_get_bit(&Dz,u)) == MP_VAL) {
+ if ((isset = mp_get_bit(&Dz, u)) == MP_VAL) {
e = isset;
goto LBL_LS_ERR;
}
@@ -282,26 +282,26 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
* Be careful with division by 2 (mod N)!
*/
- if ((e = mp_mul(&U2mz,&Vz,&T1z)) != MP_OKAY) {
+ if ((e = mp_mul(&U2mz, &Vz, &T1z)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mul(&Uz,&V2mz,&T2z)) != MP_OKAY) {
+ if ((e = mp_mul(&Uz, &V2mz, &T2z)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mul(&V2mz,&Vz,&T3z)) != MP_OKAY) {
+ if ((e = mp_mul(&V2mz, &Vz, &T3z)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mul(&U2mz,&Uz,&T4z)) != MP_OKAY) {
+ if ((e = mp_mul(&U2mz, &Uz, &T4z)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = s_mp_mul_si(&T4z,(long)Ds,&T4z)) != MP_OKAY) {
+ if ((e = s_mp_mul_si(&T4z, (long)Ds, &T4z)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_add(&T1z,&T2z,&Uz)) != MP_OKAY) {
+ if ((e = mp_add(&T1z, &T2z, &Uz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if (mp_isodd(&Uz) != MP_NO) {
- if ((e = mp_add(&Uz,a,&Uz)) != MP_OKAY) {
+ if ((e = mp_add(&Uz, a, &Uz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
}
@@ -310,7 +310,7 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
* Thomas R. Nicely used GMP's mpz_fdiv_q_2exp().
* But mp_div_2() does not do so, it is truncating instead.
*/
- if ((e = mp_div_2(&Uz,&Uz)) != MP_OKAY) {
+ if ((e = mp_div_2(&Uz, &Uz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if ((Uz.sign == MP_NEG) && (mp_isodd(&Uz) != MP_NO)) {
@@ -318,15 +318,15 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
goto LBL_LS_ERR;
}
}
- if ((e = mp_add(&T3z,&T4z,&Vz)) != MP_OKAY) {
+ if ((e = mp_add(&T3z, &T4z, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if (mp_isodd(&Vz) != MP_NO) {
- if ((e = mp_add(&Vz,a,&Vz)) != MP_OKAY) {
+ if ((e = mp_add(&Vz, a, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
}
- if ((e = mp_div_2(&Vz,&Vz)) != MP_OKAY) {
+ if ((e = mp_div_2(&Vz, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if ((Vz.sign == MP_NEG) && (mp_isodd(&Vz) != MP_NO)) {
@@ -334,17 +334,17 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
goto LBL_LS_ERR;
}
}
- if ((e = mp_mod(&Uz,a,&Uz)) != MP_OKAY) {
+ if ((e = mp_mod(&Uz, a, &Uz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&Vz,a,&Vz)) != MP_OKAY) {
+ if ((e = mp_mod(&Vz, a, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
/* Calculating Q^d for later use */
- if ((e = mp_mul(&Qkdz,&Qmz,&Qkdz)) != MP_OKAY) {
+ if ((e = mp_mul(&Qkdz, &Qmz, &Qkdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&Qkdz,a,&Qkdz)) != MP_OKAY) {
+ if ((e = mp_mod(&Qkdz, a, &Qkdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
}
@@ -369,18 +369,18 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
Lucas pseudoprime. */
/* Initialize 2*Q^(d*2^r) for V_2m */
- if ((e = mp_mul_2(&Qkdz,&Q2kdz)) != MP_OKAY) {
+ if ((e = mp_mul_2(&Qkdz, &Q2kdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
for (r = 1; r < s; r++) {
- if ((e = mp_sqr(&Vz,&Vz)) != MP_OKAY) {
+ if ((e = mp_sqr(&Vz, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_sub(&Vz,&Q2kdz,&Vz)) != MP_OKAY) {
+ if ((e = mp_sub(&Vz, &Q2kdz, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&Vz,a,&Vz)) != MP_OKAY) {
+ if ((e = mp_mod(&Vz, a, &Vz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
if (mp_iszero(&Vz) != MP_NO) {
@@ -389,13 +389,13 @@ int mp_prime_strong_lucas_selfridge(const mp_int *a, int *result)
}
/* Calculate Q^{d*2^r} for next r (final iteration irrelevant). */
if (r < (s - 1)) {
- if ((e = mp_sqr(&Qkdz,&Qkdz)) != MP_OKAY) {
+ if ((e = mp_sqr(&Qkdz, &Qkdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mod(&Qkdz,a,&Qkdz)) != MP_OKAY) {
+ if ((e = mp_mod(&Qkdz, a, &Qkdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
- if ((e = mp_mul_2(&Qkdz,&Q2kdz)) != MP_OKAY) {
+ if ((e = mp_mul_2(&Qkdz, &Q2kdz)) != MP_OKAY) {
goto LBL_LS_ERR;
}
}