From 6303e3b0caa49d13d8283ede90553450730bf76f Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 21 Jun 2019 08:54:50 +0000 Subject: [PATCH] Fix schnorrsig module after rebase on upstream e541a90e --- src/bench_schnorrsig.c | 2 +- src/modules/schnorrsig/main_impl.h | 2 +- src/modules/schnorrsig/tests_impl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bench_schnorrsig.c b/src/bench_schnorrsig.c index d2451092..6cf3dc3f 100644 --- a/src/bench_schnorrsig.c +++ b/src/bench_schnorrsig.c @@ -122,7 +122,7 @@ int main(void) { free(data.msgs); free(data.sigs); - secp256k1_scratch_space_destroy(data.scratch); + secp256k1_scratch_space_destroy(data.ctx, data.scratch); secp256k1_context_destroy(data.ctx); return 0; } diff --git a/src/modules/schnorrsig/main_impl.h b/src/modules/schnorrsig/main_impl.h index bebb49fe..7a455fa6 100644 --- a/src/modules/schnorrsig/main_impl.h +++ b/src/modules/schnorrsig/main_impl.h @@ -331,7 +331,7 @@ int secp256k1_schnorrsig_verify_batch(const secp256k1_context *ctx, secp256k1_sc } secp256k1_scalar_negate(&s, &s); - return secp256k1_ecmult_multi_var(&ctx->ecmult_ctx, scratch, &rj, &s, secp256k1_schnorrsig_verify_batch_ecmult_callback, (void *) &ecmult_context, 2 * n_sigs) + return secp256k1_ecmult_multi_var(&ctx->error_callback, &ctx->ecmult_ctx, scratch, &rj, &s, secp256k1_schnorrsig_verify_batch_ecmult_callback, (void *) &ecmult_context, 2 * n_sigs) && secp256k1_gej_is_infinity(&rj); } diff --git a/src/modules/schnorrsig/tests_impl.h b/src/modules/schnorrsig/tests_impl.h index e067058a..a999a011 100644 --- a/src/modules/schnorrsig/tests_impl.h +++ b/src/modules/schnorrsig/tests_impl.h @@ -720,7 +720,7 @@ void run_schnorrsig_tests(void) { test_schnorrsig_sign(); test_schnorrsig_sign_verify(scratch); - secp256k1_scratch_space_destroy(scratch); + secp256k1_scratch_space_destroy(ctx, scratch); } #endif