Merge c06cda3e48 into merged_master (Bitcoin PR bitcoin/bitcoin#23383)

Kept what we already had since it's a newer version of secp256k1-zkp
This commit is contained in:
Byron Hambly 2023-06-13 15:44:13 +00:00
commit ab249ee428
12 changed files with 26682 additions and 284 deletions

View file

@ -298,7 +298,7 @@ bool CKey::SignSchnorr(const uint256& hash, Span<unsigned char> sig, const uint2
uint256 tweak = XOnlyPubKey(pubkey_bytes).ComputeTapTweakHash(merkle_root->IsNull() ? nullptr : merkle_root);
if (!secp256k1_keypair_xonly_tweak_add(GetVerifyContext(), &keypair, tweak.data())) return false;
}
bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, (unsigned char*)aux.data());
bool ret = secp256k1_schnorrsig_sign(secp256k1_context_sign, sig.data(), hash.data(), &keypair, aux.data());
if (ret) {
// Additional verification step to prevent using a potentially corrupted signature
secp256k1_xonly_pubkey pubkey_verify;