diff --git a/server/src/main.rs b/server/src/main.rs index 1e854ea..febd965 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -615,7 +615,7 @@ fn get_session( .ok_or(ServerError::Unauthorized)?; let pubkey = pubkey.to_str().map_err(|_| ServerError::Unauthorized)?; let pubkey = Key::from_base64(pubkey).map_err(|_| ServerError::Unauthorized)?; - if pubkey.0.ct_eq(&context.public_key.0).into() { + if pubkey.ct_eq(&context.public_key).into() { let peer = DatabasePeer::get_from_ip(&context.db.lock(), addr).map_err(|e| match e { rusqlite::Error::QueryReturnedNoRows => ServerError::Unauthorized, e => ServerError::Database(e), diff --git a/wgctrl-rs/src/backends/kernel.rs b/wgctrl-rs/src/backends/kernel.rs index 740961c..9258bb4 100644 --- a/wgctrl-rs/src/backends/kernel.rs +++ b/wgctrl-rs/src/backends/kernel.rs @@ -418,7 +418,7 @@ pub fn delete_interface(iface: &InterfaceName) -> io::Result<()> { /// `Key`s, especially ones created from external data. #[cfg(target_os = "linux")] #[derive(PartialEq, Eq, Clone)] -pub struct Key(pub wgctrl_sys::wg_key); +pub struct Key(wgctrl_sys::wg_key); #[cfg(target_os = "linux")] impl Key { diff --git a/wgctrl-rs/src/backends/userspace.rs b/wgctrl-rs/src/backends/userspace.rs index f617938..fa4d254 100644 --- a/wgctrl-rs/src/backends/userspace.rs +++ b/wgctrl-rs/src/backends/userspace.rs @@ -1,4 +1,5 @@ use curve25519_dalek::scalar::Scalar; +use subtle::ConstantTimeEq; use crate::{Backend, Device, DeviceUpdate, InterfaceName, PeerConfig, PeerInfo, PeerStats}; @@ -392,7 +393,13 @@ pub fn apply(builder: &DeviceUpdate, iface: &InterfaceName) -> io::Result<()> { /// `Key`s, especially ones created from external data. #[cfg(not(target_os = "linux"))] #[derive(PartialEq, Eq, Clone)] -pub struct Key(pub [u8; 32]); +pub struct Key([u8; 32]); + +impl ConstantTimeEq for Key { + fn ct_eq(&self, other: &Self) -> subtle::Choice { + self.0.ct_eq(&other.0).into() + } +} #[cfg(not(target_os = "linux"))] impl Key { @@ -436,9 +443,7 @@ impl Key { /// Checks if this key is all-zero. pub fn is_zero(&self) -> bool { - use subtle::ConstantTimeEq; - - self.0.ct_eq(&[0u8; 32]).into() + self.ct_eq(&Self::zero()).into() } /// Converts the key to a standardized base64 representation, as used by the `wg` utility and `wg-quick`.