vexahub/opaque-vx
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases 3 Activity

Rustfmt

Browse Source
This commit is contained in:
daxpedda
2021-07-08 18:55:53 -07:00
committed by Kevin Lewi
parent 2d9b1d550e
commit c0e1181cac
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/keypair.rs
+12 -7
View File
@@ -35,7 +35,11 @@ pub trait SizedBytesExt: SizedBytes {
impl<T> SizedBytesExt for T where T: SizedBytes {} impl<T> SizedBytesExt for T where T: SizedBytes {}
/// A Keypair trait with public-private verification /// 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> { pub struct KeyPair<G> {
pk: PublicKey<G>, pk: PublicKey<G>,
sk: PrivateKey<G>, sk: PrivateKey<G>,
@@ -117,12 +121,11 @@ impl<G: Group> KeyPair<G> {
/// Obtains a KeyPair from a slice representing the private key /// Obtains a KeyPair from a slice representing the private key
pub fn from_private_key_slice(input: &[u8]) -> Result<Self, InternalPakeError> { 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); let pk = Self::public_from_private(&sk);
Ok(Self { Ok(Self { pk, sk })
pk,
sk,
})
} }
#[cfg(test)] #[cfg(test)]
@@ -174,7 +177,9 @@ impl Key {
} }
#[allow(clippy::unnecessary_wraps)] #[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())) Ok(Key(key_bytes.to_vec()))
} }
} }
src/opaque.rs
+4 -2
View File
@@ -932,7 +932,8 @@ fn mask_response<CS: CipherSuite>(
server_s_pk: &PublicKey<CS::Group>, server_s_pk: &PublicKey<CS::Group>,
envelope: &Envelope<CS>, envelope: &Envelope<CS>,
) -> Result<Vec<u8>, ProtocolError> { ) -> 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) Hkdf::<CS::Hash>::from_prk(masking_key)
.map_err(|_| InternalPakeError::HkdfError)? .map_err(|_| InternalPakeError::HkdfError)?
.expand( .expand(
@@ -955,7 +956,8 @@ fn unmask_response<CS: CipherSuite>(
masking_nonce: &[u8], masking_nonce: &[u8],
masked_response: &[u8], masked_response: &[u8],
) -> Result<(PublicKey<CS::Group>, Envelope<CS>), ProtocolError> { ) -> 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) Hkdf::<CS::Hash>::from_prk(masking_key)
.map_err(|_| InternalPakeError::HkdfError)? .map_err(|_| InternalPakeError::HkdfError)?
.expand( .expand(
src/serialization/tests.rs
+5 -2
View File
@@ -211,8 +211,11 @@ fn credential_response_roundtrip() {
let mut masking_nonce = vec![0u8; 32]; let mut masking_nonce = vec![0u8; 32];
rng.fill_bytes(&mut masking_nonce); rng.fill_bytes(&mut masking_nonce);
let mut masked_response = let mut masked_response = vec![
vec![0u8; <PublicKey<RistrettoPoint> as SizedBytes>::Len::to_usize() + Envelope::<Default>::len()]; 0u8;
<PublicKey<RistrettoPoint> as SizedBytes>::Len::to_usize()
+ Envelope::<Default>::len()
];
rng.fill_bytes(&mut masked_response); rng.fill_bytes(&mut masked_response);
let server_e_kp = KeyPair::<<Default as CipherSuite>::Group>::generate_random(&mut rng); let server_e_kp = KeyPair::<<Default as CipherSuite>::Group>::generate_random(&mut rng);