Update VoprfParameters (#1196)

Companion PR to RustCrypto/traits#1814

Author: daxpedda

Cargo.lock

@@ -56,7 +56,7 @@ pkcs8 = ["ecdsa-core?/pkcs8", "elliptic-curve/pkcs8"]
 serde = ["ecdsa-core?/serde", "elliptic-curve/serde", "primeorder?/serde", "serdect"]
 sha256 = ["digest", "sha2"]
 test-vectors = ["dep:hex-literal"]
-voprf = ["elliptic-curve/voprf", "sha2"]
+voprf = ["hash2curve", "elliptic-curve/voprf", "sha2"]
 
 [package.metadata.docs.rs]
 all-features = true

p256/Cargo.toml

@@ -173,9 +173,16 @@ pub type ScalarBits = elliptic_curve::scalar::ScalarBits<NistP256>;
 
 #[cfg(feature = "voprf")]
 impl elliptic_curve::VoprfParameters for NistP256 {
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-19.html#section-4.3>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.3-1>.
     const ID: &'static str = "P256-SHA256";
 
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-08.html#section-4.3-1.2>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.3-2.4>.
     type Hash = sha2::Sha256;
+
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.3-2.2.2.10>
+    /// and <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.3-2.2.2.12>.
+    type ExpandMsg = elliptic_curve::hash2curve::ExpandMsgXmd<
+        sha2::Sha256,
+        <Self as elliptic_curve::hash2curve::GroupDigest>::K,
+    >;
 }

p256/src/lib.rs

@@ -60,7 +60,7 @@ pkcs8 = ["ecdsa-core/pkcs8", "elliptic-curve/pkcs8"]
 serde = ["ecdsa-core?/serde", "elliptic-curve/serde", "primeorder?/serde", "serdect"]
 sha384 = ["digest", "sha2"]
 test-vectors = ["hex-literal"]
-voprf = ["elliptic-curve/voprf", "sha2"]
+voprf = ["hash2curve", "elliptic-curve/voprf", "sha2"]
 
 [package.metadata.docs.rs]
 all-features = true

p384/Cargo.toml

@@ -126,9 +126,16 @@ pub type ScalarBits = elliptic_curve::scalar::ScalarBits<NistP384>;
 
 #[cfg(feature = "voprf")]
 impl elliptic_curve::VoprfParameters for NistP384 {
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-19.html#name-oprfp-384-sha-384-2>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.4-1>.
     const ID: &'static str = "P384-SHA384";
 
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-08.html#section-4.4-1.2>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.4-2.4>.
     type Hash = sha2::Sha384;
+
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.4-2.2.2.10>
+    /// and <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.4-2.2.2.12>.
+    type ExpandMsg = elliptic_curve::hash2curve::ExpandMsgXmd<
+        sha2::Sha384,
+        <Self as elliptic_curve::hash2curve::GroupDigest>::K,
+    >;
 }

p384/src/lib.rs

@@ -56,7 +56,7 @@ pkcs8 = ["ecdsa-core?/pkcs8", "elliptic-curve/pkcs8"]
 serde = ["ecdsa-core?/serde", "elliptic-curve/serde", "primeorder?/serde", "serdect"]
 sha512 = ["digest", "dep:sha2"]
 test-vectors = ["dep:hex-literal"]
-voprf = ["elliptic-curve/voprf", "dep:sha2"]
+voprf = ["hash2curve", "elliptic-curve/voprf", "dep:sha2"]
 
 [package.metadata.docs.rs]
 all-features = true

p521/Cargo.toml

@@ -116,9 +116,16 @@ pub type SecretKey = elliptic_curve::SecretKey<NistP521>;
 
 #[cfg(feature = "voprf")]
 impl elliptic_curve::VoprfParameters for NistP521 {
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-19.html#section-4.5-1>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.5-1>.
     const ID: &'static str = "P521-SHA512";
 
-    /// See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-08.html#section-4.5-1.2>.
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.5-2.4>.
     type Hash = sha2::Sha512;
+
+    /// See <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.5-2.2.2.10>
+    /// and <https://www.rfc-editor.org/rfc/rfc9497.html#section-4.5-2.2.2.12>.
+    type ExpandMsg = elliptic_curve::hash2curve::ExpandMsgXmd<
+        sha2::Sha512,
+        <Self as elliptic_curve::hash2curve::GroupDigest>::K,
+    >;
 }