Publishing 0.5.0-pre.3 (#107)

* Upgrade `p256` to v0.12

* Upgrade MSRV to 1.60

.cargo/license.rs

@@ -1,7 +1,6 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.

.github/workflows/main.yml

@@ -3,9 +3,8 @@ on:
   push:
     branches:
       - main
-      - v0.4
   pull_request:
-    types: [opened, reopened, synchronize]
+    types: [opened, repoened, synchronize]
 
 jobs:
   cargo-audit:
@@ -13,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache cargo-audit
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/.crates.toml
@@ -25,7 +24,7 @@ jobs:
         run: cargo install cargo-audit
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Run cargo audit
         run: cargo audit -D warnings
@@ -48,7 +47,7 @@ jobs:
     name: test
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install ${{ matrix.toolchain }} toolchain
         uses: actions-rs/toolchain@v1
@@ -100,8 +99,8 @@ jobs:
           - --features danger
           - --features serde
     steps:
-      - uses: actions/checkout@v4
-      - uses: hecrj/setup-rust-action@v2
+      - uses: actions/checkout@v3
+      - uses: hecrj/setup-rust-action@v1
       - run: rustup target add ${{ matrix.target }}
       - run: cargo build --verbose --target=${{ matrix.target }} --no-default-features ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }}
 
@@ -111,7 +110,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -141,7 +140,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1
@@ -162,7 +161,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/.crates.toml
@@ -171,10 +170,10 @@ jobs:
           key: taplo
 
       - name: Install Taplo
-        run: cargo install taplo-cli --locked
+        run: cargo install taplo-cli
 
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Run Taplo
         run: taplo fmt --check

.github/workflows/publish.yml

@@ -10,10 +10,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        rust: [stable]
 
     steps:
-    - uses: hecrj/setup-rust-action@v2
+    - uses: hecrj/setup-rust-action@v1
       with:
         rust-version: ${{ matrix.rust }}
     - uses: actions/checkout@master

.gitignore

@@ -8,7 +8,3 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
-
-# Editors
-.idea
-.vscode

CHANGELOG.md

@@ -1,9 +1,18 @@
 # Changelog
 
-## 0.4.1 (September 24, 2024)
-* Backport all non-protocol-breaking changes from versions 0.5+
-  * Fixes Rust 1.81+ compatibility, compatible with 0.4.0 (draft 11), incompatible with 0.5+ (final RFC)
-* Updated dependencies
+## 0.5.0-pre.3 (March 4, 2023)
+* Updated to be in sync with draft-irtf-cfrg-voprf-19
+* Increased MSRV to 1.65
+* Updated p256 dependency to v0.13
+* Added p384 tests
+
+## 0.5.0-pre.2 (February 3, 2023)
+* Increased MSRV to 1.60
+* Updated p256 dependency to v0.12
+* Updated curve25519-dalek dependency to 4.0.0-rc.1
+
+## 0.5.0-pre.1 (December 19, 2022)
+* Updated curve25519-dalek dependency to 4.0.0-pre.5
 
 ## 0.4.0 (September 15, 2022)
 * Updated to be in sync with draft-irtf-cfrg-voprf-11, with

CONTRIBUTING.md

@@ -27,5 +27,4 @@ outlined on that page and do not file a public issue.
 
 ## License
 By contributing to voprf, you agree that your contributions will be
-licensed under both the LICENSE-MIT and LICENSE-APACHE files in the root
-directory of this source tree.
+licensed under the LICENSE file in the root directory of this source tree.

Cargo.toml

@@ -9,7 +9,7 @@ name = "voprf"
 readme = "README.md"
 repository = "https://github.com/facebook/voprf/"
 rust-version = "1.65"
-version = "0.4.1"
+version = "0.5.0-pre.3"
 
 [features]
 alloc = []
@@ -21,7 +21,7 @@ serde = ["generic-array/serde", "dep:serde"]
 std = ["alloc"]
 
 [dependencies]
-curve25519-dalek = { version = "4", default-features = false, features = [
+curve25519-dalek = { version = "=4.0.0-rc.1", default-features = false, features = [
   "rand_core",
   "zeroize",
 ], optional = true }
@@ -39,8 +39,8 @@ serde = { version = "1", default-features = false, features = [
   "derive",
 ], optional = true }
 sha2 = { version = "0.10", default-features = false, optional = true }
-subtle = { version = "2.6", default-features = false }
-zeroize = { version = "1.8", default-features = false }
+subtle = { version = "2.3", default-features = false }
+zeroize = { version = "1.5", default-features = false }
 
 [dev-dependencies]
 generic-array = { version = "0.14", features = ["more_lengths"] }
@@ -53,10 +53,6 @@ p384 = { version = "0.13", default-features = false, features = [
   "hash2curve",
   "voprf",
 ] }
-p521 = { version = "0.13.3", default-features = false, features = [
-  "hash2curve",
-  "voprf",
-] }
 proptest = "1"
 rand = "0.8"
 regex = "1"

LICENSE

@@ -0,0 +1,12 @@
+## License
+
+Licensed under either of
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.

README.md

@@ -1,4 +1,4 @@
-# voprf ![Build Status](https://github.com/facebook/voprf/workflows/Rust%20CI/badge.svg)
+# voprf ![Build Status](https://github.com/novifinancial/voprf/workflows/Rust%20CI/badge.svg)
 An implementation of a (verifiable) oblivious pseudorandom function (VOPRF)
 
 A VOPRF is a verifiable oblivious pseudorandom function, a protocol between a client and a server. The regular (non-verifiable) OPRF is also supported in this implementation.
@@ -16,7 +16,7 @@ Installation
 Add the following line to the dependencies of your `Cargo.toml`:
 
 ```
-voprf = "0.4.1"
+voprf = "0.5.0-pre.3"
 ```
 
 ### Minimum Supported Rust Version
@@ -32,6 +32,4 @@ To learn more about contributing to this project, [see this document](./CONTRIBU
 License
 -------
 
-This project is dual-licensed under either the [MIT license](./LICENSE-MIT)
-or the [Apache License, Version 2.0](./LICENSE-APACHE).
-You may select, at your option, one of the above-listed licenses.
+This project is [licensed](./LICENSE) under either Apache 2.0 or MIT, at your option.

src/ciphersuite.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Defines the CipherSuite trait to specify the underlying primitives for VOPRF
 

src/common.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Common functionality between multiple OPRF modes.
 
@@ -35,7 +34,7 @@ pub(crate) const STR_DERIVE_KEYPAIR: [u8; 13] = *b"DeriveKeyPair";
 pub(crate) const STR_COMPOSITE: [u8; 9] = *b"Composite";
 pub(crate) const STR_CHALLENGE: [u8; 9] = *b"Challenge";
 pub(crate) const STR_INFO: [u8; 4] = *b"Info";
-pub(crate) const STR_VOPRF: [u8; 8] = *b"VOPRF10-";
+pub(crate) const STR_OPRF: [u8; 7] = *b"OPRFV1-";
 pub(crate) const STR_HASH_TO_SCALAR: [u8; 13] = *b"HashToScalar-";
 pub(crate) const STR_HASH_TO_GROUP: [u8; 12] = *b"HashToGroup-";
 
@@ -147,8 +146,8 @@ pub(crate) fn generate_proof<CS: CipherSuite, R: RngCore + CryptoRng>(
     k: <CS::Group as Group>::Scalar,
     a: <CS::Group as Group>::Elem,
     b: <CS::Group as Group>::Elem,
-    cs: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
-    ds: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
+    cs: impl Iterator<Item = <CS::Group as Group>::Elem> + ExactSizeIterator,
+    ds: impl Iterator<Item = <CS::Group as Group>::Elem> + ExactSizeIterator,
     mode: Mode,
 ) -> Result<Proof<CS>>
 where
@@ -209,8 +208,8 @@ where
 pub(crate) fn verify_proof<CS: CipherSuite>(
     a: <CS::Group as Group>::Elem,
     b: <CS::Group as Group>::Elem,
-    cs: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
-    ds: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
+    cs: impl Iterator<Item = <CS::Group as Group>::Elem> + ExactSizeIterator,
+    ds: impl Iterator<Item = <CS::Group as Group>::Elem> + ExactSizeIterator,
     proof: &Proof<CS>,
     mode: Mode,
 ) -> Result<()>
@@ -500,37 +499,29 @@ where
 
 pub(crate) struct Dst<L: ArrayLength<u8>> {
     dst_1: GenericArray<u8, L>,
-    dst_2: [u8; 2],
+    dst_2: &'static str,
 }
 
 impl<L: ArrayLength<u8>> Dst<L> {
-    pub(crate) fn new<CS: CipherSuite, T, TL>(par_1: T, mode: Mode) -> Self
+    pub(crate) fn new<CS: CipherSuite, T, TL: ArrayLength<u8>>(par_1: T, mode: Mode) -> Self
     where
         T: Into<GenericArray<u8, TL>>,
-        TL: ArrayLength<u8> + Add<U9, Output = L>,
+        TL: Add<U9, Output = L>,
         <CS::Hash as OutputSizeUser>::OutputSize:
             IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
     {
         let par_1 = par_1.into();
         // Generates the contextString parameter as defined in
         // <https://datatracker.ietf.org/doc/draft-irtf-cfrg-voprf/>
-        let par_2 = GenericArray::from(STR_VOPRF).concat([mode.to_u8()].into());
-
-        // See <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html#section-4.1>
-        let cs_id_u16: u16 = match CS::ID {
-            "ristretto255-SHA512" => 0x0001,
-            "decaf448-SHAKE256" => 0x0002,
-            "P256-SHA256" => 0x0003,
-            "P384-SHA384" => 0x0004,
-            "P521-SHA512" => 0x0005,
-            _ => panic!("Incompatible ciphersuite: {}", CS::ID),
-        };
+        let par_2 = GenericArray::from(STR_OPRF)
+            .concat([mode.to_u8()].into())
+            .concat([b'-'].into());
 
         let dst_1 = par_1.concat(par_2);
-        let dst_2 = cs_id_u16.to_be_bytes();
+        let dst_2 = CS::ID;
 
         assert!(
-            L::USIZE + 2 <= u16::MAX.into(),
+            L::USIZE + dst_2.len() <= u16::MAX.into(),
             "constructed DST longer then {}",
             u16::MAX
         );
@@ -539,11 +530,13 @@ impl<L: ArrayLength<u8>> Dst<L> {
     }
 
     pub(crate) fn as_dst(&self) -> [&[u8]; 2] {
-        [&self.dst_1, &self.dst_2]
+        [&self.dst_1, self.dst_2.as_bytes()]
     }
 
     pub(crate) fn i2osp_2(&self) -> [u8; 2] {
-        u16::try_from(L::USIZE + 2).unwrap().to_be_bytes()
+        u16::try_from(L::USIZE + self.dst_2.len())
+            .unwrap()
+            .to_be_bytes()
     }
 }
 

src/error.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Errors which are produced during an execution of the protocol
 

src/group/elliptic_curve.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 use digest::core_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker};

src/group/mod.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Defines the Group trait to specify the underlying prime order group
 

src/group/ristretto.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 use curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
 use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};

src/group/tests.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Includes a series of tests for the group implementations
 
@@ -17,7 +16,6 @@ use crate::{Error, Group, Result};
 fn test_group_properties() -> Result<()> {
     use p256::NistP256;
     use p384::NistP384;
-    use p521::NistP521;
 
     #[cfg(feature = "ristretto255")]
     {
@@ -33,9 +31,6 @@ fn test_group_properties() -> Result<()> {
     test_identity_element_error::<NistP384>()?;
     test_zero_scalar_error::<NistP384>()?;
 
-    test_identity_element_error::<NistP521>()?;
-    test_zero_scalar_error::<NistP521>()?;
-
     Ok(())
 }
 

src/lib.rs

@@ -1,15 +1,14 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! An implementation of a verifiable oblivious pseudorandom function (VOPRF)
 //!
 //! Note: This implementation is in sync with
-//! [draft-irtf-cfrg-voprf-11](https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html),
+//! [draft-irtf-cfrg-voprf-19](https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-19.html),
 //! but this specification is subject to change, until the final version
 //! published by the IETF.
 //!

src/oprf.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Contains the main OPRF API
 
@@ -427,7 +426,6 @@ mod tests {
     fn test_functionality() -> Result<()> {
         use p256::NistP256;
         use p384::NistP384;
-        use p521::NistP521;
 
         #[cfg(feature = "ristretto255")]
         {
@@ -455,13 +453,6 @@ mod tests {
         zeroize_oprf_client::<NistP384>();
         zeroize_oprf_server::<NistP384>();
 
-        base_retrieval::<NistP521>();
-        base_inversion_unsalted::<NistP521>();
-        server_evaluate::<NistP521>();
-
-        zeroize_oprf_client::<NistP521>();
-        zeroize_oprf_server::<NistP521>();
-
         Ok(())
     }
 }

src/poprf.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Contains the main POPRF API
 
@@ -720,7 +719,7 @@ where
     )?;
 
     Ok(blinds
-        .zip(messages)
+        .zip(messages.into_iter())
         .map(|(blind, x)| x.0 * &CS::Group::invert_scalar(blind)))
 }
 
@@ -967,7 +966,6 @@ mod tests {
     fn test_functionality() -> Result<()> {
         use p256::NistP256;
         use p384::NistP384;
-        use p521::NistP521;
 
         #[cfg(feature = "ristretto255")]
         {
@@ -995,13 +993,6 @@ mod tests {
         zeroize_verifiable_client::<NistP384>();
         zeroize_verifiable_server::<NistP384>();
 
-        verifiable_retrieval::<NistP521>();
-        verifiable_bad_public_key::<NistP521>();
-        verifiable_server_evaluate::<NistP521>();
-
-        zeroize_verifiable_client::<NistP521>();
-        zeroize_verifiable_server::<NistP521>();
-
         Ok(())
     }
 }

src/serialization.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Handles the serialization of each of the components used in the VOPRF
 //! protocol
@@ -307,11 +306,11 @@ fn deserialize_scalar<G: Group>(input: &mut &[u8]) -> Result<G::Scalar> {
 }
 
 trait SliceExt {
-    fn take_ext<'a>(self: &mut &'a Self, take: usize) -> Option<&'a Self>;
+    fn take_ext(self: &mut &Self, take: usize) -> Option<&Self>;
 }
 
 impl<T> SliceExt for [T] {
-    fn take_ext<'a>(self: &mut &'a Self, take: usize) -> Option<&'a Self> {
+    fn take_ext(self: &mut &Self, take: usize) -> Option<&Self> {
         if take > self.len() {
             return None;
         }
@@ -391,7 +390,6 @@ mod test {
 
             let _ = $item::<p256::NistP256>::deserialize(&$bytes[..]);
             let _ = $item::<p384::NistP384>::deserialize(&$bytes[..]);
-            let _ = $item::<p521::NistP521>::deserialize(&$bytes[..]);
         };
     }
 

src/tests/mock_rng.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 use alloc::vec::Vec;
 use core::cmp::min;

src/tests/mod.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 mod cfrg_vectors;
 mod mock_rng;

src/tests/parser.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
@@ -15,7 +14,7 @@ pub(crate) fn rfc_to_json(input: &str) -> String {
 }
 
 fn parse_ciphersuites(input: &str) -> String {
-    let re = regex::Regex::new(r"## OPRF\((?P<ciphersuite>.+?)\)").unwrap();
+    let re = regex::Regex::new(r"\n## (?P<ciphersuite>.+?)\n").unwrap();
     let mut ciphersuites = vec![];
 
     let chunks: Vec<&str> = re.split(input).collect();

src/tests/test_cfrg_vectors.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 use alloc::string::String;
 use alloc::vec;
@@ -89,7 +88,6 @@ macro_rules! json_to_test_vectors {
 fn test_vectors() -> Result<()> {
     use p256::NistP256;
     use p384::NistP384;
-    use p521::NistP521;
 
     let rfc: Value = serde_json::from_str(rfc_to_json(super::cfrg_vectors::VECTORS).as_str())
         .expect("Could not parse json");
@@ -100,7 +98,7 @@ fn test_vectors() -> Result<()> {
 
         let ristretto_oprf_tvs = json_to_test_vectors!(
             rfc,
-            String::from("ristretto255, SHA-512"),
+            String::from("ristretto255-SHA512"),
             String::from("OPRF")
         );
         assert_ne!(ristretto_oprf_tvs.len(), 0);
@@ -112,7 +110,7 @@ fn test_vectors() -> Result<()> {
 
         let ristretto_voprf_tvs = json_to_test_vectors!(
             rfc,
-            String::from("ristretto255, SHA-512"),
+            String::from("ristretto255-SHA512"),
             String::from("VOPRF")
         );
         assert_ne!(ristretto_voprf_tvs.len(), 0);
@@ -124,7 +122,7 @@ fn test_vectors() -> Result<()> {
 
         let ristretto_poprf_tvs = json_to_test_vectors!(
             rfc,
-            String::from("ristretto255, SHA-512"),
+            String::from("ristretto255-SHA512"),
             String::from("POPRF")
         );
         assert_ne!(ristretto_poprf_tvs.len(), 0);
@@ -136,7 +134,7 @@ fn test_vectors() -> Result<()> {
     }
 
     let p256_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), String::from("OPRF"));
+        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("OPRF"));
     assert_ne!(p256_oprf_tvs.len(), 0);
     test_oprf_seed_to_key::<NistP256>(&p256_oprf_tvs)?;
     test_oprf_blind::<NistP256>(&p256_oprf_tvs)?;
@@ -145,7 +143,7 @@ fn test_vectors() -> Result<()> {
     test_oprf_evaluate::<NistP256>(&p256_oprf_tvs)?;
 
     let p256_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), String::from("VOPRF"));
+        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("VOPRF"));
     assert_ne!(p256_voprf_tvs.len(), 0);
     test_voprf_seed_to_key::<NistP256>(&p256_voprf_tvs)?;
     test_voprf_blind::<NistP256>(&p256_voprf_tvs)?;
@@ -154,7 +152,7 @@ fn test_vectors() -> Result<()> {
     test_voprf_evaluate::<NistP256>(&p256_voprf_tvs)?;
 
     let p256_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), String::from("POPRF"));
+        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("POPRF"));
     assert_ne!(p256_poprf_tvs.len(), 0);
     test_poprf_seed_to_key::<NistP256>(&p256_poprf_tvs)?;
     test_poprf_blind::<NistP256>(&p256_poprf_tvs)?;
@@ -163,7 +161,7 @@ fn test_vectors() -> Result<()> {
     test_poprf_evaluate::<NistP256>(&p256_poprf_tvs)?;
 
     let p384_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), String::from("OPRF"));
+        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("OPRF"));
     assert_ne!(p384_oprf_tvs.len(), 0);
     test_oprf_seed_to_key::<NistP384>(&p384_oprf_tvs)?;
     test_oprf_blind::<NistP384>(&p384_oprf_tvs)?;
@@ -172,7 +170,7 @@ fn test_vectors() -> Result<()> {
     test_oprf_evaluate::<NistP384>(&p384_oprf_tvs)?;
 
     let p384_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), String::from("VOPRF"));
+        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("VOPRF"));
     assert_ne!(p384_voprf_tvs.len(), 0);
     test_voprf_seed_to_key::<NistP384>(&p384_voprf_tvs)?;
     test_voprf_blind::<NistP384>(&p384_voprf_tvs)?;
@@ -181,7 +179,7 @@ fn test_vectors() -> Result<()> {
     test_voprf_evaluate::<NistP384>(&p384_voprf_tvs)?;
 
     let p384_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), String::from("POPRF"));
+        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("POPRF"));
     assert_ne!(p384_poprf_tvs.len(), 0);
     test_poprf_seed_to_key::<NistP384>(&p384_poprf_tvs)?;
     test_poprf_blind::<NistP384>(&p384_poprf_tvs)?;
@@ -189,33 +187,6 @@ fn test_vectors() -> Result<()> {
     test_poprf_finalize::<NistP384>(&p384_poprf_tvs)?;
     test_poprf_evaluate::<NistP384>(&p384_poprf_tvs)?;
 
-    let p521_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-521, SHA-512"), String::from("OPRF"));
-    assert_ne!(p521_oprf_tvs.len(), 0);
-    test_oprf_seed_to_key::<NistP521>(&p521_oprf_tvs)?;
-    test_oprf_blind::<NistP521>(&p521_oprf_tvs)?;
-    test_oprf_blind_evaluate::<NistP521>(&p521_oprf_tvs)?;
-    test_oprf_finalize::<NistP521>(&p521_oprf_tvs)?;
-    test_oprf_evaluate::<NistP521>(&p521_oprf_tvs)?;
-
-    let p521_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-521, SHA-512"), String::from("VOPRF"));
-    assert_ne!(p521_voprf_tvs.len(), 0);
-    test_voprf_seed_to_key::<NistP521>(&p521_voprf_tvs)?;
-    test_voprf_blind::<NistP521>(&p521_voprf_tvs)?;
-    test_voprf_blind_evaluate::<NistP521>(&p521_voprf_tvs)?;
-    test_voprf_finalize::<NistP521>(&p521_voprf_tvs)?;
-    test_voprf_evaluate::<NistP521>(&p521_voprf_tvs)?;
-
-    let p521_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P-521, SHA-512"), String::from("POPRF"));
-    assert_ne!(p521_poprf_tvs.len(), 0);
-    test_poprf_seed_to_key::<NistP521>(&p521_poprf_tvs)?;
-    test_poprf_blind::<NistP521>(&p521_poprf_tvs)?;
-    test_poprf_blind_evaluate::<NistP521>(&p521_poprf_tvs)?;
-    test_poprf_finalize::<NistP521>(&p521_poprf_tvs)?;
-    test_poprf_evaluate::<NistP521>(&p521_poprf_tvs)?;
-
     Ok(())
 }
 

src/voprf.rs

@@ -1,10 +1,9 @@
-// Copyright (c) Meta Platforms, Inc. and affiliates.
+// Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is dual-licensed under either the MIT license found in the
-// LICENSE-MIT file in the root directory of this source tree or the Apache
+// This source code is licensed under both the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree and the Apache
 // License, Version 2.0 found in the LICENSE-APACHE file in the root directory
-// of this source tree. You may select, at your option, one of the above-listed
-// licenses.
+// of this source tree.
 
 //! Contains the main VOPRF API
 
@@ -161,7 +160,7 @@ where
     ///
     /// The resulting messages can each fail individually with [`Error::Input`]
     /// if the `input` is empty or longer then [`u16::MAX`].
-    pub fn batch_finalize<'a, I, II, IC, IM>(
+    pub fn batch_finalize<'a, I: 'a, II, IC, IM>(
         inputs: &'a II,
         clients: &'a IC,
         messages: &'a IM,
@@ -170,7 +169,7 @@ where
     ) -> Result<VoprfClientBatchFinalizeResult<'a, CS, I, II, IC, IM>>
     where
         CS: 'a,
-        I: 'a + AsRef<[u8]>,
+        I: AsRef<[u8]>,
         &'a II: 'a + IntoIterator<Item = I>,
         <&'a II as IntoIterator>::IntoIter: ExactSizeIterator,
         &'a IC: 'a + IntoIterator<Item = &'a VoprfClient<CS>>,
@@ -537,7 +536,7 @@ where
     )?;
 
     Ok(blinds
-        .zip(messages)
+        .zip(messages.into_iter())
         .map(|(blind, x)| x.0 * &CS::Group::invert_scalar(blind)))
 }
 
@@ -836,7 +835,6 @@ mod tests {
     fn test_functionality() -> Result<()> {
         use p256::NistP256;
         use p384::NistP384;
-        use p521::NistP521;
 
         #[cfg(feature = "ristretto255")]
         {
@@ -870,15 +868,6 @@ mod tests {
         zeroize_voprf_client::<NistP384>();
         zeroize_voprf_server::<NistP384>();
 
-        verifiable_retrieval::<NistP521>();
-        verifiable_batch_retrieval::<NistP521>();
-        verifiable_bad_public_key::<NistP521>();
-        verifiable_batch_bad_public_key::<NistP521>();
-        verifiable_server_evaluate::<NistP521>();
-
-        zeroize_voprf_client::<NistP521>();
-        zeroize_voprf_server::<NistP521>();
-
         Ok(())
     }
 }