From 2fb64b2da2f4b1a92f40b483a10fa94987f986c0 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Sun, 5 May 2013 16:57:49 +0200 Subject: [PATCH] Inline verify is slow, this is what unit tests are for --- src/impl/group.h | 18 ----------------- src/impl/num_gmp.h | 50 ---------------------------------------------- 2 files changed, 68 deletions(-) diff --git a/src/impl/group.h b/src/impl/group.h index c4ffbf6..a39ae4c 100644 --- a/src/impl/group.h +++ b/src/impl/group.h @@ -271,12 +271,6 @@ void static secp256k1_gej_mul_lambda(secp256k1_gej_t *r, const secp256k1_gej_t * } void static secp256k1_gej_split_exp(secp256k1_num_t *r1, secp256k1_num_t *r2, const secp256k1_num_t *a) { -#ifdef VERIFY - secp256k1_num_t a2; - secp256k1_num_init(&a2); - secp256k1_num_copy(&a2, a); -#endif - const secp256k1_ge_consts_t *c = secp256k1_ge_consts; secp256k1_num_t bnc1, bnc2, bnt1, bnt2, bnn2; @@ -305,18 +299,6 @@ void static secp256k1_gej_split_exp(secp256k1_num_t *r1, secp256k1_num_t *r2, co secp256k1_num_mul(&bnt2, &bnc2, &c->a1b2); secp256k1_num_sub(r2, &bnt1, &bnt2); -#ifdef VERIFY - secp256k1_num_t check; - secp256k1_num_init(&check); - secp256k1_num_mul(&check, r2, &c->lambda); - secp256k1_num_add(&check, &check, r1); - secp256k1_num_mod(&check, &c->order); - secp256k1_num_mod(&a2, &c->order); - assert(secp256k1_num_cmp(&check, &a2) == 0); - secp256k1_num_free(&check); - secp256k1_num_free(&a2); -#endif - secp256k1_num_free(&bnc1); secp256k1_num_free(&bnc2); secp256k1_num_free(&bnt1); diff --git a/src/impl/num_gmp.h b/src/impl/num_gmp.h index 52437a2..fbdf29c 100644 --- a/src/impl/num_gmp.h +++ b/src/impl/num_gmp.h @@ -107,11 +107,6 @@ void static secp256k1_num_mod_inverse(secp256k1_num_t *r, const secp256k1_num_t secp256k1_num_sanity(a); secp256k1_num_sanity(m); -#ifdef VERIFY - secp256k1_num_t a2 = *a; - secp256k1_num_t m2 = *m; -#endif - // mpn_gcdext computes: (G,S) = gcdext(U,V), where // * G = gcd(U,V) // * G = U*S + V*T @@ -142,12 +137,6 @@ void static secp256k1_num_mod_inverse(secp256k1_num_t *r, const secp256k1_num_t } else { r->limbs = sn; } - -#ifdef VERIFY - secp256k1_num_t c; - secp256k1_num_mod_mul(&c, &a2, r, m); - assert(c.limbs == 1 && c.data[0] == 1); -#endif } int static secp256k1_num_is_zero(const secp256k1_num_t *a) { @@ -190,44 +179,16 @@ void static secp256k1_num_subadd(secp256k1_num_t *r, const secp256k1_num_t *a, c void static secp256k1_num_add(secp256k1_num_t *r, const secp256k1_num_t *a, const secp256k1_num_t *b) { secp256k1_num_sanity(a); secp256k1_num_sanity(b); - -#ifdef VERIFY - secp256k1_num_t a2 = *a; - secp256k1_num_t b2 = *b; -#endif - secp256k1_num_subadd(r, a, b, 0); - -#ifdef VERIFY - secp256k1_num_t c = *r; - secp256k1_num_subadd(&c, &c, &b2, 1); - assert(secp256k1_num_cmp(&c, &a2) == 0); -#endif } void static secp256k1_num_sub(secp256k1_num_t *r, const secp256k1_num_t *a, const secp256k1_num_t *b) { -#ifdef VERIFY - secp256k1_num_t a2 = *a; - secp256k1_num_t b2 = *b; -#endif secp256k1_num_sanity(a); secp256k1_num_sanity(b); - secp256k1_num_subadd(r, a, b, 1); - -#ifdef VERIFY - secp256k1_num_t c; - secp256k1_num_subadd(&c, r, &b2, 0); - assert(secp256k1_num_cmp(&c, &a2) == 0); -#endif } void static secp256k1_num_mul(secp256k1_num_t *r, const secp256k1_num_t *a, const secp256k1_num_t *b) { -#ifdef VERIFY - secp256k1_num_t a2 = *a; - secp256k1_num_t b2 = *b; -#endif - secp256k1_num_sanity(a); secp256k1_num_sanity(b); @@ -248,17 +209,6 @@ void static secp256k1_num_mul(secp256k1_num_t *r, const secp256k1_num_t *a, cons assert(r->limbs <= 2*NUM_LIMBS); mpn_copyi(r->data, tmp, r->limbs); r->neg = a->neg ^ b->neg; - - secp256k1_num_sanity(&a2); - secp256k1_num_sanity(&b2); - -#ifdef VERIFY - secp256k1_num_t c; - secp256k1_num_div(&c, r, &b2); - assert(secp256k1_num_cmp(&a2, &c) == 0); - secp256k1_num_div(&c, r, &a2); - assert(secp256k1_num_cmp(&b2, &c) == 0); -#endif } void static secp256k1_num_div(secp256k1_num_t *r, const secp256k1_num_t *a, const secp256k1_num_t *b) {