bip-324: fix FSChaCha20 type error #1478
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The FSChaCha20 class, as written in the BIP's pseudocode, doesn't have an encrypt() method (even though the equivalent class in the `bip-0324/reference.py` does), so use crypt() to be clear that we're not using FSChaCha20Poly1305 for `peer.send_L`.
|
(Probably worth tagging @real-or-random @jonasschnelli @sipa) |
jamesob
force-pushed
the
jamesob-23-07-bip324-err
branch
4 times, most recently
from
3390236
to
f1cd630
Compare
For some reason, the fragments `b''` and `__init__` don't display properly in Github's mediawiki format, so special-case those.
|
While in the neighborhood, I've added Python syntax highlighting where possible. Apparently Python |
| assert len(contents) <= 2**24 - 1 | ||
| header = (ignore << IGNORE_BIT_POS).to_bytes(HEADER_LEN, 'little') | ||
| plaintext = header + contents | ||
| aead_ciphertext = peer.send_P.encrypt(aad, plaintext) | ||
| enc_contents_len = peer.send_L.encrypt(len(contents).to_bytes(LENGTH_FIELD_LEN, 'little')) |
There was a problem hiding this comment.
Hm., I think I'd prefer to add encrypt and decrypt methods to the class.
| CHACHA20POLY1305_EXPANSION = 16 | ||
|
|
||
| def v2_receive_packet(peer, aad=b'', skip_decoy=True): |
There was a problem hiding this comment.
nit: Did you change these intentionally? Now we have both ' and " in the source, which is also not very consistent.
|
cc @dhruv |
|
@jamesob Rebase? |
|
Are you still working on this, @jamesob? |
murchandamus
added
the
PR Author action required
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The FSChaCha20 class, as written in the BIP's pseudocode, doesn't have an encrypt() method (even though the equivalent class in
bip-0324/reference.pydoes), so use crypt() to be clear that we're not using FSChaCha20Poly1305 forpeer.send_L.