From 1eaedabe6a65abb67844c3da3be8bcdb0939159e Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Mon, 18 Dec 2017 23:13:59 -0800 Subject: format everything with rustfmt --- src/lib.rs | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 7a7bdbd..4737738 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,8 @@ - -extern crate rand; extern crate curve25519_dalek; -extern crate sha2; extern crate hkdf; extern crate num_bigint; +extern crate rand; +extern crate sha2; //extern crate hex; @@ -15,14 +14,12 @@ extern crate hex; #[cfg(test)] mod tests { - use spake2::{SPAKE2, SPAKEErr, Ed25519Group, ErrorType}; + use spake2::{Ed25519Group, ErrorType, SPAKE2, SPAKEErr}; #[test] fn test_basic() { - let (s1, msg1) = SPAKE2::::start_a(b"password", - b"idA", b"idB"); - let (s2, msg2) = SPAKE2::::start_b(b"password", - b"idA", b"idB"); + let (s1, msg1) = SPAKE2::::start_a(b"password", b"idA", b"idB"); + let (s2, msg2) = SPAKE2::::start_b(b"password", b"idA", b"idB"); let key1 = s1.finish(msg2.as_slice()).unwrap(); let key2 = s2.finish(msg1.as_slice()).unwrap(); assert_eq!(key1, key2); @@ -30,10 +27,8 @@ mod tests { #[test] fn test_mismatch() { - let (s1, msg1) = SPAKE2::::start_a(b"password", - b"idA", b"idB"); - let (s2, msg2) = SPAKE2::::start_b(b"password2", - b"idA", b"idB"); + let (s1, msg1) = SPAKE2::::start_a(b"password", b"idA", b"idB"); + let (s2, msg2) = SPAKE2::::start_b(b"password2", b"idA", b"idB"); let key1 = s1.finish(msg2.as_slice()).unwrap(); let key2 = s2.finish(msg1.as_slice()).unwrap(); assert_ne!(key1, key2); @@ -41,37 +36,41 @@ mod tests { #[test] fn test_reflected_message() { - let (s1, msg1) = SPAKE2::::start_a(b"password", - b"idA", b"idB"); + let (s1, msg1) = SPAKE2::::start_a(b"password", b"idA", b"idB"); let r = s1.finish(msg1.as_slice()); - assert_eq!(r.unwrap_err(), SPAKEErr{kind: ErrorType::BadSide}); + assert_eq!( + r.unwrap_err(), + SPAKEErr { + kind: ErrorType::BadSide, + } + ); } #[test] fn test_bad_length() { - let (s1, msg1) = SPAKE2::::start_a(b"password", - b"idA", b"idB"); - let mut msg2 = Vec::::with_capacity(msg1.len()+1); - msg2.resize(msg1.len()+1, 0u8); + let (s1, msg1) = SPAKE2::::start_a(b"password", b"idA", b"idB"); + let mut msg2 = Vec::::with_capacity(msg1.len() + 1); + msg2.resize(msg1.len() + 1, 0u8); let r = s1.finish(&msg2); - assert_eq!(r.unwrap_err(), SPAKEErr{kind: ErrorType::WrongLength}); + assert_eq!( + r.unwrap_err(), + SPAKEErr { + kind: ErrorType::WrongLength, + } + ); } #[test] fn test_basic_symmetric() { - let (s1, msg1) = SPAKE2::::start_symmetric(b"password", - b"idS"); - let (s2, msg2) = SPAKE2::::start_symmetric(b"password", - b"idS"); + let (s1, msg1) = SPAKE2::::start_symmetric(b"password", b"idS"); + let (s2, msg2) = SPAKE2::::start_symmetric(b"password", b"idS"); let key1 = s1.finish(msg2.as_slice()).unwrap(); let key2 = s2.finish(msg1.as_slice()).unwrap(); assert_eq!(key1, key2); } - #[test] - fn it_works() { - } + fn it_works() {} #[test] #[should_panic(expected = "nope")] -- cgit v1.2.3