zerotier/zssp
0
0
Fork 0
mirror of https://github.com/zerotier/zssp.git synced 2026-05-22 16:28:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
This commit is contained in:
Monica Moniot
2023-11-21 16:03:28 -05:00
parent 2bfc7f03ad
commit 56806f94ec
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reference/src/context.rs
+11 -13
View File
@@ -307,19 +307,17 @@ impl<C: CryptoLayer> Context<C> {
if let Entry::Occupied(mut entry) = b2_map.entry(kid_recv) {
let zeta = entry.get_mut();
// Process recv fragmentation layer.
let result = zeta.defrag.received_fragment::<C>(
raw_fragment,
app.time(),
|n, frag_no, frag_count| {
let (p, c) = from_nonce(n);
log!(app, ReceivedRawFragment(p, c, frag_no, frag_count));
if p == PACKET_TYPE_HANDSHAKE_COMPLETION && c == 0 {
Ok(())
} else {
Err(byzantine_fault!(InvalidPacket, true))
}
},
)?;
let result =
zeta.defrag
.received_fragment::<C>(raw_fragment, app.time(), |n, frag_no, frag_count| {
let (p, c) = from_nonce(n);
log!(app, ReceivedRawFragment(p, c, frag_no, frag_count));
if p == PACKET_TYPE_HANDSHAKE_COMPLETION && c == 0 {
Ok(())
} else {
Err(byzantine_fault!(InvalidPacket, true))
}
})?;
if let Some((_, assembled_packet)) = result {
log!(app, ReceivedRawX3);
let zeta = entry.remove();
reference/src/crypto_impl/aes_impl.rs
+1 -6
View File
@@ -47,12 +47,7 @@ impl AesGcmAead for AesGcmCrate {
let key = Key::<Aes256Gcm>::from_slice(key);
let mut cipher = Aes256Gcm::new(key);
cipher
.decrypt_in_place_detached(
Nonce::from_slice(iv),
aad.unwrap_or(&[]),
buffer,
Tag::from_slice(tag),
)
.decrypt_in_place_detached(Nonce::from_slice(iv), aad.unwrap_or(&[]), buffer, Tag::from_slice(tag))
.is_ok()
}
}