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

docs

Browse source
This commit is contained in:
Adam Ierymenko 2022-08-17 11:11:08 -04:00
parent 5250d5919e
commit 9e99a78d34
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
zerotier-core-crypto/src/noise.rs
View file

@ -123,9 +123,6 @@ pub enum Error {
/// New session was rejected by caller's supplied authentication check function /// New session was rejected by caller's supplied authentication check function
NewSessionRejected, NewSessionRejected,
/// An unexpected packet was received, like a counter offer when no offer was sent
Unexpected,
/// Rekeying failed and session secret has reached its maximum usage count /// Rekeying failed and session secret has reached its maximum usage count
MaxKeyLifetimeExceeded, MaxKeyLifetimeExceeded,
@ -141,7 +138,6 @@ impl std::fmt::Display for Error {
Self::InvalidParameter => f.write_str("InvalidParameter"), Self::InvalidParameter => f.write_str("InvalidParameter"),
Self::FailedAuthentication => f.write_str("FailedAuthentication"), Self::FailedAuthentication => f.write_str("FailedAuthentication"),
Self::NewSessionRejected => f.write_str("NewSessionRejected"), Self::NewSessionRejected => f.write_str("NewSessionRejected"),
Self::Unexpected => f.write_str("OutOfSequence"),
Self::MaxKeyLifetimeExceeded => f.write_str("MaxKeyLifetimeExceeded"), Self::MaxKeyLifetimeExceeded => f.write_str("MaxKeyLifetimeExceeded"),
Self::SessionNotEstablished => f.write_str("SessionNotEstablished"), Self::SessionNotEstablished => f.write_str("SessionNotEstablished"),
} }
@ -646,12 +642,12 @@ pub fn receive<
return Ok(ReceiveResult::OkSendReply(&buffer[..nop_len])); return Ok(ReceiveResult::OkSendReply(&buffer[..nop_len]));
} }
} else {
return Err(Error::Unexpected);
} }
} else {
return Err(Error::Unexpected);
} }
// Just ignore counter-offers that are out of place. They probably indicate that this side
// restarted and needs to establish a new session.
return Ok(ReceiveResult::Ignored);
} }
_ => return Err(Error::InvalidPacket), _ => return Err(Error::InvalidPacket),