2gW94/rosenpass
1
0
Fork 0
mirror of https://github.com/rosenpass/rosenpass.git synced 2025-12-18 13:24:38 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Cargo fmt

Browse Source
This commit is contained in:
Prabhpreet Dua
2023-12-02 19:38:10 +05:30
parent f0dbe2bb54
commit 2904c90d4b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rosenpass/src/protocol.rs
View File

@@ -81,9 +81,8 @@ use std::collections::hash_map::{
Entry::{Occupied, Vacant}, Entry::{Occupied, Vacant},
HashMap, HashMap,
}; };
use std::net::{IpAddr, SocketAddr};
use std::convert::Infallible; use std::convert::Infallible;
use std::net::{IpAddr, SocketAddr};
// CONSTANTS & SETTINGS ////////////////////////// // CONSTANTS & SETTINGS //////////////////////////
@@ -909,10 +908,10 @@ impl CryptoServer {
}; };
let cookie_tau = hash_domains::cookie_tau()? let cookie_tau = hash_domains::cookie_tau()?
.mix(self.cookie_secret.get_or_update_ellapsed( .mix(
COOKIE_SECRET_EXP, self.cookie_secret
Secret::randomize, .get_or_update_ellapsed(COOKIE_SECRET_EXP, Secret::randomize),
))? )?
.mix(&ip_addr_port)? .mix(&ip_addr_port)?
.into_value()[..16] .into_value()[..16]
.to_vec(); .to_vec();
@@ -931,7 +930,9 @@ impl CryptoServer {
//Otherwise send cookie reply //Otherwise send cookie reply
else { else {
let mut msg_out = tx_buf.envelope_truncating::<CookieReply<&mut [u8]>>()?; let mut msg_out = tx_buf.envelope_truncating::<CookieReply<&mut [u8]>>()?;
let cookie_key = hash_domains::cookie_key()?.mix(self.spkm.secret())?.into_value(); let cookie_key = hash_domains::cookie_key()?
.mix(self.spkm.secret())?
.into_value();
let mut cookie_reply_lens = msg_out.payload_mut().cookie_reply()?; let mut cookie_reply_lens = msg_out.payload_mut().cookie_reply()?;
let nonce_val = XAEADNonce::random(); let nonce_val = XAEADNonce::random();
@@ -1432,7 +1433,9 @@ where
/// Calculate and append the cookie value if `cookie_tau` exists (`cookie`) /// Calculate and append the cookie value if `cookie_tau` exists (`cookie`)
pub fn seal_cookie(&mut self, peer: PeerPtr, srv: &CryptoServer) -> Result<()> { pub fn seal_cookie(&mut self, peer: PeerPtr, srv: &CryptoServer) -> Result<()> {
if let Some(cookie_tau) = peer.get(srv).cookie_tau.get(PEER_COOKIE_TAU_EXP) { if let Some(cookie_tau) = peer.get(srv).cookie_tau.get(PEER_COOKIE_TAU_EXP) {
let cookie = hash_domains::cookie()?.mix(cookie_tau)?.mix(self.until_cookie())?; let cookie = hash_domains::cookie()?
.mix(cookie_tau)?
.mix(self.until_cookie())?;
self.cookie_mut() self.cookie_mut()
.copy_from_slice(cookie.into_value()[..16].as_ref()); .copy_from_slice(cookie.into_value()[..16].as_ref());
} }