Skip to content

Commit

Permalink
Merge branch 'main' into feat-inplace-crypto
Browse files Browse the repository at this point in the history
  • Loading branch information
larseggert committed Jan 29, 2025
2 parents b0fcf23 + 379722c commit 5c9bc3e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ jobs:
if: matrix.type == 'debug' && matrix.rust-toolchain == 'nightly'

- uses: codecov/test-results-action@4e79e65778be1cecd5df25e14af1eafb6df80ea9 # v1.0.2
if: always()
with:
files: target/nextest/ci/junit.xml
fail_ci_if_error: false
Expand Down
1 change: 0 additions & 1 deletion neqo-transport/src/connection/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,6 @@ impl Connection {
self.check_stateless_reset(path, packet.data(), dcid.is_none(), now)?;
self.stats.borrow_mut().pkt_dropped("Decryption failure");
qlog::packet_dropped(&self.qlog, &packet, now);
break;
}
}
slc = remainder;
Expand Down
4 changes: 2 additions & 2 deletions neqo-transport/src/packet/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ impl<'a> PublicPacket<'a> {
return Err(Error::DecryptError);
};
let version = rx.version(); // Version fixup; see above.
let len = rx.decrypt_in_place(pn, header, body, self.data)?;
let len = rx.decrypt_in_place(pn, header.clone(), body, self.data)?;
// If this is the first packet ever successfully decrypted
// using `rx`, make sure to initiate a key update.
if rx.needs_update() {
Expand All @@ -901,7 +901,7 @@ impl<'a> PublicPacket<'a> {
version,
pt: self.packet_type,
pn,
data: &self.data[self.header_len + 1..self.header_len + 1 + len],
data: &self.data[header.end..header.end + len],
})
} else if crypto.rx_pending(cspace) {
Err(Error::KeysPending(cspace))
Expand Down

0 comments on commit 5c9bc3e

Please sign in to comment.