Merge #699: Initialize field elements when resulting in infinity

[secp256k1.git] / src / bench_sign.c

diff --git a/src/bench_sign.c b/src/bench_sign.c
index 2d16defca1c2edec652e88d7ea9a0b8646bf994e..c6b2942cc0c9bdc062b97bbadb24f531b9bedc1e 100644 (file)
--- a/src/bench_sign.c
+++ b/src/bench_sign.c
@@ -9,37 +9,50 @@
 #include "bench.h"
 
 typedef struct {
+    secp256k1_context* ctx;
     unsigned char msg[32];
     unsigned char key[32];
-} bench_sign_t;
+} bench_sign;
 
 static void bench_sign_setup(void* arg) {
-    bench_sign_t *data = (bench_sign_t*)arg;
+    int i;
+    bench_sign *data = (bench_sign*)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) {
-    bench_sign_t *data = (bench_sign_t*)arg;
-
-    unsigned char sig[64];
-    for (int i=0; i<20000; i++) {
-        int recid = 0;
-        secp256k1_ecdsa_sign_compact(data->msg, sig, data->key, NULL, NULL, &recid);
-        for (int 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.     */
+static void bench_sign_run(void* arg, int iters) {
+    int i;
+    bench_sign *data = (bench_sign*)arg;
+
+    unsigned char sig[74];
+    for (i = 0; i < iters; i++) {
+        size_t siglen = 74;
+        int j;
+        secp256k1_ecdsa_signature signature;
+        CHECK(secp256k1_ecdsa_sign(data->ctx, &signature, data->msg, data->key, NULL, NULL));
+        CHECK(secp256k1_ecdsa_signature_serialize_der(data->ctx, sig, &siglen, &signature));
+        for (j = 0; j < 32; j++) {
+            data->msg[j] = sig[j];
+            data->key[j] = sig[j + 32];
         }
     }
 }
 
 int main(void) {
-    secp256k1_start(SECP256K1_START_SIGN);
+    bench_sign data;
+
+    int iters = get_iters(20000);
+
+    data.ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN);
 
-    bench_sign_t data;
-    run_benchmark(bench_sign, bench_sign_setup, NULL, &data, 10, 20000);
+    run_benchmark("ecdsa_sign", bench_sign_run, bench_sign_setup, NULL, &data, 10, iters);
 
-    secp256k1_stop();
+    secp256k1_context_destroy(data.ctx);
     return 0;
 }