Skip to content

Commit da0092b

Browse files
committed
Merge #986: tests: remove secp256k1_fe_verify from tests.c and modify _fe_from_storage to call _fe_verify
d439937 tests: remove `secp256k1_fe_verify` from tests.c and modify `secp256k1_fe_from_storage` to call `secp256k1_fe_verify` (siv2r) Pull request description: ACKs for top commit: roconnor-blockstream: utACK d439937 diff looks correct, I also didn't run the tests locally. real-or-random: utACK d439937 diff looks correct, I didn't run the tests locally jonasnick: ACK d439937 ran tests with `--enable-coverage` Tree-SHA512: c3c9ecf8e9b7dfdcd1144ddcf8bcc637996c699dbd0fc6223e6186d082908728468fa276b09c6f344e036ca05f54432dde6366a83eb39f915a334164faadd556
2 parents 2a3a97c + d439937 commit da0092b

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

src/field_10x26_impl.h

+1
Original file line numberDiff line numberDiff line change
@@ -1162,6 +1162,7 @@ static SECP256K1_INLINE void secp256k1_fe_from_storage(secp256k1_fe *r, const se
11621162
#ifdef VERIFY
11631163
r->magnitude = 1;
11641164
r->normalized = 1;
1165+
secp256k1_fe_verify(r);
11651166
#endif
11661167
}
11671168

src/field_5x52_impl.h

+1
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ static SECP256K1_INLINE void secp256k1_fe_from_storage(secp256k1_fe *r, const se
496496
#ifdef VERIFY
497497
r->magnitude = 1;
498498
r->normalized = 1;
499+
secp256k1_fe_verify(r);
499500
#endif
500501
}
501502

src/tests.c

-4
Original file line numberDiff line numberDiff line change
@@ -3435,8 +3435,6 @@ void test_pre_g_table(const secp256k1_ge_storage * pre_g, size_t n) {
34353435
CHECK(0 < n);
34363436

34373437
secp256k1_ge_from_storage(&p, &pre_g[0]);
3438-
secp256k1_fe_verify(&p.x);
3439-
secp256k1_fe_verify(&p.y);
34403438
CHECK(secp256k1_ge_is_valid_var(&p));
34413439

34423440
secp256k1_gej_set_ge(&g2, &p);
@@ -3449,8 +3447,6 @@ void test_pre_g_table(const secp256k1_ge_storage * pre_g, size_t n) {
34493447
CHECK(!secp256k1_fe_normalizes_to_zero_var(&dpx) || !secp256k1_fe_normalizes_to_zero_var(&dpy));
34503448

34513449
secp256k1_ge_from_storage(&q, &pre_g[i]);
3452-
secp256k1_fe_verify(&q.x);
3453-
secp256k1_fe_verify(&q.y);
34543450
CHECK(secp256k1_ge_is_valid_var(&q));
34553451

34563452
secp256k1_fe_negate(&dqx, &q.x, 1); secp256k1_fe_add(&dqx, &gg.x); secp256k1_fe_normalize_weak(&dqx);

0 commit comments

Comments
 (0)