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

Build fix.

Browse source
This commit is contained in:
Adam Ierymenko 2022-12-16 10:19:58 -05:00
parent 826f0d3ab5
commit 83683c9b57
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
zssp/src/zssp.rs
View file

@ -101,13 +101,13 @@ pub struct ReceiveContext<H: ApplicationLayer> {
incoming_init_header_check_cipher: Aes, incoming_init_header_check_cipher: Aes,
} }
/// ZSSP bi-directional packet transport channel. /// A FIPS compliant variant of Noise_IK with hybrid Kyber1024 PQ data forward secrecy.
pub struct Session<Application: ApplicationLayer> { pub struct Session<Application: ApplicationLayer> {
/// This side's session ID (unique on this side) /// This side's session ID (unique on this side)
pub id: SessionId, pub id: SessionId,
/// An arbitrary object associated with session (type defined in Host trait) /// An arbitrary application defined object associated with each session
pub user_data: Application::SessionUserData, pub application_data: Application::SessionUserData,
send_counter: Counter, // Outgoing packet counter and nonce state send_counter: Counter, // Outgoing packet counter and nonce state
psk: Secret<64>, // Arbitrary PSK provided by external code psk: Secret<64>, // Arbitrary PSK provided by external code
@ -254,7 +254,7 @@ impl<Application: ApplicationLayer> Session<Application> {
remote_s_public_blob: &[u8], remote_s_public_blob: &[u8],
offer_metadata: &[u8], offer_metadata: &[u8],
psk: &Secret<64>, psk: &Secret<64>,
user_data: Application::SessionUserData, application_data: Application::SessionUserData,
mtu: usize, mtu: usize,
current_time: i64, current_time: i64,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
@ -286,7 +286,7 @@ impl<Application: ApplicationLayer> Session<Application> {
{ {
return Ok(Self { return Ok(Self {
id: local_session_id, id: local_session_id,
user_data, application_data,
send_counter, send_counter,
psk: psk.clone(), psk: psk.clone(),
noise_ss, noise_ss,
@ -623,7 +623,7 @@ impl<Application: ApplicationLayer> ReceiveContext<Application> {
remote_address: &Application::RemoteAddress, remote_address: &Application::RemoteAddress,
send: &mut SendFunction, send: &mut SendFunction,
data_buf: &'a mut [u8], data_buf: &'a mut [u8],
canonical_header_bytes: &[u8; AES_GCM_TAG_SIZE], canonical_header_bytes: &[u8; 12],
fragments: &[Application::IncomingPacketBuffer], fragments: &[Application::IncomingPacketBuffer],
packet_type: u8, packet_type: u8,
session: Option<Application::SessionRef>, session: Option<Application::SessionRef>,
@ -897,7 +897,7 @@ impl<Application: ApplicationLayer> ReceiveContext<Application> {
( (
Some(Session::<Application> { Some(Session::<Application> {
id: new_session_id, id: new_session_id,
user_data: associated_object, application_data: associated_object,
send_counter: Counter::new(), send_counter: Counter::new(),
psk, psk,
noise_ss, noise_ss,