Merge 71797beec5 into merged_master (Bitcoin PR bitcoin/bitcoin#22448)

This commit is contained in:
Byron Hambly 2023-04-05 13:40:55 +02:00
commit 09333e2aca
25 changed files with 1135 additions and 1972 deletions

View file

@ -191,7 +191,7 @@ bool XOnlyPubKey::VerifySchnorr(const Span<const unsigned char> msg, Span<const
assert(sigbytes.size() == 64);
secp256k1_xonly_pubkey pubkey;
if (!secp256k1_xonly_pubkey_parse(secp256k1_context_verify, &pubkey, m_keydata.data())) return false;
return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.data(), msg.size(), &pubkey);
return secp256k1_schnorrsig_verify(secp256k1_context_verify, sigbytes.data(), msg.begin(), 32, &pubkey);
}
// ELEMENTS: this is preserved from an old version of the Taproot code for use in OP_TWEAKVERIFY