diff options
| author | Andrew Chow <github@achow101.com> | 2023-11-07 16:43:34 -0500 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-11-07 16:48:57 -0500 |
| commit | 962ea5c525028391bb4c6546db0c2c3dec9cb4a0 (patch) | |
| tree | ef9530b2204a2c3c697081ccbf35ca94c5036488 /test/functional/feature_taproot.py | |
| parent | c981771bc39ce99e8ecc6e0f894ac872703c40a4 (diff) | |
| parent | c534c0871038ded72dc9078cc91e030ceb746196 (diff) | |
| download | bitcoin-962ea5c525028391bb4c6546db0c2c3dec9cb4a0.tar.xz | |
Merge bitcoin/bitcoin#28374: test: python cryptography required for BIP 324 functional tests
c534c0871038ded72dc9078cc91e030ceb746196 [test/crypto] Add FSChaCha20Poly1305 AEAD python implementation (stratospher)
c2a458f1c2f54aca132da9959b3fca19fdf1f813 [test/crypto] Add FSChaCha20 python implementation (stratospher)
c4ea5f628806ead16e21d2a1f639fc6acc0400f5 [test/crypto] Add RFC 8439's ChaCha20Poly1305 AEAD (stratospher)
9fc6e0355e5ab52e76e647e5dad7571f962b4d4c [test/crypto] Add Poly1305 python implementation (stratospher)
fec2ca6c9a8a8e44b6e4d51c4ef7fa6eaca6e446 [test/crypto] Use chacha20_block function in `data_to_num3072` (stratospher)
0cde60da3a16a27697f1f9014fcd33ea92eb639b [test/crypto] Add ChaCha20 python implementation (stratospher)
69d3f50ab645ad0ade1d67c66d2058b48bcf943b [test/crypto] Add HMAC-based Key Derivation Function (HKDF) (stratospher)
08a4a56cbcfa54366c2c0bb52bb147fc2740edc5 [test] Move test framework crypto functions to crypto/ (stratospher)
Pull request description:
split off from #24748 to keep commits related to cryptography and functional test framework changes separate.
This PR adds python implementation and unit tests for HKDF, ChaCha20, Poly1305, ChaCha20Poly1305 AEAD, FSChaCha20 and FSChaCha20Poly1305 AEAD.
They're based on https://github.com/bitcoin/bips/blob/cc177ab7bc5abcdcdf9c956ee88afd1052053328/bip-0324/reference.py for easy review.
ACKs for top commit:
sipa:
utACK c534c0871038ded72dc9078cc91e030ceb746196
achow101:
ACK c534c0871038ded72dc9078cc91e030ceb746196
theStack:
re-ACK c534c0871038ded72dc9078cc91e030ceb746196
Tree-SHA512: 08a0a422d2937eadcf0edfede37e535e6bc4c2e4b192441bbf9bc26dd3f03fa3388effd22f0527c55af173933d0b50e5b2b3d36f2b62d0aca3098728ef06970e
Diffstat (limited to 'test/functional/feature_taproot.py')
| -rwxr-xr-x | test/functional/feature_taproot.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/feature_taproot.py b/test/functional/feature_taproot.py index 1d8c87feb5..e85541d0ec 100755 --- a/test/functional/feature_taproot.py +++ b/test/functional/feature_taproot.py @@ -104,7 +104,7 @@ from test_framework.key import ( tweak_add_privkey, ECKey, ) -from test_framework import secp256k1 +from test_framework.crypto import secp256k1 from test_framework.address import ( hash160, program_to_witness, |