split label & statement

This commit is contained in:
Francois Perrad 2017-08-28 22:34:46 +02:00
parent d263dc727c
commit aab1b3d99f
15 changed files with 76 additions and 38 deletions

View File

@ -138,7 +138,8 @@ top:
c->sign = neg;
res = MP_OKAY;
LBL_ERR:mp_clear_multi(&x, &y, &u, &v, &B, &D, NULL);
LBL_ERR:
mp_clear_multi(&x, &y, &u, &v, &B, &D, NULL);
return res;
}
#endif

View File

@ -278,11 +278,16 @@ int mp_div (mp_int * a, mp_int * b, mp_int * c, mp_int * d)
res = MP_OKAY;
LBL_Y:mp_clear(&y);
LBL_X:mp_clear(&x);
LBL_T2:mp_clear(&t2);
LBL_T1:mp_clear(&t1);
LBL_Q:mp_clear(&q);
LBL_Y:
mp_clear(&y);
LBL_X:
mp_clear(&x);
LBL_T2:
mp_clear(&t2);
LBL_T1:
mp_clear(&t1);
LBL_Q:
mp_clear(&q);
return res;
}

View File

@ -305,7 +305,8 @@ int mp_exptmod_fast (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int redmode
/* swap res with Y */
mp_exch(&res, Y);
err = MP_OKAY;
LBL_RES:mp_clear(&res);
LBL_RES:
mp_clear(&res);
LBL_M:
mp_clear(&M[1]);
for (x = 1<<(winsize-1); x < (1 << winsize); x++) {

View File

@ -94,8 +94,10 @@ int mp_gcd (mp_int * a, mp_int * b, mp_int * c)
}
c->sign = MP_ZPOS;
res = MP_OKAY;
LBL_V:mp_clear(&u);
LBL_U:mp_clear(&v);
LBL_V:
mp_clear(&u);
LBL_U:
mp_clear(&v);
return res;
}
#endif

View File

@ -165,7 +165,8 @@ top:
/* C is now the inverse */
mp_exch(&C, c);
res = MP_OKAY;
LBL_ERR:mp_clear_multi(&x, &y, &u, &v, &A, &B, &C, &D, NULL);
LBL_ERR:
mp_clear_multi(&x, &y, &u, &v, &A, &B, &C, &D, NULL);
return res;
}
#endif

View File

@ -99,7 +99,8 @@ int mp_is_square(mp_int *arg, int *ret)
}
*ret = (mp_cmp_mag(&t, arg) == MP_EQ) ? MP_YES : MP_NO;
ERR:mp_clear(&t);
ERR:
mp_clear(&t);
return res;
}
#endif

View File

@ -106,8 +106,10 @@ int mp_jacobi (mp_int * a, mp_int * n, int *c)
/* done */
res = MP_OKAY;
LBL_P1:mp_clear(&p1);
LBL_A1:mp_clear(&a1);
LBL_P1:
mp_clear(&p1);
LBL_A1:
mp_clear(&a1);
return res;
}
#endif

View File

@ -150,13 +150,20 @@ int mp_karatsuba_mul (mp_int * a, mp_int * b, mp_int * c)
/* Algorithm succeeded set the return code to MP_OKAY */
err = MP_OKAY;
X1Y1:mp_clear(&x1y1);
X0Y0:mp_clear(&x0y0);
T1:mp_clear(&t1);
Y1:mp_clear(&y1);
Y0:mp_clear(&y0);
X1:mp_clear(&x1);
X0:mp_clear(&x0);
X1Y1:
mp_clear(&x1y1);
X0Y0:
mp_clear(&x0y0);
T1:
mp_clear(&t1);
Y1:
mp_clear(&y1);
Y0:
mp_clear(&y0);
X1:
mp_clear(&x1);
X0:
mp_clear(&x0);
ERR:
return err;
}

View File

@ -105,12 +105,18 @@ int mp_karatsuba_sqr (mp_int * a, mp_int * b)
err = MP_OKAY;
X1X1:mp_clear(&x1x1);
X0X0:mp_clear(&x0x0);
T2:mp_clear(&t2);
T1:mp_clear(&t1);
X1:mp_clear(&x1);
X0:mp_clear(&x0);
X1X1:
mp_clear(&x1x1);
X0X0:
mp_clear(&x0x0);
T2:
mp_clear(&t2);
T1:
mp_clear(&t1);
X1:
mp_clear(&x1);
X0:
mp_clear(&x0);
ERR:
return err;
}

View File

@ -120,9 +120,12 @@ int mp_n_root_ex (mp_int * a, mp_digit b, mp_int * c, int fast)
res = MP_OKAY;
LBL_T3:mp_clear(&t3);
LBL_T2:mp_clear(&t2);
LBL_T1:mp_clear(&t1);
LBL_T3:
mp_clear(&t3);
LBL_T2:
mp_clear(&t2);
LBL_T1:
mp_clear(&t1);
return res;
}
#endif

View File

@ -52,7 +52,8 @@ int mp_prime_fermat (mp_int * a, mp_int * b, int *result)
}
err = MP_OKAY;
LBL_T:mp_clear(&t);
LBL_T:
mp_clear(&t);
return err;
}
#endif

View File

@ -73,7 +73,8 @@ int mp_prime_is_prime (mp_int * a, int t, int *result)
/* passed the test */
*result = MP_YES;
LBL_B:mp_clear(&b);
LBL_B:
mp_clear(&b);
return err;
}
#endif

View File

@ -91,9 +91,12 @@ int mp_prime_miller_rabin (mp_int * a, mp_int * b, int *result)
/* probably prime now */
*result = MP_YES;
LBL_Y:mp_clear(&y);
LBL_R:mp_clear(&r);
LBL_N1:mp_clear(&n1);
LBL_Y:
mp_clear(&y);
LBL_R:
mp_clear(&r);
LBL_N1:
mp_clear(&n1);
return err;
}
#endif

View File

@ -69,8 +69,10 @@ int mp_sqrt(mp_int *arg, mp_int *ret)
mp_exch(&t1, ret);
E1: mp_clear(&t2);
E2: mp_clear(&t1);
E1:
mp_clear(&t2);
E2:
mp_clear(&t1);
return res;
}

View File

@ -236,8 +236,10 @@ int s_mp_exptmod (mp_int * G, mp_int * X, mp_int * P, mp_int * Y, int redmode)
mp_exch(&res, Y);
err = MP_OKAY;
LBL_RES:mp_clear(&res);
LBL_MU:mp_clear(&mu);
LBL_RES:
mp_clear(&res);
LBL_MU:
mp_clear(&mu);
LBL_M:
mp_clear(&M[1]);
for (x = 1<<(winsize-1); x < (1 << winsize); x++) {