gitea-mirror/rosenpass
1
0
Fork 0
mirror of https://github.com/rosenpass/rosenpass.git synced 2026-02-04 11:07:46 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Failing tests

Browse Source
This commit is contained in:
Karolin Varner
2024-03-12 22:34:31 -04:00
parent 4d482aaab7
commit cd23e9a2d0
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rosenpass/src/msgs.rs
View File

@@ -119,10 +119,8 @@ pub struct CookieReplyInner {
pub reserved: [u8; 3],
/// Session ID of the sender (initiator)
pub sid: [u8; 4],
/// Nonce
pub nonce: [u8; xaead::NONCE_LEN],
/// Encrypted cookie with authenticated initiator `mac`
pub cookie_encrypted: [u8; MAC_SIZE + xaead::TAG_LEN],
pub cookie_encrypted: [u8; xaead::NONCE_LEN + COOKIE_SIZE + xaead::TAG_LEN],
}
#[repr(packed)]

8
rosenpass/src/protocol.rs
View File

@@ -917,7 +917,7 @@ impl CryptoServer {
tx_buf: &mut [u8],
host_identification: &[u8],
) -> Result<HandleMsgResult> {
let mut active_cookie_value: Option<[u8; 16]> = None;
let mut active_cookie_value: Option<[u8; COOKIE_SIZE]> = None;
let mut rx_cookie = [0u8; COOKIE_SIZE];
let mut rx_mac = [0u8; MAC_SIZE];
let mut rx_sid = [0u8; 4];
@@ -975,10 +975,9 @@ impl CryptoServer {
msg_out.inner.msg_type = MsgType::CookieReply.into();
msg_out.inner.sid = rx_sid;
msg_out.inner.nonce = nonce.value;
xaead::encrypt(
&mut msg_out.inner.cookie_encrypted,
&mut msg_out.inner.cookie_encrypted[..],
&cookie_key,
&nonce.value,
&rx_mac,
@@ -1449,8 +1448,7 @@ impl IniHsPtr {
}
// Add cookie to retransmitted message
let mut envelope = Ref::<&mut [u8], Envelope<InitHello>>::new(tx_buf)
.ok_or(RosenpassError::BufferSizeMismatch)?;
let mut envelope = truncating_cast_into::<Envelope<InitHello>>(tx_buf)?;
envelope.seal_cookie(self.peer(), srv)?;
Ok(ih_tx_len)