void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 08:23:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reviewed renaming

Browse source
This commit is contained in:
mamoniot 2022-12-14 11:11:46 -05:00
parent adc0674fb5
commit f8ed545f32
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
zssp/src/zssp.rs
View file

@ -375,7 +375,7 @@ impl<Layer: ApplicationLayer> Session<Layer> {
/// * `user_data` - Arbitrary object to put into session /// * `user_data` - Arbitrary object to put into session
/// * `mtu` - Physical wire maximum transmition unit /// * `mtu` - Physical wire maximum transmition unit
/// * `current_time` - Current monotonic time in milliseconds /// * `current_time` - Current monotonic time in milliseconds
pub fn new<SendFunction: FnMut(&mut [u8])>( pub fn start_new<SendFunction: FnMut(&mut [u8])>(
host: &Layer, host: &Layer,
mut send: SendFunction, mut send: SendFunction,
local_session_id: SessionId, local_session_id: SessionId,
@ -386,10 +386,11 @@ impl<Layer: ApplicationLayer> Session<Layer> {
mtu: usize, mtu: usize,
current_time: i64, current_time: i64,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
if let Some(remote_s_public_p384) = Layer::extract_s_public_from_raw(remote_s_public_raw) { let bob_s_public_raw = remote_s_public_raw;
if let Some(noise_ss) = host.get_local_s_keypair().agree(&remote_s_public_p384) { if let Some(bob_s_public) = Layer::extract_s_public_from_raw(bob_s_public_raw) {
if let Some(noise_ss) = host.get_local_s_keypair().agree(&bob_s_public) {
let send_counter = Counter::new(); let send_counter = Counter::new();
let remote_s_public_hash = SHA384::hash(remote_s_public_raw); let bob_s_public_hash = SHA384::hash(bob_s_public_raw);
let header_check_cipher = let header_check_cipher =
Aes::new(kbkdf512(noise_ss.as_bytes(), KBKDF_KEY_USAGE_LABEL_HEADER_CHECK).first_n::<HEADER_CHECK_AES_KEY_SIZE>()); Aes::new(kbkdf512(noise_ss.as_bytes(), KBKDF_KEY_USAGE_LABEL_HEADER_CHECK).first_n::<HEADER_CHECK_AES_KEY_SIZE>());
if let Ok(offer) = send_ephemeral_offer( if let Ok(offer) = send_ephemeral_offer(
@ -399,8 +400,8 @@ impl<Layer: ApplicationLayer> Session<Layer> {
None, None,
host.get_local_s_public_raw(), host.get_local_s_public_raw(),
offer_metadata, offer_metadata,
&remote_s_public_p384, &bob_s_public,
&remote_s_public_hash, &bob_s_public_hash,
&noise_ss, &noise_ss,
None, None,
None, None,
@ -421,8 +422,8 @@ impl<Layer: ApplicationLayer> Session<Layer> {
offer: Some(offer), offer: Some(offer),
last_remote_offer: i64::MIN, last_remote_offer: i64::MIN,
}), }),
remote_s_public_hash, remote_s_public_hash: bob_s_public_hash,
remote_s_public_raw: remote_s_public_p384.as_bytes().clone(), remote_s_public_raw: bob_s_public.as_bytes().clone(),
defrag: Mutex::new(RingBufferMap::new(random::xorshift64_random() as u32)), defrag: Mutex::new(RingBufferMap::new(random::xorshift64_random() as u32)),
}); });
} }
@ -1162,7 +1163,7 @@ impl<Layer: ApplicationLayer> ReceiveContext<Layer> {
.agree(&bob_e_public) .agree(&bob_e_public)
.ok_or(Error::FailedAuthentication)?; .ok_or(Error::FailedAuthentication)?;
let mut noise_ik_key = Secret(hmac_sha512( let noise_ik_key = Secret(hmac_sha512(
session.psk.as_bytes(), session.psk.as_bytes(),
&hmac_sha512( &hmac_sha512(
&hmac_sha512(&hmac_sha512(offer.ss_key.as_bytes(), bob_e_public.as_bytes()), noise_ee.as_bytes()), &hmac_sha512(&hmac_sha512(offer.ss_key.as_bytes(), bob_e_public.as_bytes()), noise_ee.as_bytes()),
@ -1881,7 +1882,7 @@ mod tests {
//println!("zssp: size of session (bytes): {}", std::mem::size_of::<Session<Box<TestHost>>>()); //println!("zssp: size of session (bytes): {}", std::mem::size_of::<Session<Box<TestHost>>>());
let _ = alice_host.session.lock().unwrap().insert(Arc::new( let _ = alice_host.session.lock().unwrap().insert(Arc::new(
Session::new( Session::start_new(
&alice_host, &alice_host,
|data| bob_host.queue.lock().unwrap().push_front(data.to_vec()), |data| bob_host.queue.lock().unwrap().push_front(data.to_vec()),
SessionId::new_random(), SessionId::new_random(),