Rustfmt
This commit is contained in:
+12
-7
@@ -35,7 +35,11 @@ pub trait SizedBytesExt: SizedBytes {
|
||||
impl<T> 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<G> {
|
||||
pk: PublicKey<G>,
|
||||
sk: PrivateKey<G>,
|
||||
@@ -117,12 +121,11 @@ impl<G: Group> KeyPair<G> {
|
||||
|
||||
/// Obtains a KeyPair from a slice representing the private key
|
||||
pub fn from_private_key_slice(input: &[u8]) -> Result<Self, InternalPakeError> {
|
||||
let sk = PrivateKey::new(Key::from_arr::<G::ScalarLen>(GenericArray::from_slice(input))?);
|
||||
let sk = PrivateKey::new(Key::from_arr::<G::ScalarLen>(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<L: ArrayLength<u8>>(key_bytes: &GenericArray<u8, L>) -> Result<Self, TryFromSizedBytesError> {
|
||||
fn from_arr<L: ArrayLength<u8>>(
|
||||
key_bytes: &GenericArray<u8, L>,
|
||||
) -> Result<Self, TryFromSizedBytesError> {
|
||||
Ok(Key(key_bytes.to_vec()))
|
||||
}
|
||||
}
|
||||
|
||||
+4
-2
@@ -932,7 +932,8 @@ fn mask_response<CS: CipherSuite>(
|
||||
server_s_pk: &PublicKey<CS::Group>,
|
||||
envelope: &Envelope<CS>,
|
||||
) -> Result<Vec<u8>, ProtocolError> {
|
||||
let mut xor_pad = vec![0u8; <PublicKey<CS::Group> as SizedBytes>::Len::to_usize() + Envelope::<CS>::len()];
|
||||
let mut xor_pad =
|
||||
vec![0u8; <PublicKey<CS::Group> as SizedBytes>::Len::to_usize() + Envelope::<CS>::len()];
|
||||
Hkdf::<CS::Hash>::from_prk(masking_key)
|
||||
.map_err(|_| InternalPakeError::HkdfError)?
|
||||
.expand(
|
||||
@@ -955,7 +956,8 @@ fn unmask_response<CS: CipherSuite>(
|
||||
masking_nonce: &[u8],
|
||||
masked_response: &[u8],
|
||||
) -> Result<(PublicKey<CS::Group>, Envelope<CS>), ProtocolError> {
|
||||
let mut xor_pad = vec![0u8; <PublicKey<CS::Group> as SizedBytes>::Len::to_usize() + Envelope::<CS>::len()];
|
||||
let mut xor_pad =
|
||||
vec![0u8; <PublicKey<CS::Group> as SizedBytes>::Len::to_usize() + Envelope::<CS>::len()];
|
||||
Hkdf::<CS::Hash>::from_prk(masking_key)
|
||||
.map_err(|_| InternalPakeError::HkdfError)?
|
||||
.expand(
|
||||
|
||||
@@ -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; <PublicKey<RistrettoPoint> as SizedBytes>::Len::to_usize() + Envelope::<Default>::len()];
|
||||
let mut masked_response = vec![
|
||||
0u8;
|
||||
<PublicKey<RistrettoPoint> as SizedBytes>::Len::to_usize()
|
||||
+ Envelope::<Default>::len()
|
||||
];
|
||||
rng.fill_bytes(&mut masked_response);
|
||||
|
||||
let server_e_kp = KeyPair::<<Default as CipherSuite>::Group>::generate_random(&mut rng);
|
||||
|
||||
Reference in New Issue
Block a user