kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-23 20:15:19 -07:00
Code Releases Wiki Activity

Rename a few things

Browse Source
This commit is contained in:
Frank Denis 2020-04-23 11:10:19 +02:00
parent 599cb10246
commit e768eae76d
6 changed files with 66 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
View File

@ -187,7 +187,7 @@ fe25519_unchecked_sqrt(fe25519 x, const fe25519 x2)
fe25519_pow22523(e, x);
fe25519_mul(p_root, e, x);
fe25519_mul(m_root, p_root, sqrtm1);
fe25519_mul(m_root, p_root, fe25519_sqrtm1);
fe25519_sq(m_root2, m_root);
fe25519_sub(e, x2, m_root2);
fe25519_copy(x, p_root);
@ -288,7 +288,7 @@ ge25519_frombytes(ge25519_p3 *h, const unsigned char *s)
fe25519_frombytes(h->Y, s);
fe25519_1(h->Z);
fe25519_sq(u, h->Y);
fe25519_mul(v, u, d);
fe25519_mul(v, u, ed25519_d);
fe25519_sub(u, u, h->Z); /* u = y^2-1 */
fe25519_add(v, v, h->Z); /* v = dy^2+1 */
@ -308,7 +308,7 @@ ge25519_frombytes(ge25519_p3 *h, const unsigned char *s)
fe25519_add(p_root_check, vxx, u); /* vx^2+u */
has_m_root = fe25519_iszero(m_root_check);
has_p_root = fe25519_iszero(p_root_check);
fe25519_mul(x_sqrtm1, h->X, sqrtm1); /* x*sqrt(-1) */
fe25519_mul(x_sqrtm1, h->X, fe25519_sqrtm1); /* x*sqrt(-1) */
fe25519_cmov(h->X, x_sqrtm1, 1 - has_m_root);
fe25519_neg(negx, h->X);
@ -330,7 +330,7 @@ ge25519_frombytes_negate_vartime(ge25519_p3 *h, const unsigned char *s)
fe25519_frombytes(h->Y, s);
fe25519_1(h->Z);
fe25519_sq(u, h->Y);
fe25519_mul(v, u, d);
fe25519_mul(v, u, ed25519_d);
fe25519_sub(u, u, h->Z); /* u = y^2-1 */
fe25519_add(v, v, h->Z); /* v = dy^2+1 */
@ -352,7 +352,7 @@ ge25519_frombytes_negate_vartime(ge25519_p3 *h, const unsigned char *s)
if (fe25519_iszero(p_root_check) == 0) {
return -1;
}
fe25519_mul(h->X, h->X, sqrtm1);
fe25519_mul(h->X, h->X, fe25519_sqrtm1);
}
if (fe25519_isnegative(h->X) == (s[31] >> 7)) {
@ -486,7 +486,7 @@ ge25519_p3_to_cached(ge25519_cached *r, const ge25519_p3 *p)
fe25519_add(r->YplusX, p->Y, p->X);
fe25519_sub(r->YminusX, p->Y, p->X);
fe25519_copy(r->Z, p->Z);
fe25519_mul(r->T2d, p->T, d2);
fe25519_mul(r->T2d, p->T, ed25519_d2);
}
static void
@ -503,7 +503,7 @@ ge25519_p3_to_precomp(ge25519_precomp *pi, const ge25519_p3 *p)
fe25519_add(pi->yplusx, y, x);
fe25519_sub(pi->yminusx, y, x);
fe25519_mul(xy, x, y);
fe25519_mul(pi->xy2d, xy, d2);
fe25519_mul(pi->xy2d, xy, ed25519_d2);
}
/*
@ -1009,7 +1009,7 @@ ge25519_is_on_curve(const ge25519_p3 *p)
fe25519_mul(t0, t0, z2);
fe25519_mul(t1, x2, y2);
fe25519_mul(t1, t1, d);
fe25519_mul(t1, t1, ed25519_d);
fe25519_sq(z4, z2);
fe25519_add(t1, t1, z4);
fe25519_sub(t0, t0, t1);
@ -2569,7 +2569,7 @@ ge25519_mont_to_ed(fe25519 xed, fe25519 yed, const fe25519 x, const fe25519 y)
/* xed = sqrt(-A-2)*x/y */
fe25519_mul(x_plus_one_y_inv, x_plus_one, y);
fe25519_invert(x_plus_one_y_inv, x_plus_one_y_inv); /* 1/((x+1)*y) */
fe25519_mul(xed, x, sqrtam2);
fe25519_mul(xed, x, ed25519_sqrtam2);
fe25519_mul(xed, xed, x_plus_one_y_inv); /* sqrt(-A-2)*x/((x+1)*y) */
fe25519_mul(xed, xed, x_plus_one);
@ -2588,7 +2588,7 @@ ge25519_xmont_to_ymont(fe25519 y, const fe25519 x)
fe25519_sq(x2, x);
fe25519_mul(x3, x, x2);
fe25519_mul(x2, x2, curve25519_A);
fe25519_mul32(x2, x2, ed25519_A_32);
fe25519_add(y, x3, x);
fe25519_add(y, y, x2);
@ -2623,12 +2623,12 @@ ge25519_elligator2(fe25519 x, fe25519 y, const fe25519 r)
fe25519_sq2(rr2, r);
rr2[0]++;
fe25519_invert(rr2, rr2);
fe25519_mul(x, curve25519_A, rr2);
fe25519_mul32(x, rr2, ed25519_A_32);
fe25519_neg(x, x); /* x=x1 */
fe25519_sq(x2, x);
fe25519_mul(x3, x, x2);
fe25519_mul(x2, x2, curve25519_A); /* x2 = A*x1^2 */
fe25519_mul32(x2, x2, ed25519_A_32); /* x2 = A*x1^2 */
fe25519_add(gx1, x3, x);
fe25519_add(gx1, gx1, x2); /* gx1 = x1^3 + A*x1^2 + x1 */
@ -2640,7 +2640,7 @@ ge25519_elligator2(fe25519 x, fe25519 y, const fe25519 r)
fe25519_neg(negx, x);
fe25519_cmov(x, negx, e_is_minus_1);
fe25519_0(x2);
fe25519_cmov(x2, curve25519_A, e_is_minus_1);
fe25519_cmov(x2, ed25519_A, e_is_minus_1);
fe25519_sub(x, x, x2);
/* y = sqrt(gx1) or sqrt(gx2) with gx2 = gx1 * (A+x1) / -x1 */
@ -2740,12 +2740,12 @@ ristretto255_sqrt_ratio_m1(fe25519 x, const fe25519 u, const fe25519 v)
fe25519_mul(vxx, vxx, v); /* vx^2 */
fe25519_sub(m_root_check, vxx, u); /* vx^2-u */
fe25519_add(p_root_check, vxx, u); /* vx^2+u */
fe25519_mul(f_root_check, u, sqrtm1); /* u*sqrt(-1) */
fe25519_mul(f_root_check, u, fe25519_sqrtm1); /* u*sqrt(-1) */
fe25519_add(f_root_check, vxx, f_root_check); /* vx^2+u*sqrt(-1) */
has_m_root = fe25519_iszero(m_root_check);
has_p_root = fe25519_iszero(p_root_check);
has_f_root = fe25519_iszero(f_root_check);
fe25519_mul(x_sqrtm1, x, sqrtm1); /* x*sqrt(-1) */
fe25519_mul(x_sqrtm1, x, fe25519_sqrtm1); /* x*sqrt(-1) */
fe25519_cmov(x, x_sqrtm1, has_p_root | has_f_root);
fe25519_abs(x, x);
@ -2797,7 +2797,7 @@ ristretto255_frombytes(ge25519_p3 *h, const unsigned char *s)
fe25519_add(u2, u2, ss); /* u2 = 1+ss */
fe25519_sq(u2u2, u2); /* u2u2 = u2^2 */
fe25519_mul(v, d, u1u1); /* v = d*u1^2 */
fe25519_mul(v, ed25519_d, u1u1); /* v = d*u1^2 */
fe25519_neg(v, v); /* v = -d*u1^2 */
fe25519_sub(v, v, u2u2); /* v = -(d*u1^2)-u2^2 */
@ -2854,9 +2854,9 @@ ristretto255_p3_tobytes(unsigned char *s, const ge25519_p3 *h)
fe25519_mul(z_inv, den1, den2); /* z_inv = den1*den2 */
fe25519_mul(z_inv, z_inv, h->T); /* z_inv = den1*den2*T */
fe25519_mul(ix, h->X, sqrtm1); /* ix = X*sqrt(-1) */
fe25519_mul(iy, h->Y, sqrtm1); /* iy = Y*sqrt(-1) */
fe25519_mul(eden, den1, invsqrtamd); /* eden = den1*sqrt(a-d) */
fe25519_mul(ix, h->X, fe25519_sqrtm1); /* ix = X*sqrt(-1) */
fe25519_mul(iy, h->Y, fe25519_sqrtm1); /* iy = Y*sqrt(-1) */
fe25519_mul(eden, den1, ed25519_invsqrtamd); /* eden = den1*sqrt(a-d) */
fe25519_mul(t_z_inv, h->T, z_inv); /* t_z_inv = T*z_inv */
rotate = fe25519_isnegative(t_z_inv);
@ -2894,13 +2894,13 @@ ristretto255_elligator(ge25519_p3 *p, const fe25519 t)
fe25519_1(one);
fe25519_sq(r, t); /* r = t^2 */
fe25519_mul(r, sqrtm1, r); /* r = sqrt(-1)*t^2 */
fe25519_mul(r, fe25519_sqrtm1, r); /* r = sqrt(-1)*t^2 */
fe25519_add(u, r, one); /* u = r+1 */
fe25519_mul(u, u, onemsqd); /* u = (r+1)*(1-d^2) */
fe25519_mul(u, u, ed25519_onemsqd);/* u = (r+1)*(1-d^2) */
fe25519_1(c);
fe25519_neg(c, c); /* c = -1 */
fe25519_add(rpd, r, d); /* rpd = r*d */
fe25519_mul(v, r, d); /* v = r*d */
fe25519_add(rpd, r, ed25519_d); /* rpd = r*d */
fe25519_mul(v, r, ed25519_d); /* v = r*d */
fe25519_sub(v, c, v); /* v = c-r*d */
fe25519_mul(v, v, rpd); /* v = (c-r*d)*(r+d) */
@ -2913,12 +2913,12 @@ ristretto255_elligator(ge25519_p3 *p, const fe25519 t)
fe25519_sub(n, r, one); /* n = r-1 */
fe25519_mul(n, n, c); /* n = c*(r-1) */
fe25519_mul(n, n, sqdmone); /* n = c*(r-1)*(d-1)^2 */
fe25519_mul(n, n, ed25519_sqdmone); /* n = c*(r-1)*(d-1)^2 */
fe25519_sub(n, n, v); /* n = c*(r-1)*(d-1)^2-v */
fe25519_add(w0, s, s); /* w0 = 2s */
fe25519_mul(w0, w0, v); /* w0 = 2s*v */
fe25519_mul(w1, n, sqrtadm1); /* w1 = n*sqrt(ad-1) */
fe25519_mul(w1, n, ed25519_sqrtadm1); /* w1 = n*sqrt(ad-1) */
fe25519_sq(ss, s); /* ss = s^2 */
fe25519_sub(w2, one, ss); /* w2 = 1-s^2 */
fe25519_add(w3, one, ss); /* w3 = 1+s^2 */

37
src/libsodium/crypto_core/ed25519/ref10/fe_25_5/constants.h
View File

@ -1,45 +1,46 @@
/* sqrt(-1) */
static const fe25519 fe25519_sqrtm1 = {
-32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482
};
/* sqrt(-486664) */
static const fe25519 ed25519_sqrtam2 = {
-12222970, -8312128, -11511410, 9067497, -15300785, -241793, 25456130, 14121551, -12187136, 3972024
};
/* 37095705934669439343138083508754565189542113879843219016388785533085940283555 */
static const fe25519 d = {
static const fe25519 ed25519_d = {
-10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116
};
/* 2 * d =
* 16295367250680780974490674513165176452449235426866156013048779062215315747161
*/
static const fe25519 d2 = {
static const fe25519 ed25519_d2 = {
-21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199 };
/* sqrt(-1) */
static const fe25519 sqrtm1 = {
-32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482
};
/* A = 486662 */
static const fe25519 curve25519_A = {
486662, 0, 0, 0, 0, 0, 0, 0, 0, 0
#define ed25519_A_32 486662
static const fe25519 ed25519_A = {
ed25519_A_32, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
/* sqrt(ad - 1) with a = -1 (mod p) */
static const fe25519 sqrtadm1 = {
static const fe25519 ed25519_sqrtadm1 = {
24849947, -153582, -23613485, 6347715, -21072328, -667138, -25271143, -15367704, -870347, 14525639
};
/* 1 / sqrt(a - d) */
static const fe25519 invsqrtamd = {
static const fe25519 ed25519_invsqrtamd = {
6111485, 4156064, -27798727, 12243468, -25904040, 120897, 20826367, -7060776, 6093568, -1986012
};
/* 1 - d ^ 2 */
static const fe25519 onemsqd = {
static const fe25519 ed25519_onemsqd = {
6275446, -16617371, -22938544, -3773710, 11667077, 7397348, -27922721, 1766195, -24433858, 672203
};
/* (d - 1) ^ 2 */
static const fe25519 sqdmone = {
static const fe25519 ed25519_sqdmone = {
15551795, -11097455, -13425098, -10125071, -11896535, 10178284, -26634327, 4729244, -5282110, -10116402
};
/* sqrt(-486664) */
static const fe25519 sqrtam2 = {
-12222970, -8312128, -11511410, 9067497, -15300785, -241793, 25456130, 14121551, -12187136, 3972024
};

37
src/libsodium/crypto_core/ed25519/ref10/fe_51/constants.h
View File

@ -1,46 +1,47 @@
/* sqrt(-1) */
static const fe25519 fe25519_sqrtm1 = {
1718705420411056, 234908883556509, 2233514472574048, 2117202627021982, 765476049583133
};
/* sqrt(-486664) */
static const fe25519 ed25519_sqrtam2 = {
1693982333959686, 608509411481997, 2235573344831311, 947681270984193, 266558006233600
};
/* 37095705934669439343138083508754565189542113879843219016388785533085940283555 */
static const fe25519 d = {
static const fe25519 ed25519_d = {
929955233495203, 466365720129213, 1662059464998953, 2033849074728123, 1442794654840575
};
/* 2 * d =
* 16295367250680780974490674513165176452449235426866156013048779062215315747161
*/
static const fe25519 d2 = {
static const fe25519 ed25519_d2 = {
1859910466990425, 932731440258426, 1072319116312658, 1815898335770999, 633789495995903
};
/* sqrt(-1) */
static const fe25519 sqrtm1 = {
1718705420411056, 234908883556509, 2233514472574048, 2117202627021982, 765476049583133
};
/* A = 486662 */
static const fe25519 curve25519_A = {
486662, 0, 0, 0, 0
#define ed25519_A_32 486662
static const fe25519 ed25519_A = {
ed25519_A_32, 0, 0, 0, 0
};
/* sqrt(ad - 1) with a = -1 (mod p) */
static const fe25519 sqrtadm1 = {
static const fe25519 ed25519_sqrtadm1 = {
2241493124984347, 425987919032274, 2207028919301688, 1220490630685848, 974799131293748
};
/* 1 / sqrt(a - d) */
static const fe25519 invsqrtamd = {
static const fe25519 ed25519_invsqrtamd = {
278908739862762, 821645201101625, 8113234426968, 1777959178193151, 2118520810568447
};
/* 1 - d ^ 2 */
static const fe25519 onemsqd = {
static const fe25519 ed25519_onemsqd = {
1136626929484150, 1998550399581263, 496427632559748, 118527312129759, 45110755273534
};
/* (d - 1) ^ 2 */
static const fe25519 sqdmone = {
static const fe25519 ed25519_sqdmone = {
1507062230895904, 1572317787530805, 683053064812840, 317374165784489, 1572899562415810
};
/* sqrt(-486664) */
static const fe25519 sqrtam2 = {
1693982333959686, 608509411481997, 2235573344831311, 947681270984193, 266558006233600
};

2
src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
View File

@ -123,7 +123,7 @@ crypto_scalarmult_curve25519_ref10(unsigned char *q,
fe25519_mul(x2, tmp1, tmp0);
fe25519_sub(tmp1, tmp1, tmp0);
fe25519_sq(z2, z2);
fe25519_scalar_product(z3, tmp1, 121666);
fe25519_mul32(z3, tmp1, 121666);
fe25519_sq(x3, x3);
fe25519_add(tmp0, tmp0, z3);
fe25519_mul(z3, x1, z2);

2
src/libsodium/include/sodium/private/ed25519_ref10_fe_25_5.h
View File

@ -980,7 +980,7 @@ fe25519_sq2(fe25519 h, const fe25519 f)
}
static void
fe25519_scalar_product(fe25519 h, const fe25519 f, uint32_t n)
fe25519_mul32(fe25519 h, const fe25519 f, uint32_t n)
{
int64_t sn = (int64_t) n;
int32_t f0 = f[0];

2
src/libsodium/include/sodium/private/ed25519_ref10_fe_51.h
View File

@ -491,7 +491,7 @@ fe25519_sq2(fe25519 h, const fe25519 f)
}
static void
fe25519_scalar_product(fe25519 h, const fe25519 f, uint32_t n)
fe25519_mul32(fe25519 h, const fe25519 f, uint32_t n)
{
const uint64_t mask = 0x7ffffffffffffULL;
uint128_t a;