Skip to content

Various followups to #3917 #3941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 30, 2025
+19 −21
Merged

Various followups to #3917 #3941

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82a984a
Previously-authentication fields in contexts can be reused
TheBlueMatt Jul 18, 2025
c9c2867
Update docs on `verify_inbound_async_payment_context`
TheBlueMatt Jul 18, 2025
5f14409
Update `HMAC_INPUT` docs to accurately describe legacy reservations
TheBlueMatt Jul 18, 2025
3129ac3
Update `ChaChaPolyWriteAdapter` to bypass crypto when calc'ing len
TheBlueMatt Jul 18, 2025
8ee02eb
Correct `ChaCha[Dual]PolyReadAdapter` extra stream contents logic
TheBlueMatt Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lightning/src/crypto/streams.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ impl<T: Readable> LengthReadableArgs<([u8; 32], [u8; 32])> for ChaChaDualPolyRea
ChaChaDualPolyReader { chacha: &mut chacha, poly: &mut mac, read_len: 0, read: s };

let readable: T = Readable::read(&mut chacha_stream)?;
chacha_stream.read.eat_remaining()?;
while chacha_stream.read.bytes_remain() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused by this change. eat_remaining will consume the remaining bytes and error if we didn't read all of the bytes in the initial call to read, which seems correct to me. Doesn't any bytes remaining indicate a buggy node, since they incorrectly encoded the length we were supposed to read in the LengthLimitedReader? If we're reading multiple objects, seems like the underlying Readable should be on a tuple and still not have any bytes remaining.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eat_remaining will read those bytes directly, though, rather than going through the chacha_stream. Note that we call eat_remaining on chacha_stream.read not on chacha_stream. As a result, any bytes which get read via that will not be included in the HMAC, which seems wrong.

let mut buf = [0; 256];
chacha_stream.read(&mut buf)?;
}

let read_len = chacha_stream.read_len;

Expand Down Expand Up @@ -203,7 +206,10 @@ impl<T: Readable> LengthReadableArgs<[u8; 32]> for ChaChaPolyReadAdapter<T> {
let s = FixedLengthReader::new(r, decrypted_len);
let mut chacha_stream = ChaChaPolyReader { chacha: &mut chacha, read: s };
let readable: T = Readable::read(&mut chacha_stream)?;
chacha_stream.read.eat_remaining()?;
while chacha_stream.read.bytes_remain() {
let mut buf = [0; 256];
chacha_stream.read(&mut buf)?;
}

let mut tag = [0 as u8; 16];
r.read_exact(&mut tag)?;
Expand Down
Loading