Curve25519 test vectors

src/envelope.rs

@@ -342,7 +342,7 @@ where
         .map_err(|_| InternalError::HkdfError)?;
     let client_static_keypair = KeyPair::<CS::KeGroup>::from_private_key_slice(
         &CS::KeGroup::serialize_sk(CS::KeGroup::derive_auth_keypair::<CS::OprfCs>(
-            keypair_seed.as_slice(),
+            keypair_seed,
             &GenericArray::from(STR_OPAQUE_DERIVE_AUTH_KEY_PAIR),
         )?),
     )?;
@@ -368,7 +368,7 @@ where
         .map_err(|_| InternalError::HkdfError)?;
     let client_static_keypair = KeyPair::<CS::KeGroup>::from_private_key_slice(
         &CS::KeGroup::serialize_sk(CS::KeGroup::derive_auth_keypair::<CS::OprfCs>(
-            keypair_seed.as_slice(),
+            keypair_seed,
             &GenericArray::from(STR_OPAQUE_DERIVE_AUTH_KEY_PAIR),
         )?),
     )?;

src/key_exchange/group/curve25519.rs

@@ -12,9 +12,8 @@ use curve25519_dalek::montgomery::MontgomeryPoint;
 use curve25519_dalek::scalar::Scalar;
 use curve25519_dalek::traits::Identity;
 use digest::core_api::BlockSizeUser;
-use digest::{FixedOutput, HashMarker};
-use elliptic_curve::hash2curve::{ExpandMsg, ExpandMsgXmd, Expander};
-use generic_array::typenum::{IsLess, IsLessOrEqual, U256, U32, U64};
+use digest::{FixedOutput, HashMarker, OutputSizeUser};
+use generic_array::typenum::{IsLess, IsLessOrEqual, U256, U32};
 use generic_array::GenericArray;
 use rand::{CryptoRng, RngCore};
 use subtle::ConstantTimeEq;
@@ -58,26 +57,23 @@ impl KeGroup for Curve25519 {
         }
     }
 
-    // Implements the `HashToScalar()` function from
-    // <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-19.html#section-4>
-    fn hash_to_scalar<'a, H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Sk, InternalError>
+    fn hash_to_scalar<'a, H>(_input: &[&[u8]], _dst: &[&[u8]]) -> Result<Self::Sk, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
         H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>,
     {
-        let mut uniform_bytes = GenericArray::<_, U64>::default();
-        ExpandMsgXmd::<H>::expand_message(input, dst, 64)
-            .map_err(|_| InternalError::HashToScalar)?
-            .fill_bytes(&mut uniform_bytes);
-
-        let scalar = Scalar::from_bytes_mod_order_wide(&uniform_bytes.into());
-        let scalar = Scalar::from_bits_clamped(scalar.to_bytes());
-
-        if scalar == Scalar::ZERO {
-            Err(InternalError::HashToScalar)
-        } else {
-            Ok(scalar)
-        }
+        unimplemented!()
+    }
+
+    fn derive_auth_keypair<CS: voprf::CipherSuite>(
+        seed: GenericArray<u8, Self::SkLen>,
+        _info: &[u8],
+    ) -> Result<Self::Sk, InternalError>
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        Ok(Scalar::from_bits_clamped(seed.into()))
     }
 
     fn is_zero_scalar(scalar: Self::Sk) -> subtle::Choice {

src/key_exchange/group/mod.rs

@@ -60,7 +60,7 @@ pub trait KeGroup {
     /// ensure that the KeGroup is used for the hash_to_scalar operation (as
     /// opposed to the OprfGroup).
     fn derive_auth_keypair<CS: voprf::CipherSuite>(
-        seed: &[u8],
+        seed: GenericArray<u8, Self::SkLen>,
         info: &[u8],
     ) -> Result<Self::Sk, InternalError>
     where
@@ -81,7 +81,7 @@ pub trait KeGroup {
             // skS = G.HashToScalar(deriveInput || I2OSP(counter, 1), DST = "DeriveKeyPair"
             // || contextString)
             let sk_s = Self::hash_to_scalar::<CS::Hash>(
-                &[seed, &info_len, info, &counter.to_be_bytes()],
+                &[&seed, &info_len, info, &counter.to_be_bytes()],
                 &[&dst_1, dst_2],
             )
             .map_err(|_| InternalError::OprfError(voprf::Error::DeriveKeyPair))?;