frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make secp256k1_{fe,ge,gej}_verify work as no-op if non-VERIFY

Browse Source
This commit is contained in:
Pieter Wuille 2023-05-09 12:46:00 -04:00
parent f20266722a
commit 0a2e0b2ae4
5 changed files with 15 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field.h
View File

@ -143,9 +143,7 @@ static void secp256k1_fe_get_bounds(secp256k1_fe *r, int m);
/** Determine whether a is a square (modulo p). */ /** Determine whether a is a square (modulo p). */
static int secp256k1_fe_is_square_var(const secp256k1_fe *a); static int secp256k1_fe_is_square_var(const secp256k1_fe *a);
#ifdef VERIFY /** Check invariants on a field element (no-op unless VERIFY is enabled). */
/** Check invariants on a field element. */
static void secp256k1_fe_verify(const secp256k1_fe *a); static void secp256k1_fe_verify(const secp256k1_fe *a);
#endif
#endif /* SECP256K1_FIELD_H */ #endif /* SECP256K1_FIELD_H */

9
src/field_10x26_impl.h
View File

@ -21,8 +21,8 @@
* - 2*M*(2^26-1) is the max (inclusive) of the remaining limbs * - 2*M*(2^26-1) is the max (inclusive) of the remaining limbs
*/ */
#ifdef VERIFY
static void secp256k1_fe_verify(const secp256k1_fe *a) { static void secp256k1_fe_verify(const secp256k1_fe *a) {
#ifdef VERIFY
const uint32_t *d = a->n; const uint32_t *d = a->n;
int m = a->normalized ? 1 : 2 * a->magnitude, r = 1; int m = a->normalized ? 1 : 2 * a->magnitude, r = 1;
r &= (d[0] <= 0x3FFFFFFUL * m); r &= (d[0] <= 0x3FFFFFFUL * m);
@ -47,8 +47,9 @@ static void secp256k1_fe_verify(const secp256k1_fe *a) {
} }
} }
VERIFY_CHECK(r == 1); VERIFY_CHECK(r == 1);
}
#endif #endif
(void)a;
}
static void secp256k1_fe_get_bounds(secp256k1_fe *r, int m) { static void secp256k1_fe_get_bounds(secp256k1_fe *r, int m) {
VERIFY_CHECK(m >= 0); VERIFY_CHECK(m >= 0);
@ -458,9 +459,7 @@ SECP256K1_INLINE static void secp256k1_fe_mul_int(secp256k1_fe *r, int a) {
} }
SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_fe *a) { SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_fe *a) {
#ifdef VERIFY
secp256k1_fe_verify(a); secp256k1_fe_verify(a);
#endif
r->n[0] += a->n[0]; r->n[0] += a->n[0];
r->n[1] += a->n[1]; r->n[1] += a->n[1];
r->n[2] += a->n[2]; r->n[2] += a->n[2];
@ -479,11 +478,9 @@ SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_f
} }
SECP256K1_INLINE static void secp256k1_fe_add_int(secp256k1_fe *r, int a) { SECP256K1_INLINE static void secp256k1_fe_add_int(secp256k1_fe *r, int a) {
#ifdef VERIFY
secp256k1_fe_verify(r); secp256k1_fe_verify(r);
VERIFY_CHECK(a >= 0); VERIFY_CHECK(a >= 0);
VERIFY_CHECK(a <= 0x7FFF); VERIFY_CHECK(a <= 0x7FFF);
#endif
r->n[0] += a; r->n[0] += a;
#ifdef VERIFY #ifdef VERIFY
r->magnitude += 1; r->magnitude += 1;

9
src/field_5x52_impl.h
View File

@ -33,8 +33,8 @@
* 0 or 1, and its value is already reduced modulo the order of the field. * 0 or 1, and its value is already reduced modulo the order of the field.
*/ */
#ifdef VERIFY
static void secp256k1_fe_verify(const secp256k1_fe *a) { static void secp256k1_fe_verify(const secp256k1_fe *a) {
#ifdef VERIFY
const uint64_t *d = a->n; const uint64_t *d = a->n;
int m = a->normalized ? 1 : 2 * a->magnitude, r = 1; int m = a->normalized ? 1 : 2 * a->magnitude, r = 1;
/* secp256k1 'p' value defined in "Standards for Efficient Cryptography" (SEC2) 2.7.1. */ /* secp256k1 'p' value defined in "Standards for Efficient Cryptography" (SEC2) 2.7.1. */
@ -52,8 +52,9 @@ static void secp256k1_fe_verify(const secp256k1_fe *a) {
} }
} }
VERIFY_CHECK(r == 1); VERIFY_CHECK(r == 1);
}
#endif #endif
(void)a;
}
static void secp256k1_fe_get_bounds(secp256k1_fe *r, int m) { static void secp256k1_fe_get_bounds(secp256k1_fe *r, int m) {
VERIFY_CHECK(m >= 0); VERIFY_CHECK(m >= 0);
@ -422,11 +423,9 @@ SECP256K1_INLINE static void secp256k1_fe_mul_int(secp256k1_fe *r, int a) {
} }
SECP256K1_INLINE static void secp256k1_fe_add_int(secp256k1_fe *r, int a) { SECP256K1_INLINE static void secp256k1_fe_add_int(secp256k1_fe *r, int a) {
#ifdef VERIFY
secp256k1_fe_verify(r); secp256k1_fe_verify(r);
VERIFY_CHECK(a >= 0); VERIFY_CHECK(a >= 0);
VERIFY_CHECK(a <= 0x7FFF); VERIFY_CHECK(a <= 0x7FFF);
#endif
r->n[0] += a; r->n[0] += a;
#ifdef VERIFY #ifdef VERIFY
r->magnitude += 1; r->magnitude += 1;
@ -436,9 +435,7 @@ SECP256K1_INLINE static void secp256k1_fe_add_int(secp256k1_fe *r, int a) {
} }
SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_fe *a) { SECP256K1_INLINE static void secp256k1_fe_add(secp256k1_fe *r, const secp256k1_fe *a) {
#ifdef VERIFY
secp256k1_fe_verify(a); secp256k1_fe_verify(a);
#endif
r->n[0] += a->n[0]; r->n[0] += a->n[0];
r->n[1] += a->n[1]; r->n[1] += a->n[1];
r->n[2] += a->n[2]; r->n[2] += a->n[2];

6
src/group.h
View File

@ -164,12 +164,10 @@ static void secp256k1_gej_rescale(secp256k1_gej *r, const secp256k1_fe *b);
*/ */
static int secp256k1_ge_is_in_correct_subgroup(const secp256k1_ge* ge); static int secp256k1_ge_is_in_correct_subgroup(const secp256k1_ge* ge);
#ifdef VERIFY /** Check invariants on an affine group element (no-op unless VERIFY is enabled). */
/** Check invariants on an affine group element. */
static void secp256k1_ge_verify(const secp256k1_ge *a); static void secp256k1_ge_verify(const secp256k1_ge *a);
/** Check invariants on a Jacobian group element. */ /** Check invariants on a Jacobian group element (no-op unless VERIFY is enabled). */
static void secp256k1_gej_verify(const secp256k1_gej *a); static void secp256k1_gej_verify(const secp256k1_gej *a);
#endif
#endif /* SECP256K1_GROUP_H */ #endif /* SECP256K1_GROUP_H */

106
src/group_impl.h
View File

@ -73,78 +73,66 @@ static const secp256k1_ge secp256k1_ge_const_g = SECP256K1_G;
#endif #endif
/* End of section generated by sage/gen_exhaustive_groups.sage. */ /* End of section generated by sage/gen_exhaustive_groups.sage. */
#ifdef VERIFY
static void secp256k1_ge_verify(const secp256k1_ge *a) { static void secp256k1_ge_verify(const secp256k1_ge *a) {
#ifdef VERIFY
secp256k1_fe_verify(&a->x); secp256k1_fe_verify(&a->x);
secp256k1_fe_verify(&a->y); secp256k1_fe_verify(&a->y);
VERIFY_CHECK(a->infinity == 0 || a->infinity == 1); VERIFY_CHECK(a->infinity == 0 || a->infinity == 1);
#endif
(void)a;
} }
static void secp256k1_gej_verify(const secp256k1_gej *a) { static void secp256k1_gej_verify(const secp256k1_gej *a) {
#ifdef VERIFY
secp256k1_fe_verify(&a->x); secp256k1_fe_verify(&a->x);
secp256k1_fe_verify(&a->y); secp256k1_fe_verify(&a->y);
secp256k1_fe_verify(&a->z); secp256k1_fe_verify(&a->z);
VERIFY_CHECK(a->infinity == 0 || a->infinity == 1); VERIFY_CHECK(a->infinity == 0 || a->infinity == 1);
}
#endif #endif
(void)a;
}
static void secp256k1_ge_set_gej_zinv(secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zi) { static void secp256k1_ge_set_gej_zinv(secp256k1_ge *r, const secp256k1_gej *a, const secp256k1_fe *zi) {
secp256k1_fe zi2; secp256k1_fe zi2;
secp256k1_fe zi3; secp256k1_fe zi3;
#ifdef VERIFY
/* Do not call secp256k1_ge_verify, as we do not require a->z to be initialized. */ /* Do not call secp256k1_ge_verify, as we do not require a->z to be initialized. */
secp256k1_fe_verify(&a->x); secp256k1_fe_verify(&a->x);
secp256k1_fe_verify(&a->y); secp256k1_fe_verify(&a->y);
secp256k1_fe_verify(zi); secp256k1_fe_verify(zi);
#endif
VERIFY_CHECK(!a->infinity); VERIFY_CHECK(!a->infinity);
secp256k1_fe_sqr(&zi2, zi); secp256k1_fe_sqr(&zi2, zi);
secp256k1_fe_mul(&zi3, &zi2, zi); secp256k1_fe_mul(&zi3, &zi2, zi);
secp256k1_fe_mul(&r->x, &a->x, &zi2); secp256k1_fe_mul(&r->x, &a->x, &zi2);
secp256k1_fe_mul(&r->y, &a->y, &zi3); secp256k1_fe_mul(&r->y, &a->y, &zi3);
r->infinity = a->infinity; r->infinity = a->infinity;
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static void secp256k1_ge_set_xy(secp256k1_ge *r, const secp256k1_fe *x, const secp256k1_fe *y) { static void secp256k1_ge_set_xy(secp256k1_ge *r, const secp256k1_fe *x, const secp256k1_fe *y) {
#ifdef VERIFY
secp256k1_fe_verify(x); secp256k1_fe_verify(x);
secp256k1_fe_verify(y); secp256k1_fe_verify(y);
#endif
r->infinity = 0; r->infinity = 0;
r->x = *x; r->x = *x;
r->y = *y; r->y = *y;
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static int secp256k1_ge_is_infinity(const secp256k1_ge *a) { static int secp256k1_ge_is_infinity(const secp256k1_ge *a) {
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
return a->infinity; return a->infinity;
} }
static void secp256k1_ge_neg(secp256k1_ge *r, const secp256k1_ge *a) { static void secp256k1_ge_neg(secp256k1_ge *r, const secp256k1_ge *a) {
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
*r = *a; *r = *a;
secp256k1_fe_normalize_weak(&r->y); secp256k1_fe_normalize_weak(&r->y);
secp256k1_fe_negate(&r->y, &r->y, 1); secp256k1_fe_negate(&r->y, &r->y, 1);
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static void secp256k1_ge_set_gej(secp256k1_ge *r, secp256k1_gej *a) { static void secp256k1_ge_set_gej(secp256k1_ge *r, secp256k1_gej *a) {
secp256k1_fe z2, z3; secp256k1_fe z2, z3;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
r->infinity = a->infinity; r->infinity = a->infinity;
secp256k1_fe_inv(&a->z, &a->z); secp256k1_fe_inv(&a->z, &a->z);
secp256k1_fe_sqr(&z2, &a->z); secp256k1_fe_sqr(&z2, &a->z);
@ -154,16 +142,12 @@ static void secp256k1_ge_set_gej(secp256k1_ge *r, secp256k1_gej *a) {
secp256k1_fe_set_int(&a->z, 1); secp256k1_fe_set_int(&a->z, 1);
r->x = a->x; r->x = a->x;
r->y = a->y; r->y = a->y;
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static void secp256k1_ge_set_gej_var(secp256k1_ge *r, secp256k1_gej *a) { static void secp256k1_ge_set_gej_var(secp256k1_ge *r, secp256k1_gej *a) {
secp256k1_fe z2, z3; secp256k1_fe z2, z3;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
if (secp256k1_gej_is_infinity(a)) { if (secp256k1_gej_is_infinity(a)) {
secp256k1_ge_set_infinity(r); secp256k1_ge_set_infinity(r);
return; return;
@ -176,9 +160,7 @@ static void secp256k1_ge_set_gej_var(secp256k1_ge *r, secp256k1_gej *a) {
secp256k1_fe_mul(&a->y, &a->y, &z3); secp256k1_fe_mul(&a->y, &a->y, &z3);
secp256k1_fe_set_int(&a->z, 1); secp256k1_fe_set_int(&a->z, 1);
secp256k1_ge_set_xy(r, &a->x, &a->y); secp256k1_ge_set_xy(r, &a->x, &a->y);
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a, size_t len) { static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a, size_t len) {
@ -187,9 +169,7 @@ static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a
size_t last_i = SIZE_MAX; size_t last_i = SIZE_MAX;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
#ifdef VERIFY
secp256k1_gej_verify(&a[i]); secp256k1_gej_verify(&a[i]);
#endif
if (a[i].infinity) { if (a[i].infinity) {
secp256k1_ge_set_infinity(&r[i]); secp256k1_ge_set_infinity(&r[i]);
} else { } else {
@ -223,9 +203,7 @@ static void secp256k1_ge_set_all_gej_var(secp256k1_ge *r, const secp256k1_gej *a
if (!a[i].infinity) { if (!a[i].infinity) {
secp256k1_ge_set_gej_zinv(&r[i], &a[i], &r[i].x); secp256k1_ge_set_gej_zinv(&r[i], &a[i], &r[i].x);
} }
#ifdef VERIFY
secp256k1_ge_verify(&r[i]); secp256k1_ge_verify(&r[i]);
#endif
} }
} }
@ -234,11 +212,9 @@ static void secp256k1_ge_table_set_globalz(size_t len, secp256k1_ge *a, const se
secp256k1_fe zs; secp256k1_fe zs;
if (len > 0) { if (len > 0) {
#ifdef VERIFY
/* Verify inputs a[len-1] and zr[len-1]. */ /* Verify inputs a[len-1] and zr[len-1]. */
secp256k1_ge_verify(&a[i]); secp256k1_ge_verify(&a[i]);
secp256k1_fe_verify(&zr[i]); secp256k1_fe_verify(&zr[i]);
#endif
/* Ensure all y values are in weak normal form for fast negation of points */ /* Ensure all y values are in weak normal form for fast negation of points */
secp256k1_fe_normalize_weak(&a[i].y); secp256k1_fe_normalize_weak(&a[i].y);
zs = zr[i]; zs = zr[i];
@ -246,11 +222,9 @@ static void secp256k1_ge_table_set_globalz(size_t len, secp256k1_ge *a, const se
/* Work our way backwards, using the z-ratios to scale the x/y values. */ /* Work our way backwards, using the z-ratios to scale the x/y values. */
while (i > 0) { while (i > 0) {
secp256k1_gej tmpa; secp256k1_gej tmpa;
#ifdef VERIFY
/* Verify all inputs a[i] and zr[i]. */ /* Verify all inputs a[i] and zr[i]. */
secp256k1_fe_verify(&zr[i]); secp256k1_fe_verify(&zr[i]);
secp256k1_ge_verify(&a[i]); secp256k1_ge_verify(&a[i]);
#endif
if (i != len - 1) { if (i != len - 1) {
secp256k1_fe_mul(&zs, &zs, &zr[i]); secp256k1_fe_mul(&zs, &zs, &zr[i]);
} }
@ -259,10 +233,8 @@ static void secp256k1_ge_table_set_globalz(size_t len, secp256k1_ge *a, const se
tmpa.y = a[i].y; tmpa.y = a[i].y;
tmpa.infinity = 0; tmpa.infinity = 0;
secp256k1_ge_set_gej_zinv(&a[i], &tmpa, &zs); secp256k1_ge_set_gej_zinv(&a[i], &tmpa, &zs);
#ifdef VERIFY
/* Verify the output a[i]. */ /* Verify the output a[i]. */
secp256k1_ge_verify(&a[i]); secp256k1_ge_verify(&a[i]);
#endif
} }
} }
} }
@ -272,18 +244,14 @@ static void secp256k1_gej_set_infinity(secp256k1_gej *r) {
secp256k1_fe_clear(&r->x); secp256k1_fe_clear(&r->x);
secp256k1_fe_clear(&r->y); secp256k1_fe_clear(&r->y);
secp256k1_fe_clear(&r->z); secp256k1_fe_clear(&r->z);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_ge_set_infinity(secp256k1_ge *r) { static void secp256k1_ge_set_infinity(secp256k1_ge *r) {
r->infinity = 1; r->infinity = 1;
secp256k1_fe_clear(&r->x); secp256k1_fe_clear(&r->x);
secp256k1_fe_clear(&r->y); secp256k1_fe_clear(&r->y);
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static void secp256k1_gej_clear(secp256k1_gej *r) { static void secp256k1_gej_clear(secp256k1_gej *r) {
@ -302,9 +270,7 @@ static void secp256k1_ge_clear(secp256k1_ge *r) {
static int secp256k1_ge_set_xo_var(secp256k1_ge *r, const secp256k1_fe *x, int odd) { static int secp256k1_ge_set_xo_var(secp256k1_ge *r, const secp256k1_fe *x, int odd) {
secp256k1_fe x2, x3; secp256k1_fe x2, x3;
int ret; int ret;
#ifdef VERIFY
secp256k1_fe_verify(x); secp256k1_fe_verify(x);
#endif
r->x = *x; r->x = *x;
secp256k1_fe_sqr(&x2, x); secp256k1_fe_sqr(&x2, x);
secp256k1_fe_mul(&x3, x, &x2); secp256k1_fe_mul(&x3, x, &x2);
@ -315,31 +281,23 @@ static int secp256k1_ge_set_xo_var(secp256k1_ge *r, const secp256k1_fe *x, int o
if (secp256k1_fe_is_odd(&r->y) != odd) { if (secp256k1_fe_is_odd(&r->y) != odd) {
secp256k1_fe_negate(&r->y, &r->y, 1); secp256k1_fe_negate(&r->y, &r->y, 1);
} }
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
return ret; return ret;
} }
static void secp256k1_gej_set_ge(secp256k1_gej *r, const secp256k1_ge *a) { static void secp256k1_gej_set_ge(secp256k1_gej *r, const secp256k1_ge *a) {
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
r->infinity = a->infinity; r->infinity = a->infinity;
r->x = a->x; r->x = a->x;
r->y = a->y; r->y = a->y;
secp256k1_fe_set_int(&r->z, 1); secp256k1_fe_set_int(&r->z, 1);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static int secp256k1_gej_eq_var(const secp256k1_gej *a, const secp256k1_gej *b) { static int secp256k1_gej_eq_var(const secp256k1_gej *a, const secp256k1_gej *b) {
secp256k1_gej tmp; secp256k1_gej tmp;
#ifdef VERIFY
secp256k1_gej_verify(b); secp256k1_gej_verify(b);
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
secp256k1_gej_neg(&tmp, a); secp256k1_gej_neg(&tmp, a);
secp256k1_gej_add_var(&tmp, &tmp, b, NULL); secp256k1_gej_add_var(&tmp, &tmp, b, NULL);
return secp256k1_gej_is_infinity(&tmp); return secp256k1_gej_is_infinity(&tmp);
@ -347,10 +305,8 @@ static int secp256k1_gej_eq_var(const secp256k1_gej *a, const secp256k1_gej *b)
static int secp256k1_gej_eq_x_var(const secp256k1_fe *x, const secp256k1_gej *a) { static int secp256k1_gej_eq_x_var(const secp256k1_fe *x, const secp256k1_gej *a) {
secp256k1_fe r, r2; secp256k1_fe r, r2;
#ifdef VERIFY
secp256k1_fe_verify(x); secp256k1_fe_verify(x);
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
VERIFY_CHECK(!a->infinity); VERIFY_CHECK(!a->infinity);
secp256k1_fe_sqr(&r, &a->z); secp256k1_fe_mul(&r, &r, x); secp256k1_fe_sqr(&r, &a->z); secp256k1_fe_mul(&r, &r, x);
r2 = a->x; secp256k1_fe_normalize_weak(&r2); r2 = a->x; secp256k1_fe_normalize_weak(&r2);
@ -358,32 +314,24 @@ static int secp256k1_gej_eq_x_var(const secp256k1_fe *x, const secp256k1_gej *a)
} }
static void secp256k1_gej_neg(secp256k1_gej *r, const secp256k1_gej *a) { static void secp256k1_gej_neg(secp256k1_gej *r, const secp256k1_gej *a) {
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
r->infinity = a->infinity; r->infinity = a->infinity;
r->x = a->x; r->x = a->x;
r->y = a->y; r->y = a->y;
r->z = a->z; r->z = a->z;
secp256k1_fe_normalize_weak(&r->y); secp256k1_fe_normalize_weak(&r->y);
secp256k1_fe_negate(&r->y, &r->y, 1); secp256k1_fe_negate(&r->y, &r->y, 1);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static int secp256k1_gej_is_infinity(const secp256k1_gej *a) { static int secp256k1_gej_is_infinity(const secp256k1_gej *a) {
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
return a->infinity; return a->infinity;
} }
static int secp256k1_ge_is_valid_var(const secp256k1_ge *a) { static int secp256k1_ge_is_valid_var(const secp256k1_ge *a) {
secp256k1_fe y2, x3; secp256k1_fe y2, x3;
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
if (a->infinity) { if (a->infinity) {
return 0; return 0;
} }
@ -399,9 +347,7 @@ static SECP256K1_INLINE void secp256k1_gej_double(secp256k1_gej *r, const secp25
/* Operations: 3 mul, 4 sqr, 8 add/half/mul_int/negate */ /* Operations: 3 mul, 4 sqr, 8 add/half/mul_int/negate */
secp256k1_fe l, s, t; secp256k1_fe l, s, t;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
r->infinity = a->infinity; r->infinity = a->infinity;
/* Formula used: /* Formula used:
@ -428,9 +374,7 @@ static SECP256K1_INLINE void secp256k1_gej_double(secp256k1_gej *r, const secp25
secp256k1_fe_mul(&r->y, &t, &l); /* Y3 = L*(X3 + T) (1) */ secp256k1_fe_mul(&r->y, &t, &l); /* Y3 = L*(X3 + T) (1) */
secp256k1_fe_add(&r->y, &s); /* Y3 = L*(X3 + T) + S^2 (2) */ secp256k1_fe_add(&r->y, &s); /* Y3 = L*(X3 + T) + S^2 (2) */
secp256k1_fe_negate(&r->y, &r->y, 2); /* Y3 = -(L*(X3 + T) + S^2) (3) */ secp256k1_fe_negate(&r->y, &r->y, 2); /* Y3 = -(L*(X3 + T) + S^2) (3) */
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, secp256k1_fe *rzr) { static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, secp256k1_fe *rzr) {
@ -444,9 +388,7 @@ static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, s
* the infinity flag even though the point doubles to infinity, and the result * the infinity flag even though the point doubles to infinity, and the result
* point will be gibberish (z = 0 but infinity = 0). * point will be gibberish (z = 0 but infinity = 0).
*/ */
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
if (a->infinity) { if (a->infinity) {
secp256k1_gej_set_infinity(r); secp256k1_gej_set_infinity(r);
if (rzr != NULL) { if (rzr != NULL) {
@ -461,19 +403,15 @@ static void secp256k1_gej_double_var(secp256k1_gej *r, const secp256k1_gej *a, s
} }
secp256k1_gej_double(r, a); secp256k1_gej_double(r, a);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_gej_add_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_gej *b, secp256k1_fe *rzr) { static void secp256k1_gej_add_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_gej *b, secp256k1_fe *rzr) {
/* 12 mul, 4 sqr, 11 add/negate/normalizes_to_zero (ignoring special cases) */ /* 12 mul, 4 sqr, 11 add/negate/normalizes_to_zero (ignoring special cases) */
secp256k1_fe z22, z12, u1, u2, s1, s2, h, i, h2, h3, t; secp256k1_fe z22, z12, u1, u2, s1, s2, h, i, h2, h3, t;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
secp256k1_gej_verify(b); secp256k1_gej_verify(b);
#endif
if (a->infinity) { if (a->infinity) {
VERIFY_CHECK(rzr == NULL); VERIFY_CHECK(rzr == NULL);
*r = *b; *r = *b;
@ -528,18 +466,14 @@ static void secp256k1_gej_add_var(secp256k1_gej *r, const secp256k1_gej *a, cons
secp256k1_fe_mul(&r->y, &t, &i); secp256k1_fe_mul(&r->y, &t, &i);
secp256k1_fe_mul(&h3, &h3, &s1); secp256k1_fe_mul(&h3, &h3, &s1);
secp256k1_fe_add(&r->y, &h3); secp256k1_fe_add(&r->y, &h3);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_gej_add_ge_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_ge *b, secp256k1_fe *rzr) { static void secp256k1_gej_add_ge_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_ge *b, secp256k1_fe *rzr) {
/* 8 mul, 3 sqr, 13 add/negate/normalize_weak/normalizes_to_zero (ignoring special cases) */ /* 8 mul, 3 sqr, 13 add/negate/normalize_weak/normalizes_to_zero (ignoring special cases) */
secp256k1_fe z12, u1, u2, s1, s2, h, i, h2, h3, t; secp256k1_fe z12, u1, u2, s1, s2, h, i, h2, h3, t;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
secp256k1_ge_verify(b); secp256k1_ge_verify(b);
#endif
if (a->infinity) { if (a->infinity) {
VERIFY_CHECK(rzr == NULL); VERIFY_CHECK(rzr == NULL);
secp256k1_gej_set_ge(r, b); secp256k1_gej_set_ge(r, b);
@ -592,20 +526,16 @@ static void secp256k1_gej_add_ge_var(secp256k1_gej *r, const secp256k1_gej *a, c
secp256k1_fe_mul(&r->y, &t, &i); secp256k1_fe_mul(&r->y, &t, &i);
secp256k1_fe_mul(&h3, &h3, &s1); secp256k1_fe_mul(&h3, &h3, &s1);
secp256k1_fe_add(&r->y, &h3); secp256k1_fe_add(&r->y, &h3);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
if (rzr != NULL) secp256k1_fe_verify(rzr); if (rzr != NULL) secp256k1_fe_verify(rzr);
#endif
} }
static void secp256k1_gej_add_zinv_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_ge *b, const secp256k1_fe *bzinv) { static void secp256k1_gej_add_zinv_var(secp256k1_gej *r, const secp256k1_gej *a, const secp256k1_ge *b, const secp256k1_fe *bzinv) {
/* 9 mul, 3 sqr, 13 add/negate/normalize_weak/normalizes_to_zero (ignoring special cases) */ /* 9 mul, 3 sqr, 13 add/negate/normalize_weak/normalizes_to_zero (ignoring special cases) */
secp256k1_fe az, z12, u1, u2, s1, s2, h, i, h2, h3, t; secp256k1_fe az, z12, u1, u2, s1, s2, h, i, h2, h3, t;
#ifdef VERIFY
secp256k1_ge_verify(b); secp256k1_ge_verify(b);
secp256k1_fe_verify(bzinv); secp256k1_fe_verify(bzinv);
#endif
if (a->infinity) { if (a->infinity) {
secp256k1_fe bzinv2, bzinv3; secp256k1_fe bzinv2, bzinv3;
r->infinity = b->infinity; r->infinity = b->infinity;
@ -664,9 +594,7 @@ static void secp256k1_gej_add_zinv_var(secp256k1_gej *r, const secp256k1_gej *a,
secp256k1_fe_mul(&r->y, &t, &i); secp256k1_fe_mul(&r->y, &t, &i);
secp256k1_fe_mul(&h3, &h3, &s1); secp256k1_fe_mul(&h3, &h3, &s1);
secp256k1_fe_add(&r->y, &h3); secp256k1_fe_add(&r->y, &h3);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
@ -675,10 +603,8 @@ static void secp256k1_gej_add_ge(secp256k1_gej *r, const secp256k1_gej *a, const
secp256k1_fe zz, u1, u2, s1, s2, t, tt, m, n, q, rr; secp256k1_fe zz, u1, u2, s1, s2, t, tt, m, n, q, rr;
secp256k1_fe m_alt, rr_alt; secp256k1_fe m_alt, rr_alt;
int degenerate; int degenerate;
#ifdef VERIFY
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
secp256k1_ge_verify(b); secp256k1_ge_verify(b);
#endif
VERIFY_CHECK(!b->infinity); VERIFY_CHECK(!b->infinity);
VERIFY_CHECK(a->infinity == 0 || a->infinity == 1); VERIFY_CHECK(a->infinity == 0 || a->infinity == 1);
@ -804,34 +730,26 @@ static void secp256k1_gej_add_ge(secp256k1_gej *r, const secp256k1_gej *a, const
* We have degenerate = false, r->z = (y1 + y2) * Z. * We have degenerate = false, r->z = (y1 + y2) * Z.
* Then r->infinity = ((y1 + y2)Z == 0) = (y1 == -y2) = false. */ * Then r->infinity = ((y1 + y2)Z == 0) = (y1 == -y2) = false. */
r->infinity = secp256k1_fe_normalizes_to_zero(&r->z); r->infinity = secp256k1_fe_normalizes_to_zero(&r->z);
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_gej_rescale(secp256k1_gej *r, const secp256k1_fe *s) { static void secp256k1_gej_rescale(secp256k1_gej *r, const secp256k1_fe *s) {
/* Operations: 4 mul, 1 sqr */ /* Operations: 4 mul, 1 sqr */
secp256k1_fe zz; secp256k1_fe zz;
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
secp256k1_fe_verify(s); secp256k1_fe_verify(s);
#endif
VERIFY_CHECK(!secp256k1_fe_is_zero(s)); VERIFY_CHECK(!secp256k1_fe_is_zero(s));
secp256k1_fe_sqr(&zz, s); secp256k1_fe_sqr(&zz, s);
secp256k1_fe_mul(&r->x, &r->x, &zz); /* r->x *= s^2 */ secp256k1_fe_mul(&r->x, &r->x, &zz); /* r->x *= s^2 */
secp256k1_fe_mul(&r->y, &r->y, &zz); secp256k1_fe_mul(&r->y, &r->y, &zz);
secp256k1_fe_mul(&r->y, &r->y, s); /* r->y *= s^3 */ secp256k1_fe_mul(&r->y, &r->y, s); /* r->y *= s^3 */
secp256k1_fe_mul(&r->z, &r->z, s); /* r->z *= s */ secp256k1_fe_mul(&r->z, &r->z, s); /* r->z *= s */
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static void secp256k1_ge_to_storage(secp256k1_ge_storage *r, const secp256k1_ge *a) { static void secp256k1_ge_to_storage(secp256k1_ge_storage *r, const secp256k1_ge *a) {
secp256k1_fe x, y; secp256k1_fe x, y;
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
VERIFY_CHECK(!a->infinity); VERIFY_CHECK(!a->infinity);
x = a->x; x = a->x;
secp256k1_fe_normalize(&x); secp256k1_fe_normalize(&x);
@ -845,24 +763,18 @@ static void secp256k1_ge_from_storage(secp256k1_ge *r, const secp256k1_ge_storag
secp256k1_fe_from_storage(&r->x, &a->x); secp256k1_fe_from_storage(&r->x, &a->x);
secp256k1_fe_from_storage(&r->y, &a->y); secp256k1_fe_from_storage(&r->y, &a->y);
r->infinity = 0; r->infinity = 0;
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static SECP256K1_INLINE void secp256k1_gej_cmov(secp256k1_gej *r, const secp256k1_gej *a, int flag) { static SECP256K1_INLINE void secp256k1_gej_cmov(secp256k1_gej *r, const secp256k1_gej *a, int flag) {
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
secp256k1_gej_verify(a); secp256k1_gej_verify(a);
#endif
secp256k1_fe_cmov(&r->x, &a->x, flag); secp256k1_fe_cmov(&r->x, &a->x, flag);
secp256k1_fe_cmov(&r->y, &a->y, flag); secp256k1_fe_cmov(&r->y, &a->y, flag);
secp256k1_fe_cmov(&r->z, &a->z, flag); secp256k1_fe_cmov(&r->z, &a->z, flag);
r->infinity ^= (r->infinity ^ a->infinity) & flag; r->infinity ^= (r->infinity ^ a->infinity) & flag;
#ifdef VERIFY
secp256k1_gej_verify(r); secp256k1_gej_verify(r);
#endif
} }
static SECP256K1_INLINE void secp256k1_ge_storage_cmov(secp256k1_ge_storage *r, const secp256k1_ge_storage *a, int flag) { static SECP256K1_INLINE void secp256k1_ge_storage_cmov(secp256k1_ge_storage *r, const secp256k1_ge_storage *a, int flag) {
@ -872,13 +784,9 @@ static SECP256K1_INLINE void secp256k1_ge_storage_cmov(secp256k1_ge_storage *r,
static void secp256k1_ge_mul_lambda(secp256k1_ge *r, const secp256k1_ge *a) { static void secp256k1_ge_mul_lambda(secp256k1_ge *r, const secp256k1_ge *a) {
*r = *a; *r = *a;
#ifdef VERIFY
secp256k1_ge_verify(a); secp256k1_ge_verify(a);
#endif
secp256k1_fe_mul(&r->x, &r->x, &secp256k1_const_beta); secp256k1_fe_mul(&r->x, &r->x, &secp256k1_const_beta);
#ifdef VERIFY
secp256k1_ge_verify(r); secp256k1_ge_verify(r);
#endif
} }
static int secp256k1_ge_is_in_correct_subgroup(const secp256k1_ge* ge) { static int secp256k1_ge_is_in_correct_subgroup(const secp256k1_ge* ge) {
@ -886,9 +794,7 @@ static int secp256k1_ge_is_in_correct_subgroup(const secp256k1_ge* ge) {
secp256k1_gej out; secp256k1_gej out;
int i; int i;
#ifdef VERIFY
secp256k1_ge_verify(ge); secp256k1_ge_verify(ge);
#endif
/* A very simple EC multiplication ladder that avoids a dependency on ecmult. */ /* A very simple EC multiplication ladder that avoids a dependency on ecmult. */
secp256k1_gej_set_infinity(&out); secp256k1_gej_set_infinity(&out);
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {