Merge pull request #206

[secp256k1.git] / src / bench_recover.c

diff --git a/src/bench_recover.c b/src/bench_recover.c
index 286ad064de661acc878b577cd8c34a3bf612a06c..6991cc9d6c595765386fefcb99270ecf7b0a9935 100644 (file)
--- a/src/bench_recover.c
+++ b/src/bench_recover.c
@@ -14,13 +14,15 @@ typedef struct {
 } bench_recover_t;
 
 void bench_recover(void* arg) {
+    int i;
     bench_recover_t *data = (bench_recover_t*)arg;
-
     unsigned char pubkey[33];
-    for (int i=0; i<20000; i++) {
+
+    for (i = 0; i < 20000; i++) {
+        int j;
         int pubkeylen = 33;
-        CHECK(secp256k1_ecdsa_recover_compact(data->msg, 32, data->sig, pubkey, &pubkeylen, 1, i % 2));
-        for (int j = 0; j < 32; j++) {
+        CHECK(secp256k1_ecdsa_recover_compact(data->msg, data->sig, pubkey, &pubkeylen, 1, i % 2));
+        for (j = 0; j < 32; j++) {
             data->sig[j + 32] = data->msg[j];    /* Move former message to S. */
             data->msg[j] = data->sig[j];         /* Move former R to message. */
             data->sig[j] = pubkey[j + 1];        /* Move recovered pubkey X coordinate to R (which must be a valid X coordinate). */
@@ -29,17 +31,18 @@ void bench_recover(void* arg) {
 }
 
 void bench_recover_setup(void* arg) {
+    int i;
     bench_recover_t *data = (bench_recover_t*)arg;
 
-    for (int i = 0; i < 32; i++) data->msg[i] = 1 + i;
-    for (int i = 0; i < 64; i++) data->sig[i] = 65 + i;
+    for (i = 0; i < 32; i++) data->msg[i] = 1 + i;
+    for (i = 0; i < 64; i++) data->sig[i] = 65 + i;
 }
 
 int main(void) {
+    bench_recover_t data;
     secp256k1_start(SECP256K1_START_VERIFY);
 
-    bench_recover_t data;
-    run_benchmark(bench_recover, bench_recover_setup, NULL, &data, 10, 20000);
+    run_benchmark("ecdsa_recover", bench_recover, bench_recover_setup, NULL, &data, 10, 20000);
 
     secp256k1_stop();
     return 0;