From c0e1181cac515c6df9410f3b8e035b607a7efa55 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Tue, 6 Jul 2021 14:17:44 +0200 Subject: [PATCH] Rustfmt --- src/keypair.rs | 19 ++++++++++++------- src/opaque.rs | 6 ++++-- src/serialization/tests.rs | 7 +++++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/keypair.rs b/src/keypair.rs index ee4559f..b3c402c 100644 --- a/src/keypair.rs +++ b/src/keypair.rs @@ -35,7 +35,11 @@ pub trait SizedBytesExt: SizedBytes { impl SizedBytesExt for T where T: SizedBytes {} /// A Keypair trait with public-private verification -#[cfg_attr(feature = "serialize", derive(serde::Deserialize, serde::Serialize), serde(bound = ""))] +#[cfg_attr( + feature = "serialize", + derive(serde::Deserialize, serde::Serialize), + serde(bound = "") +)] pub struct KeyPair { pk: PublicKey, sk: PrivateKey, @@ -117,12 +121,11 @@ impl KeyPair { /// Obtains a KeyPair from a slice representing the private key pub fn from_private_key_slice(input: &[u8]) -> Result { - let sk = PrivateKey::new(Key::from_arr::(GenericArray::from_slice(input))?); + let sk = PrivateKey::new(Key::from_arr::(GenericArray::from_slice( + input, + ))?); let pk = Self::public_from_private(&sk); - Ok(Self { - pk, - sk, - }) + Ok(Self { pk, sk }) } #[cfg(test)] @@ -174,7 +177,9 @@ impl Key { } #[allow(clippy::unnecessary_wraps)] - fn from_arr>(key_bytes: &GenericArray) -> Result { + fn from_arr>( + key_bytes: &GenericArray, + ) -> Result { Ok(Key(key_bytes.to_vec())) } } diff --git a/src/opaque.rs b/src/opaque.rs index e277ba0..48c9f40 100644 --- a/src/opaque.rs +++ b/src/opaque.rs @@ -932,7 +932,8 @@ fn mask_response( server_s_pk: &PublicKey, envelope: &Envelope, ) -> Result, ProtocolError> { - let mut xor_pad = vec![0u8; as SizedBytes>::Len::to_usize() + Envelope::::len()]; + let mut xor_pad = + vec![0u8; as SizedBytes>::Len::to_usize() + Envelope::::len()]; Hkdf::::from_prk(masking_key) .map_err(|_| InternalPakeError::HkdfError)? .expand( @@ -955,7 +956,8 @@ fn unmask_response( masking_nonce: &[u8], masked_response: &[u8], ) -> Result<(PublicKey, Envelope), ProtocolError> { - let mut xor_pad = vec![0u8; as SizedBytes>::Len::to_usize() + Envelope::::len()]; + let mut xor_pad = + vec![0u8; as SizedBytes>::Len::to_usize() + Envelope::::len()]; Hkdf::::from_prk(masking_key) .map_err(|_| InternalPakeError::HkdfError)? .expand( diff --git a/src/serialization/tests.rs b/src/serialization/tests.rs index 8a3aec6..202dcf7 100644 --- a/src/serialization/tests.rs +++ b/src/serialization/tests.rs @@ -211,8 +211,11 @@ fn credential_response_roundtrip() { let mut masking_nonce = vec![0u8; 32]; rng.fill_bytes(&mut masking_nonce); - let mut masked_response = - vec![0u8; as SizedBytes>::Len::to_usize() + Envelope::::len()]; + let mut masked_response = vec![ + 0u8; + as SizedBytes>::Len::to_usize() + + Envelope::::len() + ]; rng.fill_bytes(&mut masked_response); let server_e_kp = KeyPair::<::Group>::generate_random(&mut rng);