Generic PublicKey and PrivateKey
This commit is contained in:
+4
-4
@@ -32,9 +32,9 @@ const NONCE_LEN: usize = 32;
|
||||
fn build_inner_envelope_internal<CS: CipherSuite>(
|
||||
random_pwd: &[u8],
|
||||
nonce: &[u8],
|
||||
) -> Result<PublicKey, InternalPakeError> {
|
||||
) -> Result<PublicKey<CS::Group>, InternalPakeError> {
|
||||
let h = Hkdf::<CS::Hash>::new(None, random_pwd);
|
||||
let mut keypair_seed = vec![0u8; <PrivateKey as SizedBytes>::Len::to_usize()];
|
||||
let mut keypair_seed = vec![0u8; <PrivateKey<CS::Group> as SizedBytes>::Len::to_usize()];
|
||||
h.expand(&[nonce, STR_PRIVATE_KEY].concat(), &mut keypair_seed)
|
||||
.map_err(|_| InternalPakeError::HkdfError)?;
|
||||
let client_static_keypair =
|
||||
@@ -50,7 +50,7 @@ fn recover_keys_internal<CS: CipherSuite>(
|
||||
nonce: &[u8],
|
||||
) -> Result<KeyPair<CS::Group>, InternalPakeError> {
|
||||
let h = Hkdf::<CS::Hash>::new(None, random_pwd);
|
||||
let mut keypair_seed = vec![0u8; <PrivateKey as SizedBytes>::Len::to_usize()];
|
||||
let mut keypair_seed = vec![0u8; <PrivateKey<CS::Group> as SizedBytes>::Len::to_usize()];
|
||||
h.expand(&[nonce, STR_PRIVATE_KEY].concat(), &mut keypair_seed)
|
||||
.map_err(|_| InternalPakeError::HkdfError)?;
|
||||
let client_static_keypair =
|
||||
@@ -185,7 +185,7 @@ impl<CS: CipherSuite> Envelope<CS> {
|
||||
) -> Result<
|
||||
(
|
||||
Self,
|
||||
PublicKey,
|
||||
PublicKey<CS::Group>,
|
||||
GenericArray<u8, <CS::Hash as Digest>::OutputSize>,
|
||||
),
|
||||
InternalPakeError,
|
||||
|
||||
Reference in New Issue
Block a user