From 81e2b36d38f4f72734db3ac11efa624b2837d601 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 6 Apr 2018 15:24:15 -0600 Subject: [PATCH] Cleanup packet_verify --- src/ecdsa.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/ecdsa.rs b/src/ecdsa.rs index 64fc3658d..3b35cca1b 100644 --- a/src/ecdsa.rs +++ b/src/ecdsa.rs @@ -53,22 +53,17 @@ fn verify_packet(packet: &Packet) -> u8 { let pub_key_start = TX_OFFSET + PUB_KEY_OFFSET; let pub_key_end = pub_key_start + PUB_KEY_SIZE; - if packet.meta.size > msg_start { - let msg_end = packet.meta.size; - return if signature::verify( - &signature::ED25519, - untrusted::Input::from(&packet.data[pub_key_start..pub_key_end]), - untrusted::Input::from(&packet.data[msg_start..msg_end]), - untrusted::Input::from(&packet.data[sig_start..sig_end]), - ).is_ok() - { - 1 - } else { - 0 - }; - } else { + if packet.meta.size <= msg_start { return 0; } + + let msg_end = packet.meta.size; + signature::verify( + &signature::ED25519, + untrusted::Input::from(&packet.data[pub_key_start..pub_key_end]), + untrusted::Input::from(&packet.data[msg_start..msg_end]), + untrusted::Input::from(&packet.data[sig_start..sig_end]), + ).is_ok() as u8 } #[cfg(not(feature = "cuda"))]