From e88ed5d02da3687bb1315edeea853f8588bb445a Mon Sep 17 00:00:00 2001 From: Mathias Hall-Andersen Date: Fri, 23 Aug 2019 11:43:29 +0200 Subject: Allow DoS mitigation to take any endpoint impl. --- src/handshake/device.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/handshake/device.rs b/src/handshake/device.rs index 1c7a30d..d29c41b 100644 --- a/src/handshake/device.rs +++ b/src/handshake/device.rs @@ -197,12 +197,12 @@ where /// # Arguments /// /// * `msg` - Byte slice containing the message (untrusted input) - pub fn process( + pub fn process<'a, R: RngCore + CryptoRng, S>( &self, - rng: &mut R, - msg: &[u8], // message buffer - src: Option<&SocketAddr>, // optional source address, set when "under load" - ) -> Result, HandshakeError> { + rng: &mut R, // rng instance to sample randomness from + msg: &[u8], // message buffer + src: Option<&'a S>, // optional source endpoint, set when "under load" + ) -> Result, HandshakeError> where &'a S: Into<&'a SocketAddr> { match msg.get(0) { Some(&TYPE_INITIATION) => { // parse message @@ -213,6 +213,9 @@ where // address validation & DoS mitigation if let Some(src) = src { + // obtain ref to socket addr + let src = src.into(); + // check mac2 field if !self.macs.check_mac2(msg.noise.as_bytes(), src, &msg.macs) { let mut reply = Default::default(); @@ -269,6 +272,9 @@ where // address validation & DoS mitigation if let Some(src) = src { + // obtain ref to socket addr + let src = src.into(); + // check mac2 field if !self.macs.check_mac2(msg.noise.as_bytes(), src, &msg.macs) { let mut reply = Default::default(); -- cgit v1.2.3-59-g8ed1b