From dbfc7d241f0a12311939f153e863cc8419c493f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Vejpustek?= Date: Wed, 20 Oct 2021 15:57:37 +0200 Subject: [PATCH] chore(vendor,crypto): bump version of secp256k1-zkp --- core/SConscript.firmware | 1 - core/SConscript.unix | 1 - crypto/zkp_bip340.c | 4 ++-- vendor/secp256k1-zkp | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/SConscript.firmware b/core/SConscript.firmware index ac26f3cb4..c5d08fe6e 100644 --- a/core/SConscript.firmware +++ b/core/SConscript.firmware @@ -120,7 +120,6 @@ if FEATURE_FLAGS["SECP256K1_ZKP"]: 'USE_SECP256K1_ZKP', 'USE_SECP256K1_ZKP_ECDSA', ('SECP256K1_CONTEXT_SIZE', '8416'), - 'SECP256K1_BUILD', 'USE_ASM_ARM', 'USE_NUM_NONE', 'USE_FIELD_INV_BUILTIN', diff --git a/core/SConscript.unix b/core/SConscript.unix index ba80b10ff..c7d73d09a 100644 --- a/core/SConscript.unix +++ b/core/SConscript.unix @@ -118,7 +118,6 @@ if FEATURE_FLAGS["SECP256K1_ZKP"]: 'USE_SECP256K1_ZKP', 'USE_SECP256K1_ZKP_ECDSA', ('SECP256K1_CONTEXT_SIZE', '8416'), - 'SECP256K1_BUILD', 'USE_NUM_NONE', 'USE_FIELD_INV_BUILTIN', 'USE_SCALAR_INV_BUILTIN', diff --git a/crypto/zkp_bip340.c b/crypto/zkp_bip340.c index d0fdab885..0b395a317 100644 --- a/crypto/zkp_bip340.c +++ b/crypto/zkp_bip340.c @@ -112,7 +112,7 @@ int zkp_bip340_sign_digest(const uint8_t *private_key_bytes, if (context_writable) { secp256k1_context_writable_randomize(context_writable); if (secp256k1_schnorrsig_sign(context_writable, signature_bytes, digest, - &keypair, NULL, auxiliary_data) != 1) { + &keypair, auxiliary_data) != 1) { result = -1; } zkp_context_release_writable(); @@ -148,7 +148,7 @@ int zkp_bip340_verify_digest(const uint8_t *public_key_bytes, if (result == 0) { if (secp256k1_schnorrsig_verify(context_read_only, signature_bytes, digest, - &xonly_pubkey) != 1) { + 32, &xonly_pubkey) != 1) { result = 5; } } diff --git a/vendor/secp256k1-zkp b/vendor/secp256k1-zkp index fac477f82..6b8733577 160000 --- a/vendor/secp256k1-zkp +++ b/vendor/secp256k1-zkp @@ -1 +1 @@ -Subproject commit fac477f822a9d493b0d23cc604d741b24a0c9719 +Subproject commit 6b8733577e4a8e1a4f77aaa48691f188b0c42f5c