Implement endomorphism optimization for secp256k1_ecmult_const

[secp256k1.git] / src / bench_sign.c

diff --git a/src/bench_sign.c b/src/bench_sign.c
index e4cb36c38a60f1d52dba0e775e7266c6e434c43e..e625da07a4ee6d57170ca703a0c609e4e13ede31 100644 (file)
--- a/src/bench_sign.c
+++ b/src/bench_sign.c
@@ -9,34 +9,31 @@
 #include "bench.h"
 
 typedef struct {
+    secp256k1_context_t* ctx;
     unsigned char msg[32];
     unsigned char key[32];
 } bench_sign_t;
 
-/** Very fast but insecure nonce generation function. Do not use for production code. */
-static int insecure_nonce_function(unsigned char *nonce32, const unsigned char *msg32, const unsigned char *key32, unsigned int count, const void *data) {
-   (void)data;
-   for (int i = 0; i < 8; i++) {
-       ((uint32_t*)nonce32)[i] = ((uint32_t*)msg32)[i] + ((uint32_t*)key32)[i] + count;
-   }
-   return 1;
-}
-
 static void bench_sign_setup(void* arg) {
+    int i;
     bench_sign_t *data = (bench_sign_t*)arg;
 
-    for (int i = 0; i < 32; i++) data->msg[i] = i + 1;
-    for (int i = 0; i < 32; i++) data->key[i] = i + 65;
+    for (i = 0; i < 32; i++) data->msg[i] = i + 1;
+    for (i = 0; i < 32; i++) data->key[i] = i + 65;
 }
 
 static void bench_sign(void* arg) {
+    int i;
     bench_sign_t *data = (bench_sign_t*)arg;
 
     unsigned char sig[64];
-    for (int i=0; i<20000; i++) {
+    for (i = 0; i < 20000; i++) {
+        int j;
         int recid = 0;
-        secp256k1_ecdsa_sign_compact(data->msg, sig, data->key, insecure_nonce_function, NULL, &recid);
-        for (int j = 0; j < 32; j++) {
+        secp256k1_ecdsa_signature_t signature;
+        CHECK(secp256k1_ecdsa_sign(data->ctx, data->msg, &signature, data->key, NULL, NULL));
+        CHECK(secp256k1_ecdsa_signature_serialize_compact(data->ctx, sig, &recid, &signature));
+        for (j = 0; j < 32; j++) {
             data->msg[j] = sig[j];             /* Move former R to message. */
             data->key[j] = sig[j + 32];        /* Move former S to key.     */
         }
@@ -44,11 +41,12 @@ static void bench_sign(void* arg) {
 }
 
 int main(void) {
-    secp256k1_start(SECP256K1_START_SIGN);
-
     bench_sign_t data;
-    run_benchmark(bench_sign, bench_sign_setup, NULL, &data, 10, 20000);
 
-    secp256k1_stop();
+    data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN);
+
+    run_benchmark("ecdsa_sign", bench_sign, bench_sign_setup, NULL, &data, 10, 20000);
+
+    secp256k1_context_destroy(data.ctx);
     return 0;
 }