From f21c2d9928f9ee352fa53f5105658bf1161f7b9a Mon Sep 17 00:00:00 2001 From: librelois <elois@ifee.fr> Date: Sun, 28 Apr 2019 15:51:45 +0200 Subject: [PATCH] [feat] ws2pv2: not hash signed messages --- lib/modules/ws2p/ws2p-messages/lib.rs | 6 ------ lib/modules/ws2p/ws2p-messages/v2/mod.rs | 8 +------- .../ws2p/ws2p/src/controllers/incoming_connections/mod.rs | 6 +++--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/modules/ws2p/ws2p-messages/lib.rs b/lib/modules/ws2p/ws2p-messages/lib.rs index be4a90c5..f261867c 100644 --- a/lib/modules/ws2p/ws2p-messages/lib.rs +++ b/lib/modules/ws2p/ws2p-messages/lib.rs @@ -66,12 +66,6 @@ impl From<bincode::Error> for WS2PMessageError { } impl WS2PMessage { - /// Verify signature validity - pub fn verify(&self) -> Result<(), SigError> { - match *self { - WS2PMessage::V2(ref msg_v2) => msg_v2.verify(), - } - } /// Get message hash pub fn hash(&self) -> Option<Hash> { match *self { diff --git a/lib/modules/ws2p/ws2p-messages/v2/mod.rs b/lib/modules/ws2p/ws2p-messages/v2/mod.rs index 3b424c6b..fc3f21d2 100644 --- a/lib/modules/ws2p/ws2p-messages/v2/mod.rs +++ b/lib/modules/ws2p/ws2p-messages/v2/mod.rs @@ -87,13 +87,7 @@ impl<'de> BinSignable<'de> for WS2Pv2Message { self.issuer_pubkey } fn store_hash(&self) -> bool { - true - } - fn hash(&self) -> Option<Hash> { - self.message_hash - } - fn set_hash(&mut self, hash: Hash) { - self.message_hash = Some(hash) + false } fn signature(&self) -> Option<Sig> { self.signature diff --git a/lib/modules/ws2p/ws2p/src/controllers/incoming_connections/mod.rs b/lib/modules/ws2p/ws2p/src/controllers/incoming_connections/mod.rs index f3c6bfd0..9aa34b78 100644 --- a/lib/modules/ws2p/ws2p/src/controllers/incoming_connections/mod.rs +++ b/lib/modules/ws2p/ws2p/src/controllers/incoming_connections/mod.rs @@ -64,7 +64,7 @@ mod tests { use std::thread; use std::time::Duration; - pub fn keypair1() -> ed25519::KeyPair { + pub fn _keypair1() -> ed25519::KeyPair { ed25519::KeyPairFromSaltedPasswordGenerator::with_default_parameters().generate( "JhxtHB7UcsDbA9wMSyMKXUzBZUQvqVyB32KwzS9SWoLkjrUhHV".as_bytes(), "JhxtHB7UcsDbA9wMSyMKXUzBZUQvqVyB32KwzS9SWoLkjrUhHV_".as_bytes(), @@ -72,7 +72,7 @@ mod tests { } //#[test] - fn listen_on_localhost() { + fn _listen_on_localhost() { // create service channel let (service_sender, _service_receiver): ( mpsc::Sender<Ws2pServiceSender>, @@ -85,7 +85,7 @@ mod tests { service_sender, MySelfWs2pNode { my_node_id: NodeId(1), - my_key_pair: KeyPairEnum::Ed25519(keypair1()), + my_key_pair: KeyPairEnum::Ed25519(_keypair1()), my_features: WS2PFeatures(vec![5u8]), }, "localhost", -- GitLab