chore: bump to v1.0.0-rc.0, implement zeroize for deps and license fix (#9)

Reviewed-on: #9
Co-authored-by: UneBaguette <[email protected]>
Co-committed-by: UneBaguette <[email protected]>

.gitea/workflows/ci.yml

@@ -0,0 +1,102 @@
+name: Rust CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+concurrency:
+  group: ci-${{ gitea.ref }}
+  cancel-in-progress: true
+
+jobs:
+  fmt:
+    name: cargo fmt
+    runs-on: linux_amd64
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
+
+  clippy:
+    name: cargo clippy
+    runs-on: linux_amd64
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+      - name: Run cargo clippy
+        run: cargo clippy --all-features --all-targets -- -D warnings
+      - name: Run cargo doc
+        run: cargo doc --no-deps --document-private-items --features danger,std
+        env:
+          RUSTDOCFLAGS: -D warnings
+
+  test:
+    name: test (${{ matrix.toolchain }} / ${{ matrix.backend_feature || 'no backend' }} / ${{ matrix.frontend_feature || 'no frontend' }})
+    runs-on: linux_amd64
+    strategy:
+      fail-fast: false
+      matrix:
+        backend_feature:
+          - --features ristretto255-ciphersuite
+          - ""
+        frontend_feature:
+          - ""
+          - --features danger
+          - --features serde
+        toolchain:
+          - stable
+          - "1.87.0"
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: dtolnay/rust-toolchain@${{ matrix.toolchain }}
+      - name: Run cargo test
+        run: cargo test --no-default-features --lib --tests ${{ matrix.backend_feature }}
+      - name: Run cargo test with alloc
+        run: cargo test --no-default-features --lib --tests ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }} --features alloc
+      - name: Run cargo test with std
+        run: cargo test --no-default-features --lib --tests ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }} --features std
+      - name: Run cargo test with all features
+        run: cargo test --all-features
+
+  build-no-std:
+    name: no-std (${{ matrix.target }} / ${{ matrix.backend_feature || 'no backend' }})
+    runs-on: linux_amd64
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - wasm32-unknown-unknown
+          - thumbv6m-none-eabi
+        backend_feature:
+          - ""
+          - --features ristretto255-ciphersuite
+        frontend_feature:
+          - ""
+          - --features danger
+          - --features serde
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.target }}
+      - name: Build no-std
+        run: cargo build --verbose --target=${{ matrix.target }} --no-default-features ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }}
+
+  audit:
+    name: cargo audit
+    runs-on: linux_amd64
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
+      - name: Run cargo audit
+        run: cargo audit -D warnings

.gitea/workflows/publish.yml

@@ -0,0 +1,26 @@
+name: Publish
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  publish:
+    runs-on: linux_amd64
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - name: Login to crates.io
+        run: cargo login $CRATES_IO_TOKEN
+        env:
+          CRATES_IO_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}
+
+      - name: Dry run publish
+        run: cargo publish --dry-run --manifest-path Cargo.toml
+
+      - name: Publish
+        run: cargo publish --manifest-path Cargo.toml
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

.github/dependabot.yml

@@ -1,12 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: cargo
-    directory: /
-    schedule:
-      interval: daily
-
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: daily

.github/workflows/main.yml

@@ -1,179 +0,0 @@
-name: Rust CI
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-jobs:
-  cargo-audit:
-    name: Audit
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache cargo-audit
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.cargo/.crates.toml
-            ~/.cargo/.crates2.json
-            ~/.cargo/bin/cargo-audit
-          key: cargo-audit
-
-      - name: Install cargo-audit
-        run: cargo install cargo-audit
-
-      - name: Checkout sources
-        uses: actions/checkout@v6
-
-      - name: Run cargo audit
-        run: cargo audit -D warnings
-
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        backend_feature:
-          - --features ristretto255-ciphersuite
-          -
-        frontend_feature:
-          -
-          - --features danger
-          - --features serde
-        toolchain:
-          - stable
-          - 1.85.0
-    name: test
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v6
-
-      - name: Install ${{ matrix.toolchain }} toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.toolchain }}
-          override: true
-
-      - name: Run cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-default-features ${{ matrix.backend_feature }}
-
-      - name: Run cargo test with alloc
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-default-features ${{ matrix.frontend_feature }},alloc ${{ matrix.backend_feature }}
-
-      - name: Run cargo test with std
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --no-default-features ${{ matrix.frontend_feature }},std ${{ matrix.backend_feature }}
-
-      - name: Run cargo test with all features enabled
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features
-
-  build-no-std:
-    name: Build with no-std on ${{ matrix.target }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target:
-          # for wasm
-          - wasm32-unknown-unknown
-          # for any no_std target
-          - thumbv6m-none-eabi
-        backend_feature:
-          -
-          - --features ristretto255-ciphersuite
-        frontend_feature:
-          -
-          - --features danger
-          - --features serde
-    steps:
-      - uses: actions/checkout@v6
-      - uses: hecrj/setup-rust-action@v2
-      - run: rustup target add ${{ matrix.target }}
-      - run: cargo build --verbose --target=${{ matrix.target }} --no-default-features ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }}
-
-
-  clippy:
-    name: cargo clippy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v6
-
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: clippy
-
-      - name: Run cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --all-features --all-targets -- -D warnings
-
-      - name: Run cargo doc
-        uses: actions-rs/cargo@v1
-        env:
-          RUSTDOCFLAGS: -D warnings
-        with:
-          command: doc
-          args: --no-deps --document-private-items --features danger,std
-
-
-  rustfmt:
-    name: cargo fmt
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v6
-
-      - name: Install nightly toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-      - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  taplo:
-    name: Taplo
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache
-        uses: actions/cache@v5
-        with:
-          path: |
-            ~/.cargo/.crates.toml
-            ~/.cargo/.crates2.json
-            ~/.cargo/bin/taplo
-          key: taplo
-
-      - name: Install Taplo
-        run: cargo install taplo-cli --locked
-
-      - name: Checkout sources
-        uses: actions/checkout@v6
-
-      - name: Run Taplo
-        run: taplo fmt --check

.github/workflows/publish.yml

@@ -1,29 +0,0 @@
-name: Publish
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        rust: [stable]
-
-    steps:
-    - uses: hecrj/setup-rust-action@v2
-      with:
-        rust-version: ${{ matrix.rust }}
-    - uses: actions/checkout@master
-    - name: Login to crates.io
-      run: cargo login $CRATES_IO_TOKEN
-      env:
-        CRATES_IO_TOKEN: ${{ secrets.crates_io_token }}
-    - name: Dry run publish voprf
-      run: cargo publish --dry-run --manifest-path Cargo.toml
-    - name: Publish voprf
-      run: cargo publish --manifest-path Cargo.toml
-      env:
-        CARGO_REGISTRY_TOKEN: ${{ secrets.crates_io_token }}

CHANGELOG.md

@@ -1,20 +1,35 @@
 # Changelog
 
-## 0.6.0-rc.0 (June 27, 2026)
+## 1.0.0-rc.0 (July 2, 2026)
+
+* Added missing license in Cargo manifest
+* Implement `zeroize` feature for `digest`, `hybrid-array` and `sha2`
+* Replaced license appendix in files while keeping original copyright
+
+## 1.0.0-pre.1 (July 2, 2026)
+
+* Simplified ciphersuite trait
+* Moved multiplication operator to SecurityLevel type in Group trait
+
+## 1.0.0-pre.0 (June 29, 2026)
+
+Forked from [facebook/voprf](https://github.com/facebook/voprf/) at `0.6.0-pre.1`.
+
 * MSRV bumped to 1.87
 * Migrated from `elliptic-curve 0.13` to `0.14`
-* Replaced `generic-array` with `hybrid-array`
-* Updated `digest` dependency to 0.11
-* Updated `rand_core` dependency to 0.10
-* Updated `rand` dependency to 0.10
-* Updated `sha2` dependency to 0.11
-* Updated `p256`, `p384`, `p521` dependencies to 0.14.0-rc
+* Replaced `generic-array` with `hybrid-array 0.4`
+* Updated `digest` to 0.11, `rand_core` to 0.10, `rand` to 0.10, `sha2` to 0.11
+* Updated `p256`, `p384`, `p521` to `0.14`
 * Replaced `elliptic-curve/hash2curve` feature with standalone `hash2curve 0.14` crate
-* Updated `hash_to_scalar` to use `MapToCurve::Length` as OKM length per RFC 9380, replacing the removed `GroupDigest::hash_to_scalar` method
-* Updated `random_scalar` to consume exactly `ScalarLen` bytes per attempt, adapting to the new `rand_core 0.10` API
-* Added `OkmLen` associated type to `Group` trait
+* Removed `VoprfParameters` dependency to be replaced with `OprfParameters` + `GroupDigest`
+* Added `SecurityLevel` associated type to `Group` trait for generic hash bounds
+* Added `OkmLen` associated type to `Group` trait (`MapToCurve::Length`)
+* Updated `hash_to_scalar` to use `MapToCurve::Length` as OKM length per RFC 9380
+* Updated `random_scalar` for deterministic byte consumption with `rand_core 0.10`
+* Auto-impl `CipherSuite` for any `OprfParameters + Group` type via `OprfHash<T>`
 
 ## 0.6.0-pre.1 (April 6, 2026)
+
 * MSRV bumped to 1.85
 * Updated rand_core dependency to 0.9
 * Updated rand dependency to 0.9
@@ -22,40 +37,50 @@
 * Fixed docs issue
 
 ## 0.6.0-pre.0 (November 8, 2025)
+
 * MSRV bumped to 1.83
 * Updated Ristretto255 random scalar generation
 * Updated generic-array to v1
 
 ## 0.5.0 (March 6, 2024)
+
 * Just a version bump from v0.5.0-pre.7
 
 ## 0.5.0-pre.7 (January 11, 2024)
+
 * Updated to be in sync with RFC 9497
 
 ## 0.5.0-pre.6 (July 24, 2023)
+
 * Updated curve25519-dalek dependency to 4
 
 ## 0.5.0-pre.5 (June 27, 2023)
+
 * Updated curve25519-dalek dependency to 4.0.0-rc.3
 
 ## 0.5.0-pre.4 (May 20, 2023)
+
 * Updated curve25519-dalek dependency to 4.0.0-rc.2
 
 ## 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
   the addition of the POPRF mode
 * Adds the evaluate() function to the servers to calculate the output of the OPRF

CONTRIBUTING.md

@@ -7,6 +7,6 @@ We use GitHub issues to track public bugs. Please ensure your description is
 clear and has sufficient instructions to be able to reproduce the issue.
 
 ## License
-By contributing to voprf, you agree that your contributions will be
+By contributing to voprf-vx, 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.

Cargo.toml

@@ -1,19 +1,20 @@
 [package]
-authors = ["Kevin Lewi <[email protected]>"]
+authors = ["VexaHub Developers", "Kevin Lewi <[email protected]>"]
 categories = ["no-std", "algorithms", "cryptography"]
 description = "An implementation of a verifiable oblivious pseudorandom function (VOPRF)"
-edition = "2021"
-keywords = ["oprf"]
-license = "MIT"
-name = "voprf"
+edition = "2024"
+keywords = ["oprf", "voprf", "cryptography", "oblivious-prf"]
+license = "MIT OR Apache-2.0"
+name = "voprf-vx"
 readme = "README.md"
-repository = "https://github.com/facebook/voprf/"
+repository = "https://github.com/vexahub/voprf-vx/"
 rust-version = "1.87"
-version = "0.6.0-rc.0"
+version = "1.0.0-rc.0"
 
 [features]
 alloc = []
 danger = []
+doctest = ["dep:p256", "dep:sha2"]
 default = ["ristretto255-ciphersuite", "dep:serde"]
 ristretto255 = ["dep:curve25519-dalek"]
 ristretto255-ciphersuite = ["ristretto255", "dep:sha2"]
@@ -21,20 +22,21 @@ serde = ["curve25519-dalek?/serde", "hybrid-array/serde", "dep:serde"]
 std = ["alloc"]
 
 [dependencies]
-curve25519-dalek = { version = "4", default-features = false, features = ["rand_core", "zeroize"], optional = true }
+curve25519-dalek = { version = "5.0.0-rc", default-features = false, features = ["rand_core", "zeroize"], optional = true }
 derive-where = { version = "1", features = ["zeroize-on-drop"] }
-digest = "0.11"
+digest = { version = "0.11", features = ["zeroize"] }
 displaydoc = { version = "0.2", default-features = false }
 elliptic-curve = { version = "0.14", features = [
     "sec1",
 ] }
 hash2curve = "0.14"
-hybrid-array = "0.4"
-rand_core = { version = "0.10", default-features = false, features = [] }
+hybrid-array = { version = "0.4", features = ["zeroize"] }
+rand_core = { version = "0.10", default-features = false }
 serde = { version = "1", default-features = false, features = [
     "derive",
 ], optional = true }
-sha2 = { version = "0.11", default-features = false, optional = true }
+sha2 = { version = "0.11", default-features = false, features = ["zeroize"], optional = true }
+p256 = { version = "0.14.0-rc", default-features = false, features = ["hash2curve", "oprf"], optional = true }
 subtle = { version = "2.6", default-features = false }
 zeroize = { version = "1.5", default-features = false }
 
@@ -62,3 +64,4 @@ sha2 = "0.11"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 targets = []
+features = ["doctest"]

README.md

@@ -1,4 +1,4 @@
-# voprf ![Build Status](https://github.com/novifinancial/voprf/workflows/Rust%20CI/badge.svg)
+# voprf
 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.
@@ -8,7 +8,7 @@ This implementation is based on [RFC 9497](https://www.rfc-editor.org/rfc/rfc949
 Documentation
 -------------
 
-The API can be found [here](https://docs.rs/voprf/) along with an example for usage.
+The API can be found [here](https://docs.rs/voprf-vx/) along with an example for usage.
 
 Installation
 ------------
@@ -16,7 +16,7 @@ Installation
 Add the following line to the dependencies of your `Cargo.toml`:
 
 ```
-voprf = { package = "voprf-vexahub", version = "0.6.0-rc.0" }
+voprf = { package = "voprf-vx", version = "1.0.0-rc.0" }
 ```
 
 ### Minimum Supported Rust Version
@@ -26,7 +26,9 @@ Rust **1.87** or higher.
 Contributors
 ------------
 
-The author of this code is Kevin Lewi ([@kevinlewi](https://github.com/kevinlewi)).
+This is a fork of [facebook/voprf](https://github.com/facebook/voprf/) maintained by [VexaHub](https://github.com/vexahub).
+
+The original author is Kevin Lewi ([@kevinlewi](https://github.com/kevinlewi)).
 To learn more about contributing to this project, [see this document](./CONTRIBUTING.md).
 
 License

renovate.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ],
+  "dependencyDashboard": true,
+  "osvVulnerabilityAlerts": true,
+  "rangeStrategy": "auto",
+  "packageRules": [
+    {
+      "matchManagers": [
+        "cargo"
+      ],
+      "groupName": "rust deps"
+    },
+    {
+      "matchManagers": [
+        "cargo"
+      ],
+      "matchUpdateTypes": [
+        "major"
+      ],
+      "automerge": false
+    }
+  ],
+  "lockFileMaintenance": {
+    "enabled": true
+  },
+  "configMigration": true
+}

src/ciphersuite.rs

@@ -1,25 +1,20 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Defines the CipherSuite trait to specify the underlying primitives for VOPRF
 
 use crate::Group;
-use core::ops::Mul;
 use digest::block_api::BlockSizeUser;
 use digest::typenum::{IsLess, IsLessOrEqual, U256};
-use digest::{Digest, FixedOutput, HashMarker, OutputSizeUser};
-use hybrid_array::typenum::{IsGreaterOrEqual, Prod, True, U2};
+use digest::{FixedOutput, HashMarker, OutputSizeUser};
+use hash2curve::{ExpandMsg, GroupDigest, MapToCurve, OprfParameters};
 use hybrid_array::ArraySize;
+use hybrid_array::typenum::{IsGreaterOrEqual, Prod, True, U2};
 
 /// Configures the underlying primitives used in VOPRF
 pub trait CipherSuite
 where
-    <Self::Group as Group>::SecurityLevel: Mul<U2>,
     <Self::Hash as OutputSizeUser>::OutputSize: ArraySize
         + IsLess<U256>
         + IsLessOrEqual<<Self::Hash as BlockSizeUser>::BlockSize, Output = True>
@@ -35,5 +30,23 @@ where
 
     /// The main hash function to use (for HKDF computations and hashing
     /// transcripts).
-    type Hash: Digest + BlockSizeUser + Default + FixedOutput + HashMarker;
+    type Hash: BlockSizeUser + Default + FixedOutput + HashMarker;
+}
+
+/// The hash function associated with a curve's OPRF `expand_message` implementation.
+type OprfHash<T> =
+    <<T as GroupDigest>::ExpandMsg as ExpandMsg<<T as MapToCurve>::SecurityLevel>>::Hash;
+
+impl<T: OprfParameters> CipherSuite for T
+where
+    T: Group,
+    OprfHash<T>: BlockSizeUser + Default + FixedOutput + HashMarker,
+    <OprfHash<T> as OutputSizeUser>::OutputSize: ArraySize
+        + IsLess<U256>
+        + IsLessOrEqual<<OprfHash<T> as BlockSizeUser>::BlockSize, Output = True>
+        + IsGreaterOrEqual<Prod<<T as Group>::SecurityLevel, U2>, Output = True>,
+{
+    const ID: &'static [u8] = T::ID;
+    type Group = T;
+    type Hash = OprfHash<T>;
 }

src/common.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Common functionality between multiple OPRF modes.
 
@@ -13,7 +9,7 @@ use core::ops::Add;
 
 use derive_where::derive_where;
 use digest::{Digest, Output, OutputSizeUser};
-use hybrid_array::typenum::{IsLess, Unsigned, U2, U256, U9};
+use hybrid_array::typenum::{IsLess, U2, U9, U256, Unsigned};
 use hybrid_array::{Array, ArrayN, ArraySize};
 use rand_core::{TryCryptoRng, TryRng};
 use subtle::ConstantTimeEq;

src/error.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Errors which are produced during an execution of the protocol
 

src/group/elliptic_curve.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 use core::ops::{Add, Mul};
 use digest::block_api::BlockSizeUser;
@@ -16,20 +12,20 @@ use elliptic_curve::{
     AffinePoint, Field, FieldBytes, FieldBytesSize, Group as _, ProjectivePoint, PublicKey, Scalar,
     SecretKey,
 };
-use hash2curve::{hash_to_scalar, ExpandMsgXmd, GroupDigest};
+use hash2curve::{ExpandMsgXmd, GroupDigest, MapToCurve, hash_to_scalar};
 use hybrid_array::typenum::{IsGreaterOrEqual, Prod, Sum, True, U2};
 use hybrid_array::{Array, ArraySize};
 use rand_core::TryCryptoRng;
 
 use super::Group;
-use crate::{CipherSuite, Error, InternalError, Result};
+use crate::{Error, InternalError, Result};
 
 type ElemLen<C> = <ScalarLen<C> as ModulusSize>::CompressedPointSize;
 type ScalarLen<C> = FieldBytesSize<C>;
 
 impl<C> Group for C
 where
-    C: GroupDigest + CipherSuite + hash2curve::MapToCurve,
+    C: GroupDigest,
     C::SecurityLevel: Mul<U2>,
     C::SecurityLevel: ArraySize,
     <C::SecurityLevel as Mul<U2>>::Output: ArraySize,
@@ -37,8 +33,7 @@ where
     ScalarLen<Self>: ModulusSize,
     ScalarLen<Self>: ArraySize,
     ScalarLen<Self>: hybrid_array::typenum::NonZero,
-    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, ScalarLen<Self>>>,
-    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, <C as hash2curve::MapToCurve>::Length>>,
+    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, <C as MapToCurve>::Length>>,
     AffinePoint<Self>: FromSec1Point<Self> + ToSec1Point<Self>,
     // `VoprfClientLen`, `PoprfClientLen`, `VoprfServerLen`, `PoprfServerLen`
     ScalarLen<Self>: Add<ElemLen<Self>>,
@@ -58,8 +53,6 @@ where
 
     type SecurityLevel = C::SecurityLevel;
 
-    type OkmLen = <C as hash2curve::MapToCurve>::Length;
-
     // Implements the `hash_to_curve()` function from
     // https://www.rfc-editor.org/rfc/rfc9380.html#section-3
     fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError> {
@@ -70,11 +63,11 @@ where
     fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
-        C::SecurityLevel: Mul<U2>,
-        H::OutputSize: IsGreaterOrEqual<Prod<C::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256>
+            + IsLessOrEqual<H::BlockSize, Output = True>
+            + IsGreaterOrEqual<Prod<C::SecurityLevel, U2>, Output = True>,
     {
-        hash_to_scalar::<C, ExpandMsgXmd<H>, <C as hash2curve::MapToCurve>::Length>(input, dst)
+        hash_to_scalar::<C, ExpandMsgXmd<H>, <C as MapToCurve>::Length>(input, dst)
             .map_err(|_| InternalError::Input)
     }
 

src/group/mod.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Defines the Group trait to specify the underlying prime order group
 
@@ -64,10 +60,7 @@ where
     /// Used to enforce `H::OutputSize >= 2 * SecurityLevel` in
     /// `hash_to_curve` and `hash_to_scalar`, which corresponds to the
     /// `expand_message` requirement `len_in_bytes = 2 * k / 8`.
-    type SecurityLevel: ArraySize;
-
-    /// The OKM length for hash_to_scalar (>= ScalarLen, used by hash_to_field).
-    type OkmLen: ArraySize + hybrid_array::typenum::NonZero;
+    type SecurityLevel: ArraySize + Mul<U2>;
 
     /// Transforms a password and domain separation tag (DST) into a curve point
     ///
@@ -77,9 +70,9 @@ where
     fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
-        Self::SecurityLevel: Mul<U2>,
-        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256>
+            + IsLessOrEqual<H::BlockSize, Output = True>
+            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
 
     /// Hashes a slice of pseudo-random bytes to a scalar
     ///
@@ -89,9 +82,9 @@ where
     fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
-        Self::SecurityLevel: Mul<U2>,
-        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256>
+            + IsLessOrEqual<H::BlockSize, Output = True>
+            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
 
     /// Get the base point for the group
     fn base_elem() -> Self::Elem;

src/group/ristretto.rs

@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 use core::num::NonZeroU16;
-use core::ops::Mul;
+
 use curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
 use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
@@ -15,10 +11,10 @@ use curve25519_dalek::traits::Identity;
 use digest::block_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker};
 use hash2curve::{ExpandMsg, ExpandMsgXmd, Expander};
-use hybrid_array::typenum::{
-    IsGreaterOrEqual, IsLess, IsLessOrEqual, Prod, True, U16, U2, U256, U32, U64,
-};
 use hybrid_array::Array;
+use hybrid_array::typenum::{
+    IsGreaterOrEqual, IsLess, IsLessOrEqual, Prod, True, U2, U16, U32, U256,
+};
 use rand_core::{TryCryptoRng, TryRng};
 use subtle::ConstantTimeEq;
 
@@ -49,16 +45,14 @@ impl Group for Ristretto255 {
 
     type SecurityLevel = U16;
 
-    type OkmLen = U64;
-
     // Implements the `hash_to_ristretto255()` function from
     // https://www.rfc-editor.org/rfc/rfc9380.html#appendix-B
     fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
-        Self::SecurityLevel: Mul<U2>,
-        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256>
+            + IsLessOrEqual<H::BlockSize, Output = True>
+            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
     {
         let mut uniform_bytes = [0u8; 64];
 
@@ -79,9 +73,9 @@ impl Group for Ristretto255 {
     fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
     where
         H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
-        Self::SecurityLevel: Mul<U2>,
-        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256>
+            + IsLessOrEqual<H::BlockSize, Output = True>
+            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
     {
         let mut uniform_bytes = [0u8; 64];
 

src/group/tests.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Includes a series of tests for the group implementations
 

src/lib.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! An implementation of a verifiable oblivious pseudorandom function (VOPRF)
 //!
@@ -20,7 +16,7 @@
 //! We will use the following choice in this example:
 //!
 //! ```ignore
-//! type CipherSuite = voprf::Ristretto255;
+//! type CipherSuite = voprf_vx::Ristretto255;
 //! ```
 //!
 //! ## Modes of Operation
@@ -51,12 +47,12 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
-//! use voprf::OprfServer;
+//! use voprf_vx::OprfServer;
 //!
 //! let mut server_rng = SysRng;
 //! let server = OprfServer::<CipherSuite>::new(&mut server_rng);
@@ -71,12 +67,12 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
-//! use voprf::OprfClient;
+//! use voprf_vx::OprfClient;
 //!
 //! let mut client_rng = SysRng;
 //! let client_blind_result = OprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
@@ -92,10 +88,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::OprfClient;
+//! # use voprf_vx::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -103,7 +99,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::OprfServer;
+//! # use voprf_vx::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let server_evaluate_result = server.blind_evaluate(&client_blind_result.message);
@@ -117,10 +113,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::OprfClient;
+//! # use voprf_vx::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -128,7 +124,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::OprfServer;
+//! # use voprf_vx::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
@@ -150,10 +146,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::OprfClient;
+//! # use voprf_vx::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -161,7 +157,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::OprfServer;
+//! # use voprf_vx::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
@@ -197,12 +193,12 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
-//! use voprf::VoprfServer;
+//! use voprf_vx::VoprfServer;
 //!
 //! let mut server_rng = SysRng;
 //! let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
@@ -224,12 +220,12 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
 //! use rand::rngs::SysRng;
 //! use rand::Rng;
-//! use voprf::VoprfClient;
+//! use voprf_vx::VoprfClient;
 //!
 //! let mut client_rng = SysRng;
 //! let client_blind_result = VoprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
@@ -246,10 +242,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::{VoprfServerEvaluateResult, VoprfClient};
+//! # use voprf_vx::{VoprfServerEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -257,7 +253,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerEvaluateResult { message, proof } =
@@ -273,10 +269,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::VoprfClient;
+//! # use voprf_vx::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -284,7 +280,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
@@ -314,10 +310,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::VoprfClient;
+//! # use voprf_vx::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -325,7 +321,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
@@ -368,10 +364,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::VoprfClient;
+//! # use voprf_vx::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! let mut client_rng = SysRng;
@@ -392,10 +388,10 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
+//! # use voprf_vx::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -409,7 +405,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let prepared_evaluation_elements = server.batch_blind_evaluate_prepare(client_messages.iter());
@@ -426,10 +422,10 @@
 //! ```
 //! # #[cfg(feature = "alloc")] {
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
+//! # use voprf_vx::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -443,7 +439,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerBatchEvaluateResult { messages, proof } = server
@@ -460,10 +456,10 @@
 //! ```
 //! # #[cfg(feature = "alloc")] {
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf::Ristretto255;
+//! # type CipherSuite = voprf_vx::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
+//! # use voprf_vx::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -477,7 +473,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf::VoprfServer;
+//! # use voprf_vx::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let VoprfServerBatchEvaluateResult { messages, proof } = server

src/oprf.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Contains the main OPRF API
 
@@ -12,13 +8,13 @@ use core::iter::{self, Map};
 
 use derive_where::derive_where;
 use digest::{Digest, Output};
-use hybrid_array::typenum::Unsigned;
 use hybrid_array::Array;
+use hybrid_array::typenum::Unsigned;
 use rand_core::{TryCryptoRng, TryRng};
 
 use crate::common::{
-    derive_key_internal, deterministic_blind_unchecked, hash_to_group, i2osp_2,
-    server_evaluate_hash_input, BlindedElement, EvaluationElement, Mode, STR_FINALIZE,
+    BlindedElement, EvaluationElement, Mode, STR_FINALIZE, derive_key_internal,
+    deterministic_blind_unchecked, hash_to_group, i2osp_2, server_evaluate_hash_input,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::Scalar;
@@ -267,12 +263,12 @@ fn finalize_after_unblind<
 mod tests {
     use core::ptr;
 
-    use rand::rngs::SysRng;
     use rand::TryRng;
+    use rand::rngs::SysRng;
 
     use super::*;
-    use crate::common::{Dst, STR_HASH_TO_GROUP};
     use crate::Group;
+    use crate::common::{Dst, STR_HASH_TO_GROUP};
 
     fn prf<CS: CipherSuite>(
         input: &[u8],

src/poprf.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Contains the main POPRF API
 
@@ -19,9 +15,9 @@ use hybrid_array::{Array, ArraySize};
 use rand_core::{TryCryptoRng, TryRng};
 
 use crate::common::{
-    derive_keypair, deterministic_blind_unchecked, generate_proof, hash_to_group, i2osp_2,
-    server_evaluate_hash_input, verify_proof, BlindedElement, Dst, EvaluationElement, Mode,
-    PreparedEvaluationElement, Proof, STR_FINALIZE, STR_HASH_TO_SCALAR, STR_INFO,
+    BlindedElement, Dst, EvaluationElement, Mode, PreparedEvaluationElement, Proof, STR_FINALIZE,
+    STR_HASH_TO_SCALAR, STR_INFO, derive_keypair, deterministic_blind_unchecked, generate_proof,
+    hash_to_group, i2osp_2, server_evaluate_hash_input, verify_proof,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::{Element, Scalar};
@@ -371,7 +367,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
             tweaked_key,
             prepared_evaluation_elements
                 .into_iter()
-                .map(|element| element.0 .0),
+                .map(|element| element.0.0),
             blinded_elements.map(|element| element.0),
             Mode::Poprf,
         )?;
@@ -379,7 +375,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
         let messages = prepared_evaluation_elements.into_iter().map(<fn(
             &PreparedEvaluationElement<CS>,
         ) -> _>::from(
-            |element| EvaluationElement(element.0 .0),
+            |element| EvaluationElement(element.0.0),
         ));
 
         Ok(PoprfServerBatchEvaluateFinishResult { messages, proof })
@@ -736,8 +732,8 @@ mod tests {
     use rand::rngs::SysRng;
 
     use super::*;
-    use crate::common::STR_HASH_TO_GROUP;
     use crate::Group;
+    use crate::common::STR_HASH_TO_GROUP;
 
     fn prf<CS: CipherSuite>(
         input: &[u8],

src/serialization.rs

@@ -1,16 +1,12 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Handles the serialization of each of the components used in the VOPRF
 //! protocol
 
-use hybrid_array::typenum::{Sum, Unsigned};
 use hybrid_array::Array;
+use hybrid_array::typenum::{Sum, Unsigned};
 
 use crate::{
     BlindedElement, CipherSuite, Error, EvaluationElement, Group, OprfClient, OprfServer,

src/tests/cfrg_vectors.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! The VOPRF test vectors taken from:
 //! https://www.rfc-editor.org/rfc/rfc9497#appendix-A

src/tests/mock_rng.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 use alloc::vec::Vec;
 use core::cmp::min;

src/tests/mod.rs

@@ -1,30 +1,8 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 mod cfrg_vectors;
 mod mock_rng;
 mod parser;
 mod test_cfrg_vectors;
-
-impl crate::CipherSuite for p256::NistP256 {
-    const ID: &'static [u8] = <p256::NistP256 as hash2curve::OprfParameters>::ID;
-    type Group = p256::NistP256;
-    type Hash = sha2::Sha256;
-}
-
-impl crate::CipherSuite for p384::NistP384 {
-    const ID: &'static [u8] = <p384::NistP384 as hash2curve::OprfParameters>::ID;
-    type Group = p384::NistP384;
-    type Hash = sha2::Sha384;
-}
-
-impl crate::CipherSuite for p521::NistP521 {
-    const ID: &'static [u8] = <p521::NistP521 as hash2curve::OprfParameters>::ID;
-    type Group = p521::NistP521;
-    type Hash = sha2::Sha512;
-}

src/tests/parser.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
@@ -19,15 +15,14 @@ fn parse_ciphersuites(input: &str) -> String {
     let mut ciphersuites = vec![];
 
     let chunks: Vec<&str> = re.split(input).collect();
-    let mut count = 1;
-    for caps in re.captures_iter(input) {
+    for (count, caps) in (1..).zip(re.captures_iter(input)) {
         let ciphersuite = format!(
             "\"{}\": {{ {} }}",
             &caps["ciphersuite"],
             parse_modes(chunks[count])
         );
+
         ciphersuites.push(ciphersuite);
-        count += 1;
     }
 
     ciphersuites.join(",\n")
@@ -38,15 +33,13 @@ fn parse_modes(input: &str) -> String {
     let mut modes = vec![];
 
     let chunks: Vec<&str> = re.split(input).collect();
-    let mut count = 1;
-    for caps in re.captures_iter(input) {
+    for (count, caps) in (1..).zip(re.captures_iter(input)) {
         let mode = format!(
             "\"{}\": [\n {} \n]",
             &caps["mode"],
             parse_vectors(chunks[count])
         );
         modes.push(mode);
-        count += 1;
     }
 
     modes.join(",\n")
@@ -59,11 +52,9 @@ fn parse_vectors(input: &str) -> String {
     let chunks: Vec<&str> = re.split(input).collect();
     let init_params = parse_params(chunks[0]);
 
-    let mut count = 1;
-    for _ in re.captures_iter(input) {
+    for (count, _) in (1..).zip(re.captures_iter(input)) {
         let params = format!("{{\n{},\n{}\n}}", init_params, parse_params(chunks[count]));
         vectors.push(params);
-        count += 1;
     }
 
     vectors.join(",\n")

src/tests/test_cfrg_vectors.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 use alloc::string::String;
 use alloc::vec;

src/voprf.rs

@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and 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
-// 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.
 
 //! Contains the main VOPRF API
 
@@ -14,14 +10,14 @@ use core::iter::{self, Map, Repeat, Zip};
 
 use derive_where::derive_where;
 use digest::{Digest, Output};
-use hybrid_array::typenum::Unsigned;
 use hybrid_array::Array;
+use hybrid_array::typenum::Unsigned;
 use rand_core::{TryCryptoRng, TryRng};
 
 use crate::common::{
+    BlindedElement, EvaluationElement, Mode, PreparedEvaluationElement, Proof, STR_FINALIZE,
     derive_keypair, deterministic_blind_unchecked, generate_proof, hash_to_group, i2osp_2,
-    server_evaluate_hash_input, verify_proof, BlindedElement, EvaluationElement, Mode,
-    PreparedEvaluationElement, Proof, STR_FINALIZE,
+    server_evaluate_hash_input, verify_proof,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::{Element, Scalar};
@@ -343,14 +339,14 @@ impl<CS: CipherSuite> VoprfServer<CS> {
             g,
             self.pk,
             blinded_elements.map(|element| element.0),
-            evaluation_elements.into_iter().map(|element| element.0 .0),
+            evaluation_elements.into_iter().map(|element| element.0.0),
             Mode::Voprf,
         )?;
 
         let messages = evaluation_elements.into_iter().map(<fn(
             &PreparedEvaluationElement<CS>,
         ) -> EvaluationElement<CS>>::from(
-            |element| EvaluationElement(element.0 .0),
+            |element| EvaluationElement(element.0.0),
         ));
 
         Ok(VoprfServerBatchEvaluateFinishResult { messages, proof })
@@ -553,8 +549,8 @@ mod tests {
     use rand::rngs::SysRng;
 
     use super::*;
-    use crate::common::{Dst, STR_HASH_TO_GROUP};
     use crate::Group;
+    use crate::common::{Dst, STR_HASH_TO_GROUP};
 
     fn prf<CS: CipherSuite>(
         input: &[u8],