diff options
author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-11-15 15:32:36 +0100 |
---|---|---|
committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-11-15 15:32:36 +0100 |
commit | 05710c455f1c759cf9bc1a1eaa6307fe564f15cc (patch) | |
tree | c671d703d0db93a9bc8f27d0e2b02d0422120352 /src/wireguard/handshake | |
parent | Initial version of full UAPI parser (diff) | |
download | wireguard-rs-05710c455f1c759cf9bc1a1eaa6307fe564f15cc.tar.xz wireguard-rs-05710c455f1c759cf9bc1a1eaa6307fe564f15cc.zip |
Update UAPI semantics for remove
Diffstat (limited to 'src/wireguard/handshake')
-rw-r--r-- | src/wireguard/handshake/device.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/wireguard/handshake/device.rs b/src/wireguard/handshake/device.rs index f65692c..02e6929 100644 --- a/src/wireguard/handshake/device.rs +++ b/src/wireguard/handshake/device.rs @@ -178,13 +178,10 @@ impl Device { /// # Returns /// /// The call might fail if the public key is not found - pub fn set_psk(&mut self, pk: PublicKey, psk: Option<Psk>) -> Result<(), ConfigError> { + pub fn set_psk(&mut self, pk: PublicKey, psk: Psk) -> Result<(), ConfigError> { match self.pk_map.get_mut(pk.as_bytes()) { Some(mut peer) => { - peer.psk = match psk { - Some(v) => v, - None => [0u8; 32], - }; + peer.psk = psk; Ok(()) } _ => Err(ConfigError::new("No such public key")), @@ -466,8 +463,8 @@ mod tests { dev1.add(pk2).unwrap(); dev2.add(pk1).unwrap(); - dev1.set_psk(pk2, Some(psk)).unwrap(); - dev2.set_psk(pk1, Some(psk)).unwrap(); + dev1.set_psk(pk2, psk).unwrap(); + dev2.set_psk(pk1, psk).unwrap(); (pk1, dev1, pk2, dev2) } |