void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 21:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed to session_key

Browse source
This commit is contained in:
mamoniot 2022-12-15 09:41:53 -05:00
parent de03acbfaa
commit fcd628c533
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zssp/src/zssp.rs
View file

@ -313,7 +313,7 @@ impl<Layer: ApplicationLayer> Session<Layer> {
debug_assert!(mtu_buffer.len() >= MIN_TRANSPORT_MTU); debug_assert!(mtu_buffer.len() >= MIN_TRANSPORT_MTU);
let state = self.state.read().unwrap(); let state = self.state.read().unwrap();
if let Some(remote_session_id) = state.remote_session_id { if let Some(remote_session_id) = state.remote_session_id {
if let Some(sym_key) = state.session_keys[state.cur_session_key_idx].as_ref() { if let Some(session_key) = state.session_keys[state.cur_session_key_idx].as_ref() {
// Total size of the armored packet we are going to send (may end up being fragmented) // Total size of the armored packet we are going to send (may end up being fragmented)
let packet_len = data.len() + HEADER_SIZE + AES_GCM_TAG_SIZE; let packet_len = data.len() + HEADER_SIZE + AES_GCM_TAG_SIZE;
@ -336,7 +336,7 @@ impl<Layer: ApplicationLayer> Session<Layer> {
// Get an initialized AES-GCM cipher and re-initialize with a 96-bit IV built from remote session ID, // Get an initialized AES-GCM cipher and re-initialize with a 96-bit IV built from remote session ID,
// packet type, and counter. // packet type, and counter.
let mut c = sym_key.get_send_cipher(counter)?; let mut c = session_key.get_send_cipher(counter)?;
c.reset_init_gcm(CanonicalHeader::make(remote_session_id, PACKET_TYPE_DATA, counter.to_u32()).as_bytes()); c.reset_init_gcm(CanonicalHeader::make(remote_session_id, PACKET_TYPE_DATA, counter.to_u32()).as_bytes());
// Send first N-1 fragments of N total fragments. // Send first N-1 fragments of N total fragments.
@ -375,7 +375,7 @@ impl<Layer: ApplicationLayer> Session<Layer> {
send(&mut mtu_buffer[..last_fragment_size]); send(&mut mtu_buffer[..last_fragment_size]);
// Check reusable AES-GCM instance back into pool. // Check reusable AES-GCM instance back into pool.
sym_key.return_send_cipher(c); session_key.return_send_cipher(c);
return Ok(()); return Ok(());
} else { } else {