Publishing v0.4.1 (#136 )

v0.4.1 - draft-11 compatible, builds on latest Rust (#135 )
* Fix Clippy (#85) * Update `curve25519-dalek` to 4.0.0-pre.5 (#86) * Update `curve25519-dalek` * Improve documentation * Adding all-features CI test (#87) * Upgrade `p256` to v0.12 (#90) * Upgrade `p256` to v0.12 * Upgrade MSRV to 1.60 (cherry picked from commit daa8dc048f) * Replace `json` with `serde_json` (#92) (cherry picked from commit c8de51672b) * Fix Clippy (#96) (cherry picked from commit 74eaebe446) * Depend on `ProjectivePoint: ToEncodedPoint` (#95) (cherry picked from commit 0409db6f40) * Update `curve25519-dalek` (#94) (cherry picked from commit 2787151e1d) * Use explicit crate features (#100) (cherry picked from commit 5bce3e3206) * Bump `curve25519-dalek` to v4.0.0-rc.1 (#102) (cherry picked from commit 8363d26f6f) * Test P-384 (#84) (cherry picked from commit 83eb78b232) * Update RustCrypto dependencies to v0.13 (#106) (cherry picked from commit 8b895cc631) * Update curve25519-dalek requirement from =4.0.0-rc.1 to =4.0.0-rc.2 (#108) Updates the requirements on [curve25519-dalek](https://github.com/dalek-cryptography/curve25519-dalek) to permit the latest version. - [Release notes](https://github.com/dalek-cryptography/curve25519-dalek/releases) - [Changelog](https://github.com/dalek-cryptography/curve25519-dalek/blob/main/CHANGELOG.md) - [Commits](https://github.com/dalek-cryptography/curve25519-dalek/compare/4.0.0-rc.1...4.0.0-rc.2) --- updated-dependencies: - dependency-name: curve25519-dalek dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4bd2cf466e) * Updating dual-license language (#110) (cherry picked from commit f79ebf9844) * Bump `curve25519-dalek` to v4.0.0-rc.3 (#113) (cherry picked from commit 209b957ae4) * Bump `curve25519-dalek` to v4 (#116) (cherry picked from commit 0fdfdfdaee) * Fixing clippy IntoIterator warnings (#123) (cherry picked from commit c0162ec8d9) * Bump actions/checkout from 3 to 4 (#120) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8da56845b8) * Updating setup-rust-action (#125) (cherry picked from commit 59e3fedb21) * Test P-521 (#127) (cherry picked from commit 68cc7d3709) * Fix ambiguous lifetime elision (#131) (cherry picked from commit 40769f7eca) * Bump actions/cache from 3 to 4 (#132) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c93884aca3) * Fixups + cherry-picking changes from #101 * Fix Clippy warnings * More fixups, tests passing * Ensure CI runs on branch v0.4 --------- Co-authored-by: daxpedda <[email protected]> Co-authored-by: Kevin Lewi <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 01:55:54 -07:00 · 2024-09-23 23:43:55 -07:00
33 changed files with 2787 additions and 2998 deletions
@@ -1,102 +0,0 @@
-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
@@ -1,26 +0,0 @@
-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 }}
@@ -0,0 +1,12 @@
+version: 2
+
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
@@ -0,0 +1,180 @@
+name: Rust CI
+on:
+  push:
+    branches:
+      - main
+      - v0.4
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  cargo-audit:
+    name: Audit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache cargo-audit
+        uses: actions/cache@v4
+        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@v4
+
+      - 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.65.0
+    name: test
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - 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@v4
+      - 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@v4
+
+      - 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@v4
+
+      - 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@v4
+        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@v4
+
+      - name: Run Taplo
+        run: taplo fmt --check
@@ -0,0 +1,29 @@
+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 }}
@@ -1,12 +1,14 @@
 # Generated by Cargo
 # will have compiled files and executables
-debug/
-target/
-pkg/
-demo/
+/target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock

 # These are backup files generated by rustfmt
 **/*.rs.bk

-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
+# Editors
+.idea
+.vscode
@@ -1,99 +1,11 @@
 # Changelog

-## 1.0.0 (July 8, 2026)
-
-* Deduplicated serialization with `impl_serde_scalar`, `impl_serde_elem`, and `impl_serde_scalar_elem` macros
-* Moved `finalize_after_unblind` to `common.rs`, shared by OPRF and VOPRF
-* Added shared test helpers (`test_all_curves` macro, `prf` function)
-* Updated dependencies to stable releases
-
-## 1.0.0-rc.1 (July 3, 2026)
-
-* Reject trailing bytes in all `deserialize` methods
-* Reject identity element in `deterministic_blind_unchecked` to prevent blinding bypass
-* Added roundtrip, trailing bytes, truncated, and empty input tests for serialization
-
-## 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 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
-* 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
-* Updated subtle dependency to 2.6
-* 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.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.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
@@ -0,0 +1,76 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <opensource-conduct@fb.com>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
@@ -2,11 +2,30 @@
 We want to make contributing to this project as easy and transparent as
 possible.

+## Pull Requests
+We actively welcome your pull requests.
+
+1. Fork the repo and create your branch from `main`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. If you haven't already, complete the Contributor License Agreement ("CLA").
+
+## Contributor License Agreement ("CLA")
+In order to accept your pull request, we need you to submit a CLA. You only need
+to do this once to work on any of Facebook's open source projects.
+
+Complete your CLA here: <https://code.facebook.com/cla>
+
 ## Issues
 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.

+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
+disclosure of security bugs. In those cases, please go through the process
+outlined on that page and do not file a public issue.
+
 ## License
-By contributing to voprf-vx, you agree that your contributions will be
+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.
@@ -1,844 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
-
-[[package]]
-name = "base16ct"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd307490d624467aa6f74b0eabb77633d1f758a7b25f12bceb0b22e08d9726f6"
-
-[[package]]
-name = "bit-set"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
-dependencies = [
- "bit-vec",
-]
-
-[[package]]
-name = "bit-vec"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
-
-[[package]]
-name = "bitflags"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
-
-[[package]]
-name = "block-buffer"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
-dependencies = [
- "hybrid-array",
- "zeroize",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
-
-[[package]]
-name = "chacha20"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "cmov"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
-
-[[package]]
-name = "const-oid"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
-
-[[package]]
-name = "cpubits"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15b85f9c39137c3a891689859392b1bd49812121d0d61c9caf00d46ed5ce06ae"
-
-[[package]]
-name = "cpufeatures"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crypto-bigint"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a52aa3fcda4e6302a9f48734f234d35d4721b96f8fe07d073f07ce9df4f0271"
-dependencies = [
- "cpubits",
- "ctutils",
- "hybrid-array",
- "num-traits",
- "rand_core 0.10.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
-dependencies = [
- "hybrid-array",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "ctutils"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
-dependencies = [
- "cmov",
- "subtle",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "rand_core 0.10.1",
- "rustc_version",
- "serde",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "der"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "derive-where"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
-dependencies = [
- "block-buffer",
- "const-oid",
- "crypto-common",
- "zeroize",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "elliptic-curve"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d65aa39b3a5c1c9c1b745c9a019234bb7a21b77abcb4f4d266d706e2d577d65"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "crypto-common",
- "digest",
- "ff",
- "group",
- "hybrid-array",
- "rand_core 0.10.1",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
-
-[[package]]
-name = "ff"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f686ab92a9fb0eaf188f6c6c87b89490baa6fdb0db4544ba4dc47f7942489f"
-dependencies = [
- "rand_core 0.10.1",
- "subtle",
-]
-
-[[package]]
-name = "fiat-crypto"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "getrandom"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi 5.3.0",
- "wasip2",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
-dependencies = [
- "cfg-if",
- "libc",
- "r-efi 6.0.0",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "group"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fd1a1c7a5206c5b7a3f5a0d7ccd3ff85d0c8f5133d62a02680255b0004af5f4"
-dependencies = [
- "ff",
- "rand_core 0.10.1",
- "subtle",
-]
-
-[[package]]
-name = "hash2curve"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1eaf40612d7d854743e7189228a6d528f0f6e8502cf6a0cb831d28a218b7f3f6"
-dependencies = [
- "digest",
- "elliptic-curve",
-]
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hybrid-array"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
-dependencies = [
- "serde",
- "subtle",
- "typenum",
- "zeroize",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-
-[[package]]
-name = "libc"
-version = "0.2.186"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
-
-[[package]]
-name = "memchr"
-version = "2.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
-
-[[package]]
-name = "p256"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c9239b2dbc807adbbe147e8cf72ea7450c3a0aabe62cb8e75ff4ec22e1f72a"
-dependencies = [
- "elliptic-curve",
- "hash2curve",
- "primefield",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p384"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d17b851e6b3e378ab4ecb07fa2ed23f4d15f075735f8fec9fa1e7bdce5f8301f"
-dependencies = [
- "elliptic-curve",
- "fiat-crypto",
- "hash2curve",
- "primefield",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p521"
-version = "0.14.0-rc.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff42e4ace5424e3b6d7cb82514be89866b85af87015f80341e37dcc21a66ce6e"
-dependencies = [
- "base16ct",
- "elliptic-curve",
- "hash2curve",
- "primefield",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "primefield"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c555a6e4eb7d4e158fcb028c835c3b8642206ddc279b5c6b202ef9a8bdb592f4"
-dependencies = [
- "crypto-bigint",
- "crypto-common",
- "ff",
- "rand_core 0.10.1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "primeorder"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c9f42978c78a00e3d68f69fc03e57a234debae69da4020a4fb588fcdcd07b06"
-dependencies = [
- "elliptic-curve",
- "primefield",
- "wnaf",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.106"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "proptest"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744"
-dependencies = [
- "bit-set",
- "bit-vec",
- "bitflags",
- "num-traits",
- "rand 0.9.4",
- "rand_chacha",
- "rand_xorshift",
- "regex-syntax",
- "rusty-fork",
- "tempfile",
- "unarray",
-]
-
-[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
-name = "quote"
-version = "1.0.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "r-efi"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
-
-[[package]]
-name = "rand"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
-dependencies = [
- "rand_chacha",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
-dependencies = [
- "chacha20",
- "getrandom 0.4.3",
- "rand_core 0.10.1",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
-dependencies = [
- "getrandom 0.3.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
-
-[[package]]
-name = "rand_xorshift"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
-dependencies = [
- "rand_core 0.9.5",
-]
-
-[[package]]
-name = "regex"
-version = "1.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
-dependencies = [
- "bitflags",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "rusty-fork"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
-dependencies = [
- "fnv",
- "quick-error",
- "tempfile",
- "wait-timeout",
-]
-
-[[package]]
-name = "sec1"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d437c2f19203ce5f7122e507831de96f3d2d4d3be5af44a0b0a09d8a80e4d"
-dependencies = [
- "base16ct",
- "ctutils",
- "der",
- "hybrid-array",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
-
-[[package]]
-name = "serde"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.228"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
-dependencies = [
- "itoa",
- "memchr",
- "serde",
- "serde_core",
- "zmij",
-]
-
-[[package]]
-name = "sha2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "2.0.118"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
-dependencies = [
- "fastrand",
- "getrandom 0.4.3",
- "once_cell",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "typenum"
-version = "1.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
-
-[[package]]
-name = "unarray"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
-
-[[package]]
-name = "voprf-vx"
-version = "1.0.0"
-dependencies = [
- "curve25519-dalek",
- "derive-where",
- "digest",
- "displaydoc",
- "elliptic-curve",
- "hash2curve",
- "hex",
- "hybrid-array",
- "p256",
- "p384",
- "p521",
- "proptest",
- "rand 0.10.2",
- "rand_core 0.10.1",
- "regex",
- "serde",
- "serde_json",
- "sha2",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "wait-timeout"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "wasip2"
-version = "1.0.4+wasi-0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
-dependencies = [
- "wit-bindgen",
-]
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
-[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link",
-]
-
-[[package]]
-name = "wit-bindgen"
-version = "0.57.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
-
-[[package]]
-name = "wnaf"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab12e7090f27e2ffd9322651492942d50c2926094af30601e1964337db39daf1"
-dependencies = [
- "ff",
- "group",
- "hybrid-array",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75726053136156d419e285b9b7eddaaea9e3fea6ce32eed44a89901f0bd98de1"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4714fd92cf900833d49538023a9b3915155210801d1c1169eba513b2addefd71"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
-
-[[package]]
-name = "zmij"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
@@ -1,67 +1,69 @@
 [package]
-authors = ["VexaHub Developers", "Kevin Lewi <[email protected]>"]
+authors = ["Kevin Lewi <[email protected]>"]
 categories = ["no-std", "algorithms", "cryptography"]
 description = "An implementation of a verifiable oblivious pseudorandom function (VOPRF)"
-edition = "2024"
-keywords = ["oprf", "voprf", "cryptography", "oblivious-prf"]
-license = "MIT OR Apache-2.0"
-name = "voprf-vx"
+edition = "2021"
+keywords = ["oprf"]
+license = "MIT"
+name = "voprf"
 readme = "README.md"
-repository = "https://github.com/vexahub/voprf-vx/"
-rust-version = "1.87"
-version = "1.0.0"
+repository = "https://github.com/facebook/voprf/"
+rust-version = "1.65"
+version = "0.4.1"

 [features]
 alloc = []
 danger = []
-doctest = ["dep:p256", "dep:sha2"]
 default = ["ristretto255-ciphersuite", "dep:serde"]
-ristretto255 = ["dep:curve25519-dalek"]
+ristretto255 = ["dep:curve25519-dalek", "generic-array/more_lengths"]
 ristretto255-ciphersuite = ["ristretto255", "dep:sha2"]
-serde = ["curve25519-dalek?/serde", "hybrid-array/serde", "dep:serde"]
+serde = ["generic-array/serde", "dep:serde"]
 std = ["alloc"]

 [dependencies]
-curve25519-dalek = { version = "5", default-features = false, features = ["rand_core", "zeroize"], optional = true }
-derive-where = { version = "1", features = ["zeroize-on-drop"] }
-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 = { version = "0.4", features = ["zeroize"] }
-rand_core = { version = "0.10", default-features = false }
-serde = { version = "1", default-features = false, features = [
-    "derive",
+curve25519-dalek = { version = "4", default-features = false, features = [
+  "rand_core",
+  "zeroize",
 ], optional = true }
-sha2 = { version = "0.11", default-features = false, features = ["zeroize"], optional = true }
-p256 = { version = "0.14", default-features = false, features = ["hash2curve", "oprf"], optional = true }
+derive-where = { version = "1", features = ["zeroize-on-drop"] }
+digest = "0.10"
+displaydoc = { version = "0.2", default-features = false }
+elliptic-curve = { version = "0.13", features = [
+  "hash2curve",
+  "sec1",
+  "voprf",
+] }
+generic-array = "0.14"
+rand_core = { version = "0.6", default-features = false }
+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.5", default-features = false }
+zeroize = { version = "1.8", default-features = false }

 [dev-dependencies]
+generic-array = { version = "0.14", features = ["more_lengths"] }
 hex = "0.4"
-p256 = { version = "0.14", default-features = false, features = [
-    "hash2curve",
-    "oprf",
+p256 = { version = "0.13", default-features = false, features = [
+  "hash2curve",
+  "voprf",
 ] }
-p384 = { version = "0.14", default-features = false, features = [
-    "hash2curve",
-    "oprf",
+p384 = { version = "0.13", default-features = false, features = [
+  "hash2curve",
+  "voprf",
 ] }
-p521 = { version = "0.14.0-rc.15", default-features = false, features = [
-    "hash2curve",
-    "oprf",
+p521 = { version = "0.13.3", default-features = false, features = [
+  "hash2curve",
+  "voprf",
 ] }
 proptest = "1"
-rand = "0.10"
+rand = "0.8"
 regex = "1"
 serde_json = "1"
-sha2 = "0.11"
+sha2 = "0.10"

 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 targets = []
-features = ["doctest"]
@@ -1,14 +1,14 @@
-# voprf
+# voprf ![Build Status](https://github.com/facebook/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.

-This implementation is based on [RFC 9497](https://www.rfc-editor.org/rfc/rfc9497).
+This implementation is based on the [Internet Draft for VOPRF](https://github.com/cfrg/draft-irtf-cfrg-voprf).

 Documentation
 -------------

-The API can be found [here](https://docs.rs/voprf-vx/) along with an example for usage.
+The API can be found [here](https://docs.rs/voprf/) along with an example for usage.

 Installation
 ------------
@@ -16,19 +16,17 @@ Installation
 Add the following line to the dependencies of your `Cargo.toml`:

 ```
-voprf-vx = "1.0.0"
+voprf = "0.4.1"
 ```

 ### Minimum Supported Rust Version

-Rust **1.87** or higher.
+Rust **1.65** or higher.

 Contributors
 ------------

-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)).
+The author of this code is Kevin Lewi ([@kevinlewi](https://github.com/kevinlewi)).
 To learn more about contributing to this project, [see this document](./CONTRIBUTING.md).

 License
@@ -1,30 +0,0 @@
-{
-  "$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
-}
@@ -1 +1,8 @@
+format_code_in_doc_comments = true
+format_strings = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Module"
+license_template_path = ".cargo/license.rs"
 newline_style = "Unix"
+unstable_features = true
+wrap_comments = true
@@ -1,28 +1,29 @@
-// 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 digest::block_api::BlockSizeUser;
-use digest::typenum::{IsLess, IsLessOrEqual, U256};
+use digest::core_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker, OutputSizeUser};
-use hash2curve::{ExpandMsg, GroupDigest, MapToCurve, OprfParameters};
-use hybrid_array::ArraySize;
-use hybrid_array::typenum::{IsGreaterOrEqual, Prod, True, U2};
+use elliptic_curve::VoprfParameters;
+use generic_array::typenum::{IsLess, IsLessOrEqual, U256};
+
+use crate::Group;

 /// Configures the underlying primitives used in VOPRF
 pub trait CipherSuite
 where
-    <Self::Hash as OutputSizeUser>::OutputSize: ArraySize
-        + IsLess<U256>
-        + IsLessOrEqual<<Self::Hash as BlockSizeUser>::BlockSize, Output = True>
-        + IsGreaterOrEqual<Prod<<Self::Group as Group>::SecurityLevel, U2>, Output = True>,
+    <Self::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<Self::Hash as BlockSizeUser>::BlockSize>,
 {
    /// The ciphersuite identifier as dictated by
-    /// <https://www.rfc-editor.org/rfc/rfc9497>
-    const ID: &'static [u8];
+    /// <https://datatracker.ietf.org/doc/draft-irtf-cfrg-voprf/>
+    const ID: &'static str;

    /// A finite cyclic group along with a point representation that allows some
    /// customization on how to hash an input to a curve point. See [`Group`].
@@ -33,20 +34,16 @@ where
    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
+impl<T: VoprfParameters> 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>,
+    T::Hash: BlockSizeUser + Default + FixedOutput + HashMarker,
+    <T::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<T::Hash as BlockSizeUser>::BlockSize>,
 {
-    const ID: &'static [u8] = T::ID;
+    const ID: &'static str = T::ID;
+
    type Group = T;
-    type Hash = OprfHash<T>;
+
+    type Hash = T::Hash;
 }
@@ -1,18 +1,23 @@
-// 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.

 use core::convert::TryFrom;
-use core::iter::Map;
 use core::ops::Add;

 use derive_where::derive_where;
+use digest::core_api::BlockSizeUser;
 use digest::{Digest, Output, OutputSizeUser};
-use hybrid_array::typenum::{IsLess, U2, U9, U256, Unsigned};
-use hybrid_array::{Array, ArrayN, ArraySize};
-use rand_core::{TryCryptoRng, TryRng};
+use generic_array::sequence::Concat;
+use generic_array::typenum::{IsLess, IsLessOrEqual, Unsigned, U2, U256, U9};
+use generic_array::{ArrayLength, GenericArray};
+use rand_core::{CryptoRng, RngCore};
 use subtle::ConstantTimeEq;

 #[cfg(feature = "serde")]
@@ -25,14 +30,14 @@ use crate::{CipherSuite, Error, Group, InternalError, Result};
 ///////////////

 pub(crate) const STR_FINALIZE: [u8; 8] = *b"Finalize";
-pub(crate) const STR_SEED: ArrayN<u8, 5> = Array(*b"Seed-");
-pub(crate) const STR_DERIVE_KEYPAIR: ArrayN<u8, 13> = Array(*b"DeriveKeyPair");
+pub(crate) const STR_SEED: [u8; 5] = *b"Seed-";
+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_OPRF: [u8; 7] = *b"OPRFV1-";
-pub(crate) const STR_HASH_TO_SCALAR: ArrayN<u8, 13> = Array(*b"HashToScalar-");
-pub(crate) const STR_HASH_TO_GROUP: ArrayN<u8, 12> = Array(*b"HashToGroup-");
+pub(crate) const STR_VOPRF: [u8; 8] = *b"VOPRF10-";
+pub(crate) const STR_HASH_TO_SCALAR: [u8; 13] = *b"HashToScalar-";
+pub(crate) const STR_HASH_TO_GROUP: [u8; 12] = *b"HashToGroup-";

 /// Determines the mode of operation (either base mode or verifiable mode). This
 /// is only used for custom implementations for [`Group`].
@@ -74,7 +79,10 @@ impl Mode {
 pub struct BlindedElement<CS: CipherSuite>(
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
    pub(crate)  <CS::Group as Group>::Elem,
-);
+)
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>;

 /// The server's response to the [BlindedElement] message from a client (either
 /// verifiable or not) to a server (either verifiable or not).
@@ -88,7 +96,10 @@ pub struct BlindedElement<CS: CipherSuite>(
 pub struct EvaluationElement<CS: CipherSuite>(
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
    pub(crate)  <CS::Group as Group>::Elem,
-);
+)
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>;

 /// Contains prepared [`EvaluationElement`]s by a server batch evaluate
 /// preparation.
@@ -99,7 +110,10 @@ pub struct EvaluationElement<CS: CipherSuite>(
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct PreparedEvaluationElement<CS: CipherSuite>(pub(crate) EvaluationElement<CS>);
+pub struct PreparedEvaluationElement<CS: CipherSuite>(pub(crate) EvaluationElement<CS>)
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>;

 /// A proof produced by a server that the OPRF output matches against a server
 /// public key.
@@ -110,7 +124,11 @@ pub struct PreparedEvaluationElement<CS: CipherSuite>(pub(crate) EvaluationEleme
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct Proof<CS: CipherSuite> {
+pub struct Proof<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) c_scalar: <CS::Group as Group>::Scalar,
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
@@ -124,7 +142,7 @@ pub struct Proof<CS: CipherSuite> {

 /// Can only fail with [`Error::Batch`].
 #[allow(clippy::many_single_char_names)]
-pub(crate) fn generate_proof<CS: CipherSuite, R: TryRng + TryCryptoRng>(
+pub(crate) fn generate_proof<CS: CipherSuite, R: RngCore + CryptoRng>(
    rng: &mut R,
    k: <CS::Group as Group>::Scalar,
    a: <CS::Group as Group>::Elem,
@@ -132,12 +150,16 @@ pub(crate) fn generate_proof<CS: CipherSuite, R: TryRng + TryCryptoRng>(
    cs: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
    ds: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
    mode: Mode,
-) -> Result<Proof<CS>> {
-    // https://www.rfc-editor.org/rfc/rfc9497#section-2.2.1
+) -> Result<Proof<CS>>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    // https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html#section-2.2.1

    let (m, z) = compute_composites::<CS, _, _>(Some(k), b, cs, ds, mode)?;

-    let r = CS::Group::random_scalar(rng)?;
+    let r = CS::Group::random_scalar(rng);
    let t2 = a * &r;
    let t3 = m * &r;

@@ -174,7 +196,7 @@ pub(crate) fn generate_proof<CS: CipherSuite, R: TryRng + TryCryptoRng>(
        &STR_CHALLENGE,
    ];

-    let dst = Dst::new::<CS, _>(STR_HASH_TO_SCALAR, mode);
+    let dst = Dst::new::<CS, _, _>(STR_HASH_TO_SCALAR, mode);
    // This can't fail, the size of the `input` is known.
    let c_scalar = CS::Group::hash_to_scalar::<CS::Hash>(&h2_input, &dst.as_dst()).unwrap();
    let s_scalar = r - &(c_scalar * &k);
@@ -191,8 +213,12 @@ pub(crate) fn verify_proof<CS: CipherSuite>(
    ds: impl ExactSizeIterator<Item = <CS::Group as Group>::Elem>,
    proof: &Proof<CS>,
    mode: Mode,
-) -> Result<()> {
-    // https://www.rfc-editor.org/rfc/rfc9497#section-2.2.2
+) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    // https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html#section-2.2.2
    let (m, z) = compute_composites::<CS, _, _>(None, b, cs, ds, mode)?;
    let t2 = (a * &proof.s_scalar) + &(b * &proof.c_scalar);
    let t3 = (m * &proof.s_scalar) + &(z * &proof.c_scalar);
@@ -230,7 +256,7 @@ pub(crate) fn verify_proof<CS: CipherSuite>(
        &STR_CHALLENGE,
    ];

-    let dst = Dst::new::<CS, _>(STR_HASH_TO_SCALAR, mode);
+    let dst = Dst::new::<CS, _, _>(STR_HASH_TO_SCALAR, mode);
    // This can't fail, the size of the `input` is known.
    let c = CS::Group::hash_to_scalar::<CS::Hash>(&h2_input, &dst.as_dst()).unwrap();

@@ -256,8 +282,12 @@ fn compute_composites<
    c_slice: IC,
    d_slice: ID,
    mode: Mode,
-) -> Result<ComputeCompositesResult<CS>> {
-    // https://www.rfc-editor.org/rfc/rfc9497#section-2.2.1
+) -> Result<ComputeCompositesResult<CS>>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    // https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html#section-2.2.1

    let elem_len = <CS::Group as Group>::ElemLen::U16.to_be_bytes();

@@ -268,7 +298,7 @@ fn compute_composites<
    let len = u16::try_from(c_slice.len()).map_err(|_| Error::Batch)?;

    // seedDST = "Seed-" || contextString
-    let seed_dst = Dst::new::<CS, _>(STR_SEED, mode);
+    let seed_dst = Dst::new::<CS, _, _>(STR_SEED, mode);

    // h1Input = I2OSP(len(Bm), 2) || Bm ||
    //           I2OSP(len(seedDST), 2) || seedDST
@@ -279,7 +309,7 @@ fn compute_composites<
        .chain_update(seed_dst.i2osp_2())
        .chain_update_multi(&seed_dst.as_dst())
        .finalize();
-    let seed_len = i2osp_2_array::<<CS::Hash as OutputSizeUser>::OutputSize>();
+    let seed_len = i2osp_2_array(&seed);

    let mut m = CS::Group::identity_elem();
    let mut z = CS::Group::identity_elem();
@@ -304,7 +334,7 @@ fn compute_composites<
            &STR_COMPOSITE,
        ];

-        let dst = Dst::new::<CS, _>(STR_HASH_TO_SCALAR, mode);
+        let dst = Dst::new::<CS, _, _>(STR_HASH_TO_SCALAR, mode);
        // This can't fail, the size of the `input` is known.
        let di = CS::Group::hash_to_scalar::<CS::Hash>(&h2_input, &dst.as_dst()).unwrap();
        m = c * &di + &m;
@@ -332,8 +362,12 @@ pub(crate) fn derive_key_internal<CS: CipherSuite>(
    seed: &[u8],
    info: &[u8],
    mode: Mode,
-) -> Result<<CS::Group as Group>::Scalar, Error> {
-    let dst = Dst::new::<CS, _>(STR_DERIVE_KEYPAIR, mode);
+) -> Result<<CS::Group as Group>::Scalar, Error>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    let dst = Dst::new::<CS, _, _>(STR_DERIVE_KEYPAIR, mode);

    let info_len = i2osp_2(info.len()).map_err(|_| Error::DeriveKeyPair)?;

@@ -366,7 +400,11 @@ pub fn derive_key<CS: CipherSuite>(
    seed: &[u8],
    info: &[u8],
    mode: Mode,
-) -> Result<<CS::Group as Group>::Scalar, Error> {
+) -> Result<<CS::Group as Group>::Scalar, Error>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    derive_key_internal::<CS>(seed, info, mode)
 }

@@ -380,7 +418,11 @@ pub(crate) fn derive_keypair<CS: CipherSuite>(
    seed: &[u8],
    info: &[u8],
    mode: Mode,
-) -> Result<DeriveKeypairResult<CS>, Error> {
+) -> Result<DeriveKeypairResult<CS>, Error>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    let sk_s = derive_key_internal::<CS>(seed, info, mode)?;
    let pk_s = CS::Group::base_elem() * &sk_s;

@@ -396,14 +438,12 @@ pub(crate) fn deterministic_blind_unchecked<CS: CipherSuite>(
    input: &[u8],
    blind: &<CS::Group as Group>::Scalar,
    mode: Mode,
-) -> Result<<CS::Group as Group>::Elem> {
+) -> Result<<CS::Group as Group>::Elem>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    let hashed_point = hash_to_group::<CS>(input, mode)?;
-
-    // Identity element would nullify blinding, revealing the input.
-    if CS::Group::is_identity_elem(hashed_point).into() {
-        return Err(Error::Input);
-    }
-
    Ok(hashed_point * blind)
 }

@@ -411,8 +451,12 @@ pub(crate) fn deterministic_blind_unchecked<CS: CipherSuite>(
 pub(crate) fn hash_to_group<CS: CipherSuite>(
    input: &[u8],
    mode: Mode,
-) -> Result<<CS::Group as Group>::Elem> {
-    let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, mode);
+) -> Result<<CS::Group as Group>::Elem>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, mode);
    CS::Group::hash_to_curve::<CS::Hash>(&[input], &dst.as_dst()).map_err(|_| Error::Input)
 }

@@ -421,8 +465,12 @@ pub(crate) fn hash_to_group<CS: CipherSuite>(
 pub(crate) fn server_evaluate_hash_input<CS: CipherSuite>(
    input: &[u8],
    info: Option<&[u8]>,
-    issued_element: Array<u8, <<CS as CipherSuite>::Group as Group>::ElemLen>,
-) -> Result<Output<CS::Hash>> {
+    issued_element: GenericArray<u8, <<CS as CipherSuite>::Group as Group>::ElemLen>,
+) -> Result<Output<CS::Hash>>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    // OPRF & VOPRF
    // hashInput = I2OSP(len(input), 2) || input ||
    //             I2OSP(len(issuedElement), 2) || issuedElement ||
@@ -444,61 +492,45 @@ pub(crate) fn server_evaluate_hash_input<CS: CipherSuite>(
            .chain_update(info.as_ref());
    }
    Ok(hash
-        .chain_update(i2osp_2(issued_element.as_slice().len()).map_err(|_| Error::Input)?)
+        .chain_update(i2osp_2(issued_element.as_ref().len()).map_err(|_| Error::Input)?)
        .chain_update(issued_element)
        .chain_update(STR_FINALIZE)
        .finalize())
 }

-pub(crate) type FinalizeAfterUnblindResult<'a, C, I, IE> = Map<
-    IE,
-    fn((I, <<C as CipherSuite>::Group as Group>::Elem)) -> Result<Output<<C as CipherSuite>::Hash>>,
->;
-
-/// Returned values can only fail with [`Error::Input`].
-pub(crate) fn finalize_after_unblind<
-    'a,
-    CS: CipherSuite,
-    I: AsRef<[u8]>,
-    IE: 'a + Iterator<Item = (I, <CS::Group as Group>::Elem)>,
->(
-    inputs_and_unblinded_elements: IE,
-) -> FinalizeAfterUnblindResult<'a, CS, I, IE> {
-    inputs_and_unblinded_elements.map(|(input, unblinded_element)| {
-        let elem_len = <CS::Group as Group>::ElemLen::U16.to_be_bytes();
-
-        Ok(CS::Hash::new()
-            .chain_update(i2osp_2(input.as_ref().len()).map_err(|_| Error::Input)?)
-            .chain_update(input.as_ref())
-            .chain_update(elem_len)
-            .chain_update(CS::Group::serialize_elem(unblinded_element))
-            .chain_update(STR_FINALIZE)
-            .finalize())
-    })
+pub(crate) struct Dst<L: ArrayLength<u8>> {
+    dst_1: GenericArray<u8, L>,
+    dst_2: [u8; 2],
 }

-pub(crate) struct Dst<L: ArraySize> {
-    dst_1: Array<u8, L>,
-    dst_2: &'static [u8],
-}
-
-impl<L: ArraySize> Dst<L> {
-    pub(crate) fn new<CS, TL>(par_1: Array<u8, TL>, mode: Mode) -> Self
+impl<L: ArrayLength<u8>> Dst<L> {
+    pub(crate) fn new<CS: CipherSuite, T, TL>(par_1: T, mode: Mode) -> Self
    where
-        CS: CipherSuite,
-        TL: ArraySize + Add<U9, Output = L>,
+        T: Into<GenericArray<u8, TL>>,
+        TL: ArrayLength<u8> + 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://www.rfc-editor.org/rfc/rfc9497#section-3.1>
-        let par_2 = ArrayN::<u8, 7>::from(STR_OPRF)
-            .concat(ArrayN::<u8, 1>::from([mode.to_u8()]))
-            .concat(ArrayN::<u8, 1>::from([b'-']));
+        // <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 dst_1 = par_1.concat(par_2);
-        let dst_2 = CS::ID;
+        let dst_2 = cs_id_u16.to_be_bytes();

        assert!(
-            L::USIZE + dst_2.len() <= u16::MAX.into(),
+            L::USIZE + 2 <= u16::MAX.into(),
            "constructed DST longer then {}",
            u16::MAX
        );
@@ -507,13 +539,11 @@ impl<L: ArraySize> Dst<L> {
    }

    pub(crate) fn as_dst(&self) -> [&[u8]; 2] {
-        [&self.dst_1, self.dst_2]
+        [&self.dst_1, &self.dst_2]
    }

    pub(crate) fn i2osp_2(&self) -> [u8; 2] {
-        u16::try_from(L::USIZE + self.dst_2.len())
-            .unwrap()
-            .to_be_bytes()
+        u16::try_from(L::USIZE + 2).unwrap().to_be_bytes()
    }
 }

@@ -545,6 +575,8 @@ pub(crate) fn i2osp_2(input: usize) -> Result<[u8; 2], InternalError> {
        .map_err(|_| InternalError::I2osp)
 }

-pub(crate) fn i2osp_2_array<L: ArraySize + IsLess<U256>>() -> Array<u8, U2> {
+pub(crate) fn i2osp_2_array<L: ArrayLength<u8> + IsLess<U256>>(
+    _: &GenericArray<u8, L>,
+) -> GenericArray<u8, U2> {
    L::U16.to_be_bytes().into()
 }
@@ -1,14 +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.

 //! Errors which are produced during an execution of the protocol

+use displaydoc::Display;
+
 /// [`Result`](core::result::Result) shorthand that uses [`Error`].
 pub type Result<T, E = Error> = core::result::Result<T, E>;

 /// Represents an error in the manipulation of internal cryptographic data
-#[derive(Clone, Copy, Debug, displaydoc::Display, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Debug, Display, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub enum Error {
    /// Size of info is longer then [`u16::MAX`].
    Info,
@@ -18,14 +24,12 @@ pub enum Error {
    DeriveKeyPair,
    /// Failure to deserialize bytes
    Deserialization,
-    /// Batched items are more than [`u16::MAX`] or length don't match.
+    /// Batched items are more then [`u16::MAX`] or length don't match.
    Batch,
    /// In verifiable mode, occurs when the proof failed to verify
    ProofVerification,
    /// The protocol has failed and can't be completed.
    Protocol,
-    /// Random number generator failure.
-    Rng,
 }

 /// Only used to implement [`Group`](crate::Group).
@@ -37,4 +41,5 @@ pub enum InternalError {
    I2osp,
 }

-impl core::error::Error for Error {}
+#[cfg(feature = "std")]
+impl std::error::Error for Error {}
@@ -1,73 +1,59 @@
-// 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;
-use digest::typenum::{IsLess, IsLessOrEqual, U256};
+use digest::core_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker};
 use elliptic_curve::group::cofactor::CofactorGroup;
-use elliptic_curve::sec1::{FromSec1Point, ModulusSize, ToSec1Point};
+use elliptic_curve::hash2curve::{ExpandMsgXmd, FromOkm, GroupDigest};
+use elliptic_curve::sec1::{FromEncodedPoint, ModulusSize, ToEncodedPoint};
 use elliptic_curve::{
-    AffinePoint, Field, FieldBytes, FieldBytesSize, Group as _, ProjectivePoint, PublicKey, Scalar,
-    SecretKey,
+    AffinePoint, Field, FieldBytesSize, Group as _, ProjectivePoint, PublicKey, Scalar, SecretKey,
 };
-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 generic_array::typenum::{IsLess, IsLessOrEqual, U256};
+use generic_array::GenericArray;
+use rand_core::{CryptoRng, RngCore};

 use super::Group;
 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,
-    C::SecurityLevel: Mul<U2>,
-    C::SecurityLevel: ArraySize,
-    <C::SecurityLevel as Mul<U2>>::Output: ArraySize,
-    ProjectivePoint<Self>: CofactorGroup + ToSec1Point<Self>,
-    ScalarLen<Self>: ModulusSize,
-    ScalarLen<Self>: ArraySize,
-    ScalarLen<Self>: hybrid_array::typenum::NonZero,
-    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>>,
-    Sum<ScalarLen<Self>, ElemLen<Self>>: ArraySize,
-    // `ProofLen`
-    ScalarLen<Self>: Add<ScalarLen<Self>>,
-    Sum<ScalarLen<Self>, ScalarLen<Self>>: ArraySize,
-    ElemLen<Self>: ArraySize,
+    ProjectivePoint<Self>: CofactorGroup + ToEncodedPoint<Self>,
+    FieldBytesSize<Self>: ModulusSize,
+    AffinePoint<Self>: FromEncodedPoint<Self> + ToEncodedPoint<Self>,
+    Scalar<Self>: FromOkm,
 {
    type Elem = ProjectivePoint<Self>;

-    type ElemLen = ElemLen<Self>;
+    type ElemLen = <FieldBytesSize<Self> as ModulusSize>::CompressedPointSize;

    type Scalar = Scalar<Self>;

-    type ScalarLen = ScalarLen<Self>;
-
-    type SecurityLevel = C::SecurityLevel;
+    type ScalarLen = FieldBytesSize<Self>;

    // 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> {
-        Self::hash_from_bytes(input, dst).map_err(|_| InternalError::Input)
+    // https://datatracker.ietf.org/doc/html/draft-irtf-cfrg-hash-to-curve-11#section-3
+    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>,
+    {
+        Self::hash_from_bytes::<ExpandMsgXmd<H>>(input, dst).map_err(|_| InternalError::Input)
    }

    // Implements the `HashToScalar()` function
    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>
-            + IsGreaterOrEqual<Prod<C::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>,
    {
-        hash_to_scalar::<C, ExpandMsgXmd<H>, <C as MapToCurve>::Length>(input, dst)
+        <Self as GroupDigest>::hash_to_scalar::<ExpandMsgXmd<H>>(input, dst)
            .map_err(|_| InternalError::Input)
    }

@@ -79,10 +65,10 @@ where
        ProjectivePoint::<Self>::identity()
    }

-    fn serialize_elem(elem: Self::Elem) -> Array<u8, Self::ElemLen> {
-        let bytes = elem.to_sec1_point(true);
+    fn serialize_elem(elem: Self::Elem) -> GenericArray<u8, Self::ElemLen> {
+        let bytes = elem.to_encoded_point(true);
        let bytes = bytes.as_bytes();
-        let mut result = Array::default();
+        let mut result = GenericArray::default();
        result[..bytes.len()].copy_from_slice(bytes);
        result
    }
@@ -93,16 +79,8 @@ where
            .map_err(|_| Error::Deserialization)
    }

-    fn random_scalar<R: TryCryptoRng>(rng: &mut R) -> Result<Self::Scalar> {
-        loop {
-            let mut bytes = FieldBytes::<Self>::default();
-
-            rng.try_fill_bytes(&mut bytes).map_err(|_| Error::Rng)?;
-
-            if let Ok(key) = SecretKey::<Self>::from_slice(&bytes) {
-                return Ok(*key.to_nonzero_scalar());
-            }
-        }
+    fn random_scalar<R: RngCore + CryptoRng>(rng: &mut R) -> Self::Scalar {
+        *SecretKey::<Self>::random(rng).to_nonzero_scalar()
    }

    fn invert_scalar(scalar: Self::Scalar) -> Self::Scalar {
@@ -118,11 +96,8 @@ where
        Scalar::<Self>::ZERO
    }

-    fn serialize_scalar(scalar: Self::Scalar) -> Array<u8, Self::ScalarLen> {
-        let bytes: FieldBytes<Self> = scalar.into();
-        let mut result = Array::<u8, Self::ScalarLen>::default();
-        result.as_mut_slice().copy_from_slice(bytes.as_ref());
-        result
+    fn serialize_scalar(scalar: Self::Scalar) -> GenericArray<u8, Self::ScalarLen> {
+        scalar.into()
    }

    fn deserialize_scalar(scalar_bits: &[u8]) -> Result<Self::Scalar> {
@@ -1,6 +1,10 @@
-// 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

@@ -10,11 +14,11 @@ mod ristretto;

 use core::ops::{Add, Mul, Sub};

-use digest::block_api::BlockSizeUser;
+use digest::core_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker};
-use hybrid_array::typenum::{IsGreaterOrEqual, IsLess, IsLessOrEqual, Prod, Sum, True, U2, U256};
-use hybrid_array::{Array, ArraySize};
-use rand_core::{TryCryptoRng, TryRng};
+use generic_array::typenum::{IsLess, IsLessOrEqual, U256};
+use generic_array::{ArrayLength, GenericArray};
+use rand_core::{CryptoRng, RngCore};
 #[cfg(feature = "ristretto255")]
 pub use ristretto::Ristretto255;
 use subtle::{Choice, ConstantTimeEq};
@@ -23,16 +27,8 @@ use zeroize::Zeroize;
 use crate::{InternalError, Result};

 /// A prime-order subgroup of a base field (EC, prime-order field ...). This
-/// subgroup is noted additively — as in the RFC — in this trait.
-pub trait Group
-where
-    // `VoprfClientLen`, `PoprfClientLen`, `VoprfServerLen`, `PoprfServerLen`
-    Self::ScalarLen: Add<Self::ElemLen>,
-    Sum<Self::ScalarLen, Self::ElemLen>: ArraySize,
-    // `ProofLen`
-    Self::ScalarLen: Add<Self::ScalarLen>,
-    Sum<Self::ScalarLen, Self::ScalarLen>: ArraySize,
-{
+/// subgroup is noted additively — as in the draft RFC — in this trait.
+pub trait Group {
    /// The type of group elements
    type Elem: ConstantTimeEq
        + Copy
@@ -41,7 +37,7 @@ where
        + for<'a> Mul<&'a Self::Scalar, Output = Self::Elem>;

    /// The byte length necessary to represent group elements
-    type ElemLen: ArraySize + 'static;
+    type ElemLen: ArrayLength<u8> + 'static;

    /// The type of base field scalars
    type Scalar: ConstantTimeEq
@@ -52,15 +48,7 @@ where
        + for<'a> Sub<&'a Self::Scalar, Output = Self::Scalar>;

    /// The byte length necessary to represent scalars
-    type ScalarLen: ArraySize + 'static;
-
-    /// Security parameter `k` in bytes (i.e. `k / 8`), as defined in
-    /// [RFC 9380 §8](https://www.rfc-editor.org/rfc/rfc9380#section-8).
-    ///
-    /// 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 + Mul<U2>;
+    type ScalarLen: ArrayLength<u8> + 'static;

    /// Transforms a password and domain separation tag (DST) into a curve point
    ///
@@ -70,9 +58,7 @@ 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>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>;

    /// Hashes a slice of pseudo-random bytes to a scalar
    ///
@@ -82,9 +68,7 @@ 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>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>;

    /// Get the base point for the group
    fn base_elem() -> Self::Elem;
@@ -98,7 +82,7 @@ where
    }

    /// Serializes the `self` group element
-    fn serialize_elem(elem: Self::Elem) -> Array<u8, Self::ElemLen>;
+    fn serialize_elem(elem: Self::Elem) -> GenericArray<u8, Self::ElemLen>;

    /// Return an element from its fixed-length bytes representation. If the
    /// element is the identity element, return an error.
@@ -108,11 +92,8 @@ where
    /// is not a valid point on the group or the identity element.
    fn deserialize_elem(element_bits: &[u8]) -> Result<Self::Elem>;

-    /// Picks a scalar at random.
-    ///
-    /// # Errors
-    /// [`Error::Rng`](crate::Error::Rng) if the random number generator fails.
-    fn random_scalar<R: TryRng + TryCryptoRng>(rng: &mut R) -> Result<Self::Scalar>;
+    /// picks a scalar at random
+    fn random_scalar<R: RngCore + CryptoRng>(rng: &mut R) -> Self::Scalar;

    /// The multiplicative inverse of this scalar
    fn invert_scalar(scalar: Self::Scalar) -> Self::Scalar;
@@ -125,7 +106,7 @@ where
    fn zero_scalar() -> Self::Scalar;

    /// Serializes a scalar to bytes
-    fn serialize_scalar(scalar: Self::Scalar) -> Array<u8, Self::ScalarLen>;
+    fn serialize_scalar(scalar: Self::Scalar) -> GenericArray<u8, Self::ScalarLen>;

    /// Return a scalar from its fixed-length bytes representation. If the
    /// scalar is zero or invalid, then return an error.
@@ -1,21 +1,21 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and affiliates.
-
-use core::num::NonZeroU16;
+//
+// 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 curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
 use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
 use curve25519_dalek::traits::Identity;
-use digest::block_api::BlockSizeUser;
+use digest::core_api::BlockSizeUser;
 use digest::{FixedOutput, HashMarker};
-use hash2curve::{ExpandMsg, ExpandMsgXmd, Expander};
-use hybrid_array::Array;
-use hybrid_array::typenum::{
-    IsGreaterOrEqual, IsLess, IsLessOrEqual, Prod, True, U2, U16, U32, U256,
-};
-use rand_core::{TryCryptoRng, TryRng};
+use elliptic_curve::hash2curve::{ExpandMsg, ExpandMsgXmd, Expander};
+use generic_array::typenum::{IsLess, IsLessOrEqual, U256, U32, U64};
+use generic_array::GenericArray;
+use rand_core::{CryptoRng, RngCore};
 use subtle::ConstantTimeEq;

 use super::Group;
@@ -27,7 +27,7 @@ pub struct Ristretto255;

 #[cfg(feature = "ristretto255-ciphersuite")]
 impl crate::CipherSuite for Ristretto255 {
-    const ID: &'static [u8] = b"ristretto255-SHA512";
+    const ID: &'static str = "ristretto255-SHA512";

    type Group = Ristretto255;

@@ -43,34 +43,34 @@ impl Group for Ristretto255 {

    type ScalarLen = U32;

-    type SecurityLevel = U16;
-
    // Implements the `hash_to_ristretto255()` function from
-    // https://www.rfc-editor.org/rfc/rfc9380.html#appendix-B
+    // https://www.ietf.org/archive/id/draft-irtf-cfrg-hash-to-curve-10.txt
    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>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>,
    {
-        let uniform_bytes = expand_uniform_bytes::<H>(input, dst)?;
+        let mut uniform_bytes = GenericArray::<_, U64>::default();
+        ExpandMsgXmd::<H>::expand_message(input, dst, 64)
+            .map_err(|_| InternalError::Input)?
+            .fill_bytes(&mut uniform_bytes);

-        Ok(RistrettoPoint::from_uniform_bytes(&uniform_bytes))
+        Ok(RistrettoPoint::from_uniform_bytes(&uniform_bytes.into()))
    }

    // Implements the `HashToScalar()` function from
-    // https://www.rfc-editor.org/rfc/rfc9497#section-4.1
+    // https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-07.html#section-4.1
    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>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize>,
    {
-        let uniform_bytes = expand_uniform_bytes::<H>(input, dst)?;
+        let mut uniform_bytes = GenericArray::<_, U64>::default();
+        ExpandMsgXmd::<H>::expand_message(input, dst, 64)
+            .map_err(|_| InternalError::Input)?
+            .fill_bytes(&mut uniform_bytes);

-        Ok(Scalar::from_bytes_mod_order_wide(&uniform_bytes))
+        Ok(Scalar::from_bytes_mod_order_wide(&uniform_bytes.into()))
    }

    fn base_elem() -> Self::Elem {
@@ -82,7 +82,7 @@ impl Group for Ristretto255 {
    }

    // serialization of a group element
-    fn serialize_elem(elem: Self::Elem) -> Array<u8, Self::ElemLen> {
+    fn serialize_elem(elem: Self::Elem) -> GenericArray<u8, Self::ElemLen> {
        elem.compress().to_bytes().into()
    }

@@ -94,14 +94,12 @@ impl Group for Ristretto255 {
            .ok_or(Error::Deserialization)
    }

-    fn random_scalar<R: TryRng + TryCryptoRng>(rng: &mut R) -> Result<Self::Scalar> {
+    fn random_scalar<R: RngCore + CryptoRng>(rng: &mut R) -> Self::Scalar {
        loop {
-            let mut scalar_bytes = [0u8; 32];
-            rng.try_fill_bytes(&mut scalar_bytes)
-                .map_err(|_| Error::Rng)?;
+            let scalar = Scalar::random(rng);

-            if let Ok(scalar) = Self::deserialize_scalar(&scalar_bytes) {
-                break Ok(scalar);
+            if scalar != Scalar::ZERO {
+                break scalar;
            }
        }
    }
@@ -119,7 +117,7 @@ impl Group for Ristretto255 {
        Scalar::ZERO
    }

-    fn serialize_scalar(scalar: Self::Scalar) -> Array<u8, Self::ScalarLen> {
+    fn serialize_scalar(scalar: Self::Scalar) -> GenericArray<u8, Self::ScalarLen> {
        scalar.to_bytes().into()
    }

@@ -132,22 +130,3 @@ impl Group for Ristretto255 {
            .ok_or(Error::Deserialization)
    }
 }
-
-// HELPERS
-
-fn expand_uniform_bytes<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<[u8; 64], InternalError>
-where
-    H: BlockSizeUser + Default + FixedOutput + HashMarker,
-    H::OutputSize: IsLess<U256>
-        + IsLessOrEqual<H::BlockSize, Output = True>
-        + IsGreaterOrEqual<Prod<U16, U2>, Output = True>,
-{
-    let mut uniform_bytes = [0u8; 64];
-
-    <ExpandMsgXmd<H> as ExpandMsg<U16>>::expand_message(input, dst, NonZeroU16::new(64).unwrap())
-        .map_err(|_| InternalError::Input)?
-        .fill_bytes(&mut uniform_bytes)
-        .map_err(|_| InternalError::Input)?;
-
-    Ok(uniform_bytes)
-}
@@ -1,6 +1,10 @@
-// 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

@@ -1,11 +1,17 @@
-// 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)
 //!
 //! Note: This implementation is in sync with
-//! [RFC 9497](https://www.rfc-editor.org/rfc/rfc9497).
+//! [draft-irtf-cfrg-voprf-11](https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html),
+//! but this specification is subject to change, until the final version
+//! published by the IETF.
 //!
 //! # Overview
 //!
@@ -16,7 +22,7 @@
 //! We will use the following choice in this example:
 //!
 //! ```ignore
-//! type CipherSuite = voprf_vx::Ristretto255;
+//! type CipherSuite = voprf::Ristretto255;
 //! ```
 //!
 //! ## Modes of Operation
@@ -47,14 +53,14 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! use rand::rngs::SysRng;
-//! use rand::Rng;
-//! use voprf_vx::OprfServer;
+//! use rand::rngs::OsRng;
+//! use rand::RngCore;
+//! use voprf::OprfServer;
 //!
-//! let mut server_rng = SysRng;
+//! let mut server_rng = OsRng;
 //! let server = OprfServer::<CipherSuite>::new(&mut server_rng);
 //! ```
 //!
@@ -67,14 +73,14 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! use rand::rngs::SysRng;
-//! use rand::Rng;
-//! use voprf_vx::OprfClient;
+//! use rand::rngs::OsRng;
+//! use rand::RngCore;
+//! use voprf::OprfClient;
 //!
-//! let mut client_rng = SysRng;
+//! let mut client_rng = OsRng;
 //! let client_blind_result = OprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
 //!     .expect("Unable to construct client");
 //! ```
@@ -88,19 +94,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::OprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::OprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = OprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::OprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let server_evaluate_result = server.blind_evaluate(&client_blind_result.message);
 //! ```
@@ -113,19 +119,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::OprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::OprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = OprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::OprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
 //! let client_finalize_result = client_blind_result
@@ -146,19 +152,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::OprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::OprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = OprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::OprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
 //! let client_finalize_result = client_blind_result
@@ -193,14 +199,14 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! use rand::rngs::SysRng;
-//! use rand::Rng;
-//! use voprf_vx::VoprfServer;
+//! use rand::rngs::OsRng;
+//! use rand::RngCore;
+//! use voprf::VoprfServer;
 //!
-//! let mut server_rng = SysRng;
+//! let mut server_rng = OsRng;
 //! let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //!
 //! // To be sent to the client
@@ -220,14 +226,14 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! use rand::rngs::SysRng;
-//! use rand::Rng;
-//! use voprf_vx::VoprfClient;
+//! use rand::rngs::OsRng;
+//! use rand::RngCore;
+//! use voprf::VoprfClient;
 //!
-//! let mut client_rng = SysRng;
+//! let mut client_rng = OsRng;
 //! let client_blind_result = VoprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
 //!     .expect("Unable to construct client");
 //! ```
@@ -242,19 +248,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::{VoprfServerEvaluateResult, VoprfClient};
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::{VoprfServerEvaluateResult, VoprfClient};
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = VoprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerEvaluateResult { message, proof } =
 //!     server.blind_evaluate(&mut server_rng, &client_blind_result.message);
@@ -269,19 +275,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::VoprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::VoprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = VoprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
 //! #     &mut server_rng,
@@ -310,19 +316,19 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::VoprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::VoprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let client_blind_result = VoprfClient::<CipherSuite>::blind(
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
 //! #     &mut server_rng,
@@ -364,13 +370,13 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::VoprfClient;
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::VoprfClient;
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! let mut client_rng = SysRng;
+//! let mut client_rng = OsRng;
 //! let mut client_states = vec![];
 //! let mut client_messages = vec![];
 //! for _ in 0..10 {
@@ -388,13 +394,13 @@
 //!
 //! ```
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let mut client_states = vec![];
 //! # let mut client_messages = vec![];
 //! # for _ in 0..10 {
@@ -405,8 +411,8 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
-//! let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let prepared_evaluation_elements = server.batch_blind_evaluate_prepare(client_messages.iter());
 //! let prepared_elements: Vec<_> = prepared_evaluation_elements.collect();
@@ -422,13 +428,13 @@
 //! ```
 //! # #[cfg(feature = "alloc")] {
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::{VoprfServerBatchEvaluateResult, VoprfClient};
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let mut client_states = vec![];
 //! # let mut client_messages = vec![];
 //! # for _ in 0..10 {
@@ -439,8 +445,8 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
-//! let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerBatchEvaluateResult { messages, proof } = server
 //!     .batch_blind_evaluate(&mut server_rng, &client_messages)
@@ -456,13 +462,13 @@
 //! ```
 //! # #[cfg(feature = "alloc")] {
 //! # #[cfg(feature = "ristretto255")]
-//! # type CipherSuite = voprf_vx::Ristretto255;
+//! # type CipherSuite = voprf::Ristretto255;
 //! # #[cfg(not(feature = "ristretto255"))]
 //! # type CipherSuite = p256::NistP256;
-//! # use voprf_vx::{VoprfServerBatchEvaluateResult, VoprfClient};
-//! # use rand::{rngs::SysRng, Rng};
+//! # use voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
+//! # use rand::{rngs::OsRng, RngCore};
 //! #
-//! # let mut client_rng = SysRng;
+//! # let mut client_rng = OsRng;
 //! # let mut client_states = vec![];
 //! # let mut client_messages = vec![];
 //! # for _ in 0..10 {
@@ -473,8 +479,8 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
-//! # let mut server_rng = SysRng;
+//! # use voprf::VoprfServer;
+//! # let mut server_rng = OsRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let VoprfServerBatchEvaluateResult { messages, proof } = server
 //! #     .batch_blind_evaluate(&mut server_rng, &client_messages)
@@ -506,7 +512,7 @@
 //! and [PoprfClient] are used, and that each of the functions accept an
 //! additional (and optional) info parameter which represents the public input.
 //! See
-//! <https://www.rfc-editor.org/rfc/rfc9497#name-poprf-public-input>
+//! <https://www.ietf.org/archive/id/draft-irtf-cfrg-voprf-11.html#name-poprf-public-input>
 //! for more detailed information on how this public input should be used.
 //!
 //! # Features
@@ -534,7 +540,7 @@
 //!     (https://docs.rs/curve25519-dalek/4.0.0-pre.5/curve25519_dalek/index.html#backends)

 #![no_std]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![cfg_attr(not(test), deny(unsafe_code))]
 #![warn(
    clippy::cargo,
@@ -1,19 +1,25 @@
-// 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

-use core::iter::{self};
+use core::iter::{self, Map};

 use derive_where::derive_where;
-use digest::Output;
-use hybrid_array::Array;
-use rand_core::{TryCryptoRng, TryRng};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, Output, OutputSizeUser};
+use generic_array::typenum::{IsLess, IsLessOrEqual, Unsigned, U256};
+use generic_array::GenericArray;
+use rand_core::{CryptoRng, RngCore};

 use crate::common::{
-    BlindedElement, EvaluationElement, Mode, derive_key_internal, deterministic_blind_unchecked,
-    finalize_after_unblind, hash_to_group, server_evaluate_hash_input,
+    derive_key_internal, deterministic_blind_unchecked, hash_to_group, i2osp_2,
+    server_evaluate_hash_input, BlindedElement, EvaluationElement, Mode, STR_FINALIZE,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::Scalar;
@@ -38,7 +44,11 @@ use crate::{CipherSuite, Error, Group, Result};
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct OprfClient<CS: CipherSuite> {
+pub struct OprfClient<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) blind: <CS::Group as Group>::Scalar,
 }
@@ -52,7 +62,11 @@ pub struct OprfClient<CS: CipherSuite> {
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct OprfServer<CS: CipherSuite> {
+pub struct OprfServer<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) sk: <CS::Group as Group>::Scalar,
 }
@@ -62,17 +76,21 @@ pub struct OprfServer<CS: CipherSuite> {
 // =================== //
 /////////////////////////

-impl<CS: CipherSuite> OprfClient<CS> {
+impl<CS: CipherSuite> OprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Computes the first step for the multiplicative blinding version of
    /// DH-OPRF.
    ///
    /// # Errors
    /// [`Error::Input`] if the `input` is empty or longer then [`u16::MAX`].
-    pub fn blind<R: TryRng + TryCryptoRng>(
+    pub fn blind<R: RngCore + CryptoRng>(
        input: &[u8],
        blinding_factor_rng: &mut R,
    ) -> Result<OprfClientBlindResult<CS>> {
-        let blind = CS::Group::random_scalar(blinding_factor_rng)?;
+        let blind = CS::Group::random_scalar(blinding_factor_rng);
        Self::deterministic_blind_unchecked_inner(input, blind)
    }

@@ -119,7 +137,7 @@ impl<CS: CipherSuite> OprfClient<CS> {
    ) -> Result<Output<CS::Hash>> {
        let unblinded_element = evaluation_element.0 * &CS::Group::invert_scalar(self.blind);
        let mut outputs =
-            finalize_after_unblind::<CS, _, _>(iter::once((input, unblinded_element)));
+            finalize_after_unblind::<CS, _, _>(iter::once((input, unblinded_element)), &[]);
        outputs.next().unwrap()
    }

@@ -136,14 +154,18 @@ impl<CS: CipherSuite> OprfClient<CS> {
    }
 }

-impl<CS: CipherSuite> OprfServer<CS> {
+impl<CS: CipherSuite> OprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Produces a new instance of a [OprfServer] using a supplied RNG
    ///
    /// # Errors
    /// [`Error::Protocol`] if the protocol fails and can't be completed.
-    pub fn new<R: TryRng + TryCryptoRng>(rng: &mut R) -> Result<Self> {
-        let mut seed = Array::<_, <CS::Group as Group>::ScalarLen>::default();
-        rng.try_fill_bytes(&mut seed).map_err(|_| Error::Protocol)?;
+    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Result<Self> {
+        let mut seed = GenericArray::<_, <CS::Group as Group>::ScalarLen>::default();
+        rng.fill_bytes(&mut seed);
        Self::new_from_seed(&seed, &[])
    }

@@ -172,7 +194,7 @@ impl<CS: CipherSuite> OprfServer<CS> {
        Ok(Self { sk })
    }

-    /// Only used for tests
+    // Only used for tests
    #[cfg(test)]
    pub fn get_private_key(&self) -> <CS::Group as Group>::Scalar {
        self.sk
@@ -209,13 +231,58 @@ impl<CS: CipherSuite> OprfServer<CS> {

 /// Contains the fields that are returned by a non-verifiable client blind
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
-pub struct OprfClientBlindResult<CS: CipherSuite> {
+pub struct OprfClientBlindResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The state to be persisted on the client
    pub state: OprfClient<CS>,
    /// The message to send to the server
    pub message: BlindedElement<CS>,
 }

+/////////////////////
+// Inner functions //
+// =============== //
+/////////////////////
+
+type FinalizeAfterUnblindResult<'a, C, I, IE> = Map<
+    IE,
+    fn((I, <<C as CipherSuite>::Group as Group>::Elem)) -> Result<Output<<C as CipherSuite>::Hash>>,
+>;
+
+/// Returned values can only fail with [`Error::Input`].
+fn finalize_after_unblind<
+    'a,
+    CS: CipherSuite,
+    I: AsRef<[u8]>,
+    IE: 'a + Iterator<Item = (I, <CS::Group as Group>::Elem)>,
+>(
+    inputs_and_unblinded_elements: IE,
+    _unused: &'a [u8],
+) -> FinalizeAfterUnblindResult<CS, I, IE>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    inputs_and_unblinded_elements.map(|(input, unblinded_element)| {
+        let elem_len = <CS::Group as Group>::ElemLen::U16.to_be_bytes();
+
+        // hashInput = I2OSP(len(input), 2) || input ||
+        //             I2OSP(len(unblindedElement), 2) || unblindedElement ||
+        //             "Finalize"
+        // return Hash(hashInput)
+        Ok(CS::Hash::new()
+            .chain_update(i2osp_2(input.as_ref().len()).map_err(|_| Error::Input)?)
+            .chain_update(input.as_ref())
+            .chain_update(elem_len)
+            .chain_update(CS::Group::serialize_elem(unblinded_element))
+            .chain_update(STR_FINALIZE)
+            .finalize())
+    })
+}
+
 ///////////
 // Tests //
 // ===== //
@@ -225,38 +292,65 @@ pub struct OprfClientBlindResult<CS: CipherSuite> {
 mod tests {
    use core::ptr;

-    use rand::TryRng;
-    use rand::rngs::SysRng;
+    use rand::rngs::OsRng;

    use super::*;
-    use crate::Group;
    use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::tests::helpers::prf;
+    use crate::Group;

-    fn base_retrieval<CS: CipherSuite>() {
+    fn prf<CS: CipherSuite>(
+        input: &[u8],
+        key: <CS::Group as Group>::Scalar,
+        info: &[u8],
+        mode: Mode,
+    ) -> Output<CS::Hash>
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, mode);
+        let point = CS::Group::hash_to_curve::<CS::Hash>(&[input], &dst.as_dst()).unwrap();
+
+        let res = point * &key;
+
+        finalize_after_unblind::<CS, _, _>(iter::once((input, res)), info)
+            .next()
+            .unwrap()
+            .unwrap()
+    }
+
+    fn base_retrieval<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = OprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = OprfServer::<CS>::new(&mut rng).unwrap();
        let message = server.blind_evaluate(&client_blind_result.message);
        let client_finalize_result = client_blind_result.state.finalize(input, &message).unwrap();
-        let res2 = prf::<CS>(input, server.get_private_key(), Mode::Oprf);
+        let res2 = prf::<CS>(input, server.get_private_key(), &[], Mode::Oprf);
        assert_eq!(client_finalize_result, res2);
    }

-    fn base_inversion_unsalted<CS: CipherSuite>() {
-        let mut rng = SysRng;
+    fn base_inversion_unsalted<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        let mut rng = OsRng;
        let mut input = [0u8; 64];
-        rng.try_fill_bytes(&mut input).unwrap();
+        rng.fill_bytes(&mut input);
        let client_blind_result = OprfClient::<CS>::blind(&input, &mut rng).unwrap();
        let client_finalize_result = client_blind_result
            .state
            .finalize(&input, &EvaluationElement(client_blind_result.message.0))
            .unwrap();

-        let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, Mode::Oprf);
+        let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, Mode::Oprf);
        let point = CS::Group::hash_to_curve::<CS::Hash>(&[&input], &dst.as_dst()).unwrap();
-        let res2 = finalize_after_unblind::<CS, _, _>(iter::once((input.as_ref(), point)))
+        let res2 = finalize_after_unblind::<CS, _, _>(iter::once((input.as_ref(), point)), &[])
            .next()
            .unwrap()
            .unwrap();
@@ -264,9 +358,13 @@ mod tests {
        assert_eq!(client_finalize_result, res2);
    }

-    fn server_evaluate<CS: CipherSuite>() {
+    fn server_evaluate<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = OprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = OprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server.blind_evaluate(&client_blind_result.message);
@@ -288,9 +386,13 @@ mod tests {
        assert!(client_finalize != server_evaluate);
    }

-    fn zeroize_oprf_client<CS: CipherSuite>() {
+    fn zeroize_oprf_client<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = OprfClient::<CS>::blind(input, &mut rng).unwrap();

        let mut state = client_blind_result.state;
@@ -302,9 +404,13 @@ mod tests {
        assert!(message.serialize().iter().all(|&x| x == 0));
    }

-    fn zeroize_oprf_server<CS: CipherSuite>() {
+    fn zeroize_oprf_server<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = OprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = OprfServer::<CS>::new(&mut rng).unwrap();
        let mut message = server.blind_evaluate(&client_blind_result.message);
@@ -317,11 +423,45 @@ mod tests {
        assert!(message.serialize().iter().all(|&x| x == 0));
    }

-    crate::tests::test_all_curves!(
-        base_retrieval,
-        base_inversion_unsalted,
-        server_evaluate,
-        zeroize_oprf_client,
-        zeroize_oprf_server,
-    );
+    #[test]
+    fn test_functionality() -> Result<()> {
+        use p256::NistP256;
+        use p384::NistP384;
+        use p521::NistP521;
+
+        #[cfg(feature = "ristretto255")]
+        {
+            use crate::Ristretto255;
+
+            base_retrieval::<Ristretto255>();
+            base_inversion_unsalted::<Ristretto255>();
+            server_evaluate::<Ristretto255>();
+
+            zeroize_oprf_client::<Ristretto255>();
+            zeroize_oprf_server::<Ristretto255>();
+        }
+
+        base_retrieval::<NistP256>();
+        base_inversion_unsalted::<NistP256>();
+        server_evaluate::<NistP256>();
+
+        zeroize_oprf_client::<NistP256>();
+        zeroize_oprf_server::<NistP256>();
+
+        base_retrieval::<NistP384>();
+        base_inversion_unsalted::<NistP384>();
+        server_evaluate::<NistP384>();
+
+        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(())
+    }
 }
@@ -1,6 +1,10 @@
-// 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

@@ -9,15 +13,16 @@ use alloc::vec::Vec;
 use core::iter::{self, Map, Repeat, Zip};

 use derive_where::derive_where;
+use digest::core_api::BlockSizeUser;
 use digest::{Digest, Output, OutputSizeUser};
-use hybrid_array::typenum::Unsigned;
-use hybrid_array::{Array, ArraySize};
-use rand_core::{TryCryptoRng, TryRng};
+use generic_array::typenum::{IsLess, IsLessOrEqual, Unsigned, U256};
+use generic_array::GenericArray;
+use rand_core::{CryptoRng, RngCore};

 use crate::common::{
-    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,
+    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,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::{Element, Scalar};
@@ -37,7 +42,11 @@ use crate::{CipherSuite, Error, Group, Result};
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct PoprfClient<CS: CipherSuite> {
+pub struct PoprfClient<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) blind: <CS::Group as Group>::Scalar,
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
@@ -53,7 +62,11 @@ pub struct PoprfClient<CS: CipherSuite> {
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct PoprfServer<CS: CipherSuite> {
+pub struct PoprfServer<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) sk: <CS::Group as Group>::Scalar,
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
@@ -65,17 +78,21 @@ pub struct PoprfServer<CS: CipherSuite> {
 // =================== //
 /////////////////////////

-impl<CS: CipherSuite> PoprfClient<CS> {
+impl<CS: CipherSuite> PoprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Computes the first step for the multiplicative blinding version of
    /// DH-OPRF.
    ///
    /// # Errors
    /// [`Error::Input`] if the `input` is empty or longer than [`u16::MAX`].
-    pub fn blind<R: TryRng + TryCryptoRng>(
+    pub fn blind<R: RngCore + CryptoRng>(
        input: &[u8],
        blinding_factor_rng: &mut R,
    ) -> Result<PoprfClientBlindResult<CS>> {
-        let blind = CS::Group::random_scalar(blinding_factor_rng)?;
+        let blind = CS::Group::random_scalar(blinding_factor_rng);
        Self::deterministic_blind_unchecked_inner(input, blind)
    }

@@ -128,10 +145,7 @@ impl<CS: CipherSuite> PoprfClient<CS> {
        proof: &Proof<CS>,
        pk: <CS::Group as Group>::Elem,
        info: Option<&[u8]>,
-    ) -> Result<Output<CS::Hash>>
-    where
-        <<CS as CipherSuite>::Hash as OutputSizeUser>::OutputSize: ArraySize,
-    {
+    ) -> Result<Output<CS::Hash>> {
        let clients = core::array::from_ref(self);
        let messages = core::array::from_ref(evaluation_element);

@@ -166,7 +180,6 @@ impl<CS: CipherSuite> PoprfClient<CS> {
        <&'a IC as IntoIterator>::IntoIter: ExactSizeIterator,
        &'a IM: 'a + IntoIterator<Item = &'a EvaluationElement<CS>>,
        <&'a IM as IntoIterator>::IntoIter: ExactSizeIterator,
-        <<CS as CipherSuite>::Hash as OutputSizeUser>::OutputSize: ArraySize,
    {
        let unblinded_elements = poprf_unblind(clients, messages, pk, proof, info)?;

@@ -180,14 +193,18 @@ impl<CS: CipherSuite> PoprfClient<CS> {
    }
 }

-impl<CS: CipherSuite> PoprfServer<CS> {
+impl<CS: CipherSuite> PoprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Produces a new instance of a [PoprfServer] using a supplied RNG
    ///
    /// # Errors
    /// [`Error::Protocol`] if the protocol fails and can't be completed.
-    pub fn new<R: TryRng + TryCryptoRng>(rng: &mut R) -> Result<Self> {
-        let mut seed = Array::<_, <CS::Group as Group>::ScalarLen>::default();
-        rng.try_fill_bytes(&mut seed).map_err(|_| Error::Protocol)?;
+    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Result<Self> {
+        let mut seed = GenericArray::<_, <CS::Group as Group>::ScalarLen>::default();
+        rng.fill_bytes(&mut seed);

        Self::new_from_seed(&seed, &[])
    }
@@ -218,7 +235,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
        Ok(Self { sk, pk })
    }

-    /// Only used for tests
+    // Only used for tests
    #[cfg(test)]
    pub fn get_private_key(&self) -> <CS::Group as Group>::Scalar {
        self.sk
@@ -231,7 +248,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
    /// # Errors
    /// - [`Error::Info`] if the `info` is longer than `u16::MAX`.
    /// - [`Error::Protocol`] if the protocol fails and can't be completed.
-    pub fn blind_evaluate<R: TryRng + TryCryptoRng>(
+    pub fn blind_evaluate<R: RngCore + CryptoRng>(
        &self,
        rng: &mut R,
        blinded_element: &BlindedElement<CS>,
@@ -269,7 +286,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
    /// - [`Error::Info`] if the `info` is longer than `u16::MAX`.
    /// - [`Error::Protocol`] if the protocol fails and can't be completed.
    #[cfg(feature = "alloc")]
-    pub fn batch_blind_evaluate<'a, R: TryRng + TryCryptoRng, IE>(
+    pub fn batch_blind_evaluate<'a, R: RngCore + CryptoRng, IE>(
        &self,
        rng: &mut R,
        blinded_elements: &'a IE,
@@ -342,7 +359,7 @@ impl<CS: CipherSuite> PoprfServer<CS> {
    pub fn batch_blind_evaluate_finish<
        'a,
        'b,
-        R: TryRng + TryCryptoRng,
+        R: RngCore + CryptoRng,
        IB: Iterator<Item = &'a BlindedElement<CS>> + ExactSizeIterator,
        IE,
    >(
@@ -367,7 +384,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,
        )?;
@@ -375,7 +392,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 })
@@ -410,7 +427,11 @@ impl<CS: CipherSuite> PoprfServer<CS> {
    }
 }

-impl<CS: CipherSuite> BlindedElement<CS> {
+impl<CS: CipherSuite> BlindedElement<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Creates a [BlindedElement] from a raw group element.
    ///
    /// # Caution
@@ -429,7 +450,11 @@ impl<CS: CipherSuite> BlindedElement<CS> {
    }
 }

-impl<CS: CipherSuite> EvaluationElement<CS> {
+impl<CS: CipherSuite> EvaluationElement<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Creates an [EvaluationElement] from a raw group element.
    ///
    /// # Caution
@@ -455,7 +480,11 @@ impl<CS: CipherSuite> EvaluationElement<CS> {

 /// Contains the fields that are returned by a verifiable client blind
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
-pub struct PoprfClientBlindResult<CS: CipherSuite> {
+pub struct PoprfClientBlindResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The state to be persisted on the client
    pub state: PoprfClient<CS>,
    /// The message to send to the server
@@ -468,7 +497,11 @@ pub type PoprfClientBatchFinalizeResult<'a, CS, II, IC, IM> =

 /// Contains the fields that are returned by a verifiable server evaluate
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
-pub struct PoprfServerEvaluateResult<CS: CipherSuite> {
+pub struct PoprfServerEvaluateResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The message to send to the client
    pub message: EvaluationElement<CS>,
    /// The proof for the client to verify
@@ -478,7 +511,11 @@ pub struct PoprfServerEvaluateResult<CS: CipherSuite> {
 /// Contains the fields that are returned by a verifiable server batch evaluate
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
 #[cfg(feature = "alloc")]
-pub struct PoprfServerBatchEvaluateResult<CS: CipherSuite> {
+pub struct PoprfServerBatchEvaluateResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The messages to send to the client
    pub messages: Vec<EvaluationElement<CS>>,
    /// The proof for the client to verify
@@ -508,12 +545,19 @@ pub type PoprfServerBatchEvaluatePreparedEvaluationElements<CS, I> = Map<
 pub struct PoprfPreparedTweak<CS: CipherSuite>(
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    <CS::Group as Group>::Scalar,
-);
+)
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>;

 /// Contains the fields that are returned by a partially verifiable server batch
 /// evaluate prepare
 #[derive_where(Debug; I, <CS::Group as Group>::Scalar)]
-pub struct PoprfServerBatchEvaluatePrepareResult<CS: CipherSuite, I> {
+pub struct PoprfServerBatchEvaluatePrepareResult<CS: CipherSuite, I>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Prepared [`EvaluationElement`].
    pub prepared_evaluation_elements: PoprfServerBatchEvaluatePreparedEvaluationElements<CS, I>,
    /// Prepared tweak.
@@ -532,6 +576,8 @@ pub type PoprfServerBatchEvaluateFinishedMessages<'a, CS, I> = Map<
 #[derive_where(Debug; <&'a I as IntoIterator>::IntoIter, <CS::Group as Group>::Scalar)]
 pub struct PoprfServerBatchEvaluateFinishResult<'a, CS: 'a + CipherSuite, I>
 where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
    &'a I: IntoIterator<Item = &'a PreparedEvaluationElement<CS>>,
 {
    /// The [`EvaluationElement`]s to send to the client
@@ -552,7 +598,11 @@ where
 fn compute_tweaked_key<CS: CipherSuite>(
    pk: <CS::Group as Group>::Elem,
    info: Option<&[u8]>,
-) -> Result<<CS::Group as Group>::Elem> {
+) -> Result<<CS::Group as Group>::Elem>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    // None for info is treated the same as empty bytes
    let info = info.unwrap_or_default();

@@ -565,7 +615,7 @@ fn compute_tweaked_key<CS: CipherSuite>(
    let info_len = i2osp_2(info.len()).map_err(|_| Error::Info)?;
    let framed_info = [STR_INFO.as_slice(), &info_len, info];

-    let dst = Dst::new::<CS, _>(STR_HASH_TO_SCALAR, Mode::Poprf);
+    let dst = Dst::new::<CS, _, _>(STR_HASH_TO_SCALAR, Mode::Poprf);
    // This can't fail, the size of the `input` is known.
    let m = CS::Group::hash_to_scalar::<CS::Hash>(&framed_info, &dst.as_dst()).unwrap();

@@ -586,7 +636,11 @@ fn compute_tweaked_key<CS: CipherSuite>(
 fn compute_tweak<CS: CipherSuite>(
    sk: <CS::Group as Group>::Scalar,
    info: Option<&[u8]>,
-) -> Result<<CS::Group as Group>::Scalar> {
+) -> Result<<CS::Group as Group>::Scalar>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    // None for info is treated the same as empty bytes
    let info = info.unwrap_or_default();

@@ -598,7 +652,7 @@ fn compute_tweak<CS: CipherSuite>(
    let info_len = i2osp_2(info.len()).map_err(|_| Error::Info)?;
    let framed_info = [STR_INFO.as_slice(), &info_len, info];

-    let dst = Dst::new::<CS, _>(STR_HASH_TO_SCALAR, Mode::Poprf);
+    let dst = Dst::new::<CS, _, _>(STR_HASH_TO_SCALAR, Mode::Poprf);
    // This can't fail, the size of the `input` is known.
    let m = CS::Group::hash_to_scalar::<CS::Hash>(&framed_info, &dst.as_dst()).unwrap();

@@ -637,6 +691,8 @@ fn poprf_unblind<'a, CS: 'a + CipherSuite, IC, IM>(
    info: Option<&[u8]>,
 ) -> Result<PoprfUnblindResult<'a, CS, IC, IM>>
 where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
    &'a IC: 'a + IntoIterator<Item = &'a PoprfClient<CS>>,
    <&'a IC as IntoIterator>::IntoIter: ExactSizeIterator,
    &'a IM: 'a + IntoIterator<Item = &'a EvaluationElement<CS>>,
@@ -672,7 +728,7 @@ type FinalizeAfterUnblindResult<'a, CS, IE, II> = Map<
    Zip<Zip<IE, II>, Repeat<&'a [u8]>>,
    fn(
        ((<<CS as CipherSuite>::Group as Group>::Elem, &[u8]), &[u8]),
-    ) -> Result<Output<<CS as CipherSuite>::Hash>>,
+    ) -> Result<GenericArray<u8, <<CS as CipherSuite>::Hash as OutputSizeUser>::OutputSize>>,
 >;

 /// Can only fail with [`Error::Batch`] and returned values can only fail with
@@ -688,7 +744,8 @@ fn finalize_after_unblind<
    info: Option<&'a [u8]>,
 ) -> Result<FinalizeAfterUnblindResult<'a, CS, IE, II>>
 where
-    <<CS as CipherSuite>::Hash as OutputSizeUser>::OutputSize: ArraySize,
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
 {
    if unblinded_elements.len() != inputs.len() {
        return Err(Error::Batch);
@@ -727,23 +784,30 @@ where

 #[cfg(test)]
 mod tests {
+    use core::ops::Add;
    use core::ptr;

-    use rand::rngs::SysRng;
+    use generic_array::typenum::Sum;
+    use generic_array::ArrayLength;
+    use rand::rngs::OsRng;

    use super::*;
-    use crate::Group;
    use crate::common::STR_HASH_TO_GROUP;
+    use crate::Group;

    fn prf<CS: CipherSuite>(
        input: &[u8],
        key: <CS::Group as Group>::Scalar,
        info: &[u8],
        mode: Mode,
-    ) -> Output<CS::Hash> {
+    ) -> Output<CS::Hash>
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let t = compute_tweak::<CS>(key, Some(info)).unwrap();

-        let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, mode);
+        let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, mode);
        let point = CS::Group::hash_to_curve::<CS::Hash>(&[input], &dst.as_dst()).unwrap();

        // evaluatedElement = G.ScalarInverse(t) * blindedElement
@@ -756,10 +820,14 @@ mod tests {
            .unwrap()
    }

-    fn verifiable_retrieval<CS: CipherSuite>() {
+    fn verifiable_retrieval<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
        let info = b"info";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let server = PoprfServer::<CS>::new(&mut rng).unwrap();
        let client_blind_result = PoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server_result = server
@@ -779,17 +847,21 @@ mod tests {
        assert_eq!(client_finalize_result, res2);
    }

-    fn verifiable_bad_public_key<CS: CipherSuite>() {
+    fn verifiable_bad_public_key<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
        let info = b"info";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let server = PoprfServer::<CS>::new(&mut rng).unwrap();
        let client_blind_result = PoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server_result = server
            .blind_evaluate(&mut rng, &client_blind_result.message, Some(info))
            .unwrap();
        let wrong_pk = {
-            let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, Mode::Oprf);
+            let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, Mode::Oprf);
            // Choose a group element that is unlikely to be the right public key
            CS::Group::hash_to_curve::<CS::Hash>(&[b"msg"], &dst.as_dst()).unwrap()
        };
@@ -803,10 +875,14 @@ mod tests {
        assert!(client_finalize_result.is_err());
    }

-    fn verifiable_server_evaluate<CS: CipherSuite>() {
+    fn verifiable_server_evaluate<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
        let info = Some(b"info".as_slice());
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = PoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = PoprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server
@@ -836,9 +912,15 @@ mod tests {
        assert!(client_finalize != server_evaluate);
    }

-    fn zeroize_verifiable_client<CS: CipherSuite>() {
+    fn zeroize_verifiable_client<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ElemLen>: ArrayLength<u8>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = PoprfClient::<CS>::blind(input, &mut rng).unwrap();

        let mut state = client_blind_result.state;
@@ -850,10 +932,18 @@ mod tests {
        assert!(message.serialize().iter().all(|&x| x == 0));
    }

-    fn zeroize_verifiable_server<CS: CipherSuite>() {
+    fn zeroize_verifiable_server<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ElemLen>: ArrayLength<u8>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ScalarLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ScalarLen>: ArrayLength<u8>,
+    {
        let input = b"input";
        let info = b"info";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let server = PoprfServer::<CS>::new(&mut rng).unwrap();
        let client_blind_result = PoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server_result = server
@@ -873,11 +963,45 @@ mod tests {
        assert!(proof.serialize().iter().all(|&x| x == 0));
    }

-    crate::tests::test_all_curves!(
-        verifiable_retrieval,
-        verifiable_bad_public_key,
-        verifiable_server_evaluate,
-        zeroize_verifiable_client,
-        zeroize_verifiable_server,
-    );
+    #[test]
+    fn test_functionality() -> Result<()> {
+        use p256::NistP256;
+        use p384::NistP384;
+        use p521::NistP521;
+
+        #[cfg(feature = "ristretto255")]
+        {
+            use crate::Ristretto255;
+
+            verifiable_retrieval::<Ristretto255>();
+            verifiable_bad_public_key::<Ristretto255>();
+            verifiable_server_evaluate::<Ristretto255>();
+
+            zeroize_verifiable_client::<Ristretto255>();
+            zeroize_verifiable_server::<Ristretto255>();
+        }
+
+        verifiable_retrieval::<NistP256>();
+        verifiable_bad_public_key::<NistP256>();
+        verifiable_server_evaluate::<NistP256>();
+
+        zeroize_verifiable_client::<NistP256>();
+        zeroize_verifiable_server::<NistP256>();
+
+        verifiable_retrieval::<NistP384>();
+        verifiable_bad_public_key::<NistP384>();
+        verifiable_server_evaluate::<NistP384>();
+
+        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(())
+    }
 }
@@ -1,22 +1,296 @@
-// 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::Array;
-use hybrid_array::typenum::{Sum, Unsigned};
+use core::ops::Add;
+
+use digest::core_api::BlockSizeUser;
+use digest::OutputSizeUser;
+use generic_array::sequence::Concat;
+use generic_array::typenum::{IsLess, IsLessOrEqual, Sum, Unsigned, U256};
+use generic_array::{ArrayLength, GenericArray};

 use crate::{
    BlindedElement, CipherSuite, Error, EvaluationElement, Group, OprfClient, OprfServer,
    PoprfClient, PoprfServer, Proof, Result, VoprfClient, VoprfServer,
 };

-/////////////////////////////
-// Deserialization Helpers //
-// ======================= //
-/////////////////////////////
+//////////////////////////////////////////////////////////
+// Serialization and Deserialization for High-Level API //
+// ==================================================== //
+//////////////////////////////////////////////////////////
+
+/// Length of [`OprfClient`] in bytes for serialization.
+pub type OprfClientLen<CS> = <<CS as CipherSuite>::Group as Group>::ScalarLen;
+
+impl<CS: CipherSuite> OprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, OprfClientLen<CS>> {
+        CS::Group::serialize_scalar(self.blind)
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let blind = deserialize_scalar::<CS::Group>(&mut input)?;
+
+        Ok(Self { blind })
+    }
+}
+
+/// Length of [`VoprfClient`] in bytes for serialization.
+pub type VoprfClientLen<CS> = Sum<
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+    <<CS as CipherSuite>::Group as Group>::ElemLen,
+>;
+
+impl<CS: CipherSuite> VoprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, VoprfClientLen<CS>>
+    where
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        VoprfClientLen<CS>: ArrayLength<u8>,
+    {
+        <CS::Group as Group>::serialize_scalar(self.blind)
+            .concat(<CS::Group as Group>::serialize_elem(self.blinded_element))
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let blind = deserialize_scalar::<CS::Group>(&mut input)?;
+        let blinded_element = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self {
+            blind,
+            blinded_element,
+        })
+    }
+}
+
+/// Length of [`PoprfClient`] in bytes for serialization.
+pub type PoprfClientLen<CS> = Sum<
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+    <<CS as CipherSuite>::Group as Group>::ElemLen,
+>;
+
+impl<CS: CipherSuite> PoprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, PoprfClientLen<CS>>
+    where
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        PoprfClientLen<CS>: ArrayLength<u8>,
+    {
+        <CS::Group as Group>::serialize_scalar(self.blind)
+            .concat(<CS::Group as Group>::serialize_elem(self.blinded_element))
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let blind = deserialize_scalar::<CS::Group>(&mut input)?;
+        let blinded_element = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self {
+            blind,
+            blinded_element,
+        })
+    }
+}
+
+/// Length of [`OprfServer`] in bytes for serialization.
+pub type OprfServerLen<CS> = <<CS as CipherSuite>::Group as Group>::ScalarLen;
+
+impl<CS: CipherSuite> OprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, OprfServerLen<CS>> {
+        CS::Group::serialize_scalar(self.sk)
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let sk = deserialize_scalar::<CS::Group>(&mut input)?;
+
+        Ok(Self { sk })
+    }
+}
+
+/// Length of [`VoprfServer`] in bytes for serialization.
+pub type VoprfServerLen<CS> = Sum<
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+    <<CS as CipherSuite>::Group as Group>::ElemLen,
+>;
+
+impl<CS: CipherSuite> VoprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, VoprfServerLen<CS>>
+    where
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        VoprfServerLen<CS>: ArrayLength<u8>,
+    {
+        CS::Group::serialize_scalar(self.sk).concat(CS::Group::serialize_elem(self.pk))
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let sk = deserialize_scalar::<CS::Group>(&mut input)?;
+        let pk = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self { sk, pk })
+    }
+}
+
+/// Length of [`PoprfServer`] in bytes for serialization.
+pub type PoprfServerLen<CS> = Sum<
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+    <<CS as CipherSuite>::Group as Group>::ElemLen,
+>;
+
+impl<CS: CipherSuite> PoprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, PoprfServerLen<CS>>
+    where
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        PoprfServerLen<CS>: ArrayLength<u8>,
+    {
+        CS::Group::serialize_scalar(self.sk).concat(CS::Group::serialize_elem(self.pk))
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let sk = deserialize_scalar::<CS::Group>(&mut input)?;
+        let pk = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self { sk, pk })
+    }
+}
+
+/// Length of [`Proof`] in bytes for serialization.
+pub type ProofLen<CS> = Sum<
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+    <<CS as CipherSuite>::Group as Group>::ScalarLen,
+>;
+
+impl<CS: CipherSuite> Proof<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, ProofLen<CS>>
+    where
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ScalarLen>,
+        ProofLen<CS>: ArrayLength<u8>,
+    {
+        CS::Group::serialize_scalar(self.c_scalar)
+            .concat(CS::Group::serialize_scalar(self.s_scalar))
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let c_scalar = deserialize_scalar::<CS::Group>(&mut input)?;
+        let s_scalar = deserialize_scalar::<CS::Group>(&mut input)?;
+
+        Ok(Proof { c_scalar, s_scalar })
+    }
+}
+
+/// Length of [`BlindedElement`] in bytes for serialization.
+pub type BlindedElementLen<CS> = <<CS as CipherSuite>::Group as Group>::ElemLen;
+
+impl<CS: CipherSuite> BlindedElement<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, BlindedElementLen<CS>> {
+        CS::Group::serialize_elem(self.0)
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let value = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self(value))
+    }
+}
+
+/// Length of [`EvaluationElement`] in bytes for serialization.
+pub type EvaluationElementLen<CS> = <<CS as CipherSuite>::Group as Group>::ElemLen;
+
+impl<CS: CipherSuite> EvaluationElement<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    /// Serialization into bytes
+    pub fn serialize(&self) -> GenericArray<u8, EvaluationElementLen<CS>> {
+        CS::Group::serialize_elem(self.0)
+    }
+
+    /// Deserialization from bytes
+    ///
+    /// # Errors
+    /// [`Error::Deserialization`] if failed to deserialize `input`.
+    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
+        let value = deserialize_elem::<CS::Group>(&mut input)?;
+
+        Ok(Self(value))
+    }
+}

 fn deserialize_elem<G: Group>(input: &mut &[u8]) -> Result<G::Elem> {
    let input = input
@@ -48,163 +322,11 @@ impl<T> SliceExt for [T] {
    }
 }

-//////////////////////////////
-// Serialization Macros     //
-// ======================== //
-//////////////////////////////
-
-macro_rules! impl_serde_scalar {
-    ($ty:ident, $len:ident, $field:ident) => {
-        /// Length in bytes for serialization.
-        pub type $len<CS> = <<CS as CipherSuite>::Group as Group>::ScalarLen;
-
-        impl<CS: CipherSuite> $ty<CS> {
-            /// Serialization into bytes
-            pub fn serialize(&self) -> Array<u8, $len<CS>> {
-                CS::Group::serialize_scalar(self.$field)
-            }
-
-            /// Deserialization from bytes
-            ///
-            /// # Errors
-            /// [`Error::Deserialization`] if failed to deserialize `input`.
-            pub fn deserialize(mut input: &[u8]) -> Result<Self> {
-                let $field = deserialize_scalar::<CS::Group>(&mut input)?;
-
-                if !input.is_empty() {
-                    return Err(Error::Deserialization);
-                }
-
-                Ok(Self { $field })
-            }
-        }
-    };
-}
-
-macro_rules! impl_serde_scalar_elem {
-    ($ty:ident, $len:ident, $scalar_field:ident, $elem_field:ident) => {
-        /// Length in bytes for serialization.
-        pub type $len<CS> = Sum<
-            <<CS as CipherSuite>::Group as Group>::ScalarLen,
-            <<CS as CipherSuite>::Group as Group>::ElemLen,
-        >;
-
-        impl<CS: CipherSuite> $ty<CS> {
-            /// Serialization into bytes
-            pub fn serialize(&self) -> Array<u8, $len<CS>> {
-                <CS::Group as Group>::serialize_scalar(self.$scalar_field)
-                    .concat(<CS::Group as Group>::serialize_elem(self.$elem_field))
-            }
-
-            /// Deserialization from bytes
-            ///
-            /// # Errors
-            /// [`Error::Deserialization`] if failed to deserialize `input`.
-            pub fn deserialize(mut input: &[u8]) -> Result<Self> {
-                let $scalar_field = deserialize_scalar::<CS::Group>(&mut input)?;
-                let $elem_field = deserialize_elem::<CS::Group>(&mut input)?;
-
-                if !input.is_empty() {
-                    return Err(Error::Deserialization);
-                }
-
-                Ok(Self {
-                    $scalar_field,
-                    $elem_field,
-                })
-            }
-        }
-    };
-}
-
-macro_rules! impl_serde_elem {
-    ($ty:ident, $len:ident) => {
-        /// Length in bytes for serialization.
-        pub type $len<CS> = <<CS as CipherSuite>::Group as Group>::ElemLen;
-
-        impl<CS: CipherSuite> $ty<CS> {
-            /// Serialization into bytes
-            pub fn serialize(&self) -> Array<u8, $len<CS>> {
-                CS::Group::serialize_elem(self.0)
-            }
-
-            /// Deserialization from bytes
-            ///
-            /// # Errors
-            /// [`Error::Deserialization`] if failed to deserialize `input`.
-            pub fn deserialize(mut input: &[u8]) -> Result<Self> {
-                let value = deserialize_elem::<CS::Group>(&mut input)?;
-
-                if !input.is_empty() {
-                    return Err(Error::Deserialization);
-                }
-
-                Ok(Self(value))
-            }
-        }
-    };
-}
-
-//////////////////////////////////////////////////////////
-// Serialization and Deserialization for High-Level API //
-// ==================================================== //
-//////////////////////////////////////////////////////////
-
-impl_serde_scalar!(OprfClient, OprfClientLen, blind);
-impl_serde_scalar!(OprfServer, OprfServerLen, sk);
-
-impl_serde_elem!(BlindedElement, BlindedElementLen);
-impl_serde_elem!(EvaluationElement, EvaluationElementLen);
-
-impl_serde_scalar_elem!(VoprfClient, VoprfClientLen, blind, blinded_element);
-impl_serde_scalar_elem!(PoprfClient, PoprfClientLen, blind, blinded_element);
-impl_serde_scalar_elem!(VoprfServer, VoprfServerLen, sk, pk);
-impl_serde_scalar_elem!(PoprfServer, PoprfServerLen, sk, pk);
-
-/////////////////////
-// Proof (One-Off) //
-// =============== //
-/////////////////////
-
-/// Length of [`Proof`] in bytes for serialization.
-pub type ProofLen<CS> = Sum<
-    <<CS as CipherSuite>::Group as Group>::ScalarLen,
-    <<CS as CipherSuite>::Group as Group>::ScalarLen,
->;
-
-impl<CS: CipherSuite> Proof<CS> {
-    /// Serialization into bytes
-    pub fn serialize(&self) -> Array<u8, ProofLen<CS>> {
-        CS::Group::serialize_scalar(self.c_scalar)
-            .concat(CS::Group::serialize_scalar(self.s_scalar))
-    }
-
-    /// Deserialization from bytes
-    ///
-    /// # Errors
-    /// [`Error::Deserialization`] if failed to deserialize `input`.
-    pub fn deserialize(mut input: &[u8]) -> Result<Self> {
-        let c_scalar = deserialize_scalar::<CS::Group>(&mut input)?;
-        let s_scalar = deserialize_scalar::<CS::Group>(&mut input)?;
-
-        if !input.is_empty() {
-            return Err(Error::Deserialization);
-        }
-
-        Ok(Proof { c_scalar, s_scalar })
-    }
-}
-
-///////////////////////////
-// Serde Support         //
-// ===================== //
-///////////////////////////
-
 #[cfg(feature = "serde")]
 pub(crate) mod serde {
    use core::marker::PhantomData;

-    use hybrid_array::Array;
+    use generic_array::GenericArray;
    use serde::de::{Deserializer, Error};
    use serde::ser::Serializer;
    use serde::{Deserialize, Serialize};
@@ -218,7 +340,7 @@ pub(crate) mod serde {
        where
            D: Deserializer<'de>,
        {
-            Array::<_, G::ElemLen>::deserialize(deserializer)
+            GenericArray::<_, G::ElemLen>::deserialize(deserializer)
                .and_then(|bytes| G::deserialize_elem(&bytes).map_err(D::Error::custom))
        }

@@ -237,7 +359,7 @@ pub(crate) mod serde {
        where
            D: Deserializer<'de>,
        {
-            Array::<_, G::ScalarLen>::deserialize(deserializer)
+            GenericArray::<_, G::ScalarLen>::deserialize(deserializer)
                .and_then(|bytes| G::deserialize_scalar(&bytes).map_err(D::Error::custom))
        }

@@ -260,7 +382,6 @@ mod test {
        VoprfClient, VoprfServer,
    };

-    // Fuzz: no panics on arbitrary input
    macro_rules! test_deserialize {
        ($item:ident, $bytes:ident) => {
            #[cfg(feature = "ristretto255")]
@@ -268,43 +389,12 @@ mod test {
                let _ = $item::<crate::Ristretto255>::deserialize(&$bytes[..]);
            }

-            let _ = $item::<::p256::NistP256>::deserialize(&$bytes[..]);
-            let _ = $item::<::p384::NistP384>::deserialize(&$bytes[..]);
-            let _ = $item::<::p521::NistP521>::deserialize(&$bytes[..]);
+            let _ = $item::<p256::NistP256>::deserialize(&$bytes[..]);
+            let _ = $item::<p384::NistP384>::deserialize(&$bytes[..]);
+            let _ = $item::<p521::NistP521>::deserialize(&$bytes[..]);
        };
    }

-    // Roundtrip: serialize to deserialize == original
-    macro_rules! test_roundtrip {
-        ($item:ident, $cs:ty, $constructor:expr) => {{
-            let original = $constructor;
-            let bytes = original.serialize();
-            let recovered = $item::<$cs>::deserialize(&bytes).expect("roundtrip deserialize");
-            assert_eq!(original.serialize(), recovered.serialize());
-        }};
-    }
-
-    // Trailing bytes: valid serialization + extra byte must fail
-    macro_rules! test_trailing {
-        ($item:ident, $cs:ty, $constructor:expr) => {{
-            let original = $constructor;
-            let bytes = original.serialize();
-            let mut extended = bytes.to_vec();
-            extended.push(0x00);
-            assert!($item::<$cs>::deserialize(&extended).is_err());
-        }};
-    }
-
-    // Truncated: valid serialization minus one byte must fail
-    macro_rules! test_truncated {
-        ($item:ident, $cs:ty, $constructor:expr) => {{
-            let original = $constructor;
-            let bytes = original.serialize();
-            let truncated = &bytes[..bytes.len() - 1];
-            assert!($item::<$cs>::deserialize(truncated).is_err());
-        }};
-    }
-
    proptest! {
        #[test]
        fn test_nocrash_oprf_client(bytes in vec(any::<u8>(), 0..200)) {
@@ -352,103 +442,4 @@ mod test {
            test_deserialize!(Proof, bytes);
        }
    }
-
-    macro_rules! structured_tests {
-        ($cs:ty, $mod:ident) => {
-            mod $mod {
-                use super::*;
-
-                use rand::rngs::SysRng;
-
-                #[test]
-                fn roundtrip_oprf_client() {
-                    let client = OprfClient::<$cs>::blind(b"input", &mut SysRng)
-                        .expect("blind")
-                        .state;
-                    test_roundtrip!(OprfClient, $cs, client);
-                }
-
-                #[test]
-                fn roundtrip_oprf_server() {
-                    let server = OprfServer::<$cs>::new(&mut SysRng).expect("new");
-                    test_roundtrip!(OprfServer, $cs, server);
-                }
-
-                #[test]
-                fn roundtrip_voprf_client() {
-                    let client = VoprfClient::<$cs>::blind(b"input", &mut SysRng)
-                        .expect("blind")
-                        .state;
-                    test_roundtrip!(VoprfClient, $cs, client);
-                }
-
-                #[test]
-                fn roundtrip_voprf_server() {
-                    let server = VoprfServer::<$cs>::new(&mut SysRng).expect("new");
-                    test_roundtrip!(VoprfServer, $cs, server);
-                }
-
-                #[test]
-                fn roundtrip_poprf_client() {
-                    let client = PoprfClient::<$cs>::blind(b"input", &mut SysRng)
-                        .expect("blind")
-                        .state;
-                    test_roundtrip!(PoprfClient, $cs, client);
-                }
-
-                #[test]
-                fn roundtrip_poprf_server() {
-                    let server = PoprfServer::<$cs>::new(&mut SysRng).expect("new");
-                    test_roundtrip!(PoprfServer, $cs, server);
-                }
-
-                #[test]
-                fn trailing_oprf_client() {
-                    let client = OprfClient::<$cs>::blind(b"input", &mut SysRng)
-                        .expect("blind")
-                        .state;
-                    test_trailing!(OprfClient, $cs, client);
-                }
-
-                #[test]
-                fn trailing_oprf_server() {
-                    let server = OprfServer::<$cs>::new(&mut SysRng).expect("new");
-                    test_trailing!(OprfServer, $cs, server);
-                }
-
-                #[test]
-                fn truncated_oprf_client() {
-                    let client = OprfClient::<$cs>::blind(b"input", &mut SysRng)
-                        .expect("blind")
-                        .state;
-                    test_truncated!(OprfClient, $cs, client);
-                }
-
-                #[test]
-                fn truncated_oprf_server() {
-                    let server = OprfServer::<$cs>::new(&mut SysRng).expect("new");
-                    test_truncated!(OprfServer, $cs, server);
-                }
-
-                #[test]
-                fn empty_input_fails() {
-                    assert!(OprfClient::<$cs>::deserialize(&[]).is_err());
-                    assert!(OprfServer::<$cs>::deserialize(&[]).is_err());
-                    assert!(VoprfClient::<$cs>::deserialize(&[]).is_err());
-                    assert!(VoprfServer::<$cs>::deserialize(&[]).is_err());
-                    assert!(PoprfClient::<$cs>::deserialize(&[]).is_err());
-                    assert!(PoprfServer::<$cs>::deserialize(&[]).is_err());
-                    assert!(BlindedElement::<$cs>::deserialize(&[]).is_err());
-                    assert!(EvaluationElement::<$cs>::deserialize(&[]).is_err());
-                    assert!(Proof::<$cs>::deserialize(&[]).is_err());
-                }
-            }
-        };
-    }
-
-    #[cfg(feature = "ristretto255")]
-    structured_tests!(crate::Ristretto255, ristretto255);
-    structured_tests!(::p256::NistP256, p256);
-    structured_tests!(::p384::NistP384, p384);
-    structured_tests!(::p521::NistP521, p521);
 }
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-// Copyright (c) VexaHub and contributors.
-
-use core::iter;
-
-use digest::Output;
-
-use crate::common::{Dst, Mode, STR_HASH_TO_GROUP, finalize_after_unblind};
-use crate::{CipherSuite, Group};
-
-pub(crate) fn prf<CS: CipherSuite>(
-    input: &[u8],
-    key: <CS::Group as Group>::Scalar,
-    mode: Mode,
-) -> Output<CS::Hash> {
-    let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, mode);
-    let point = CS::Group::hash_to_curve::<CS::Hash>(&[input], &dst.as_dst()).unwrap();
-
-    let res = point * &key;
-
-    finalize_after_unblind::<CS, _, _>(iter::once((input, res)))
-        .next()
-        .unwrap()
-        .unwrap()
-}
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-// Copyright (c) VexaHub and contributors.
-
-macro_rules! test_all_curves {
-    ($($test_fn:ident),+ $(,)?) => {
-        #[test]
-        fn test_functionality() -> $crate::Result<()> {
-            #[cfg(feature = "ristretto255")]
-            {
-                $( $test_fn::<$crate::Ristretto255>(); )+
-            }
-            $( $test_fn::<::p256::NistP256>(); )+
-            $( $test_fn::<::p384::NistP384>(); )+
-            $( $test_fn::<::p521::NistP521>(); )+
-            Ok(())
-        }
-    };
-}
-
-pub(crate) use test_all_curves;
@@ -1,12 +1,15 @@
-// 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;

-use core::convert::Infallible;
-use rand_core::{TryCryptoRng, TryRng};
+use rand_core::{CryptoRng, Error, RngCore};

 /// A simple implementation of `RngCore` for testing purposes.
 ///
@@ -35,35 +38,29 @@ fn rotate_left<T>(data: &mut [T], steps: usize) {
    data.reverse();
 }

-impl TryRng for CycleRng {
-    type Error = Infallible;
-
-    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
-        let mut buf = [0u8; 4];
-
-        self.try_fill_bytes(&mut buf)?;
-
-        Ok(u32::from_le_bytes(buf))
+impl RngCore for CycleRng {
+    fn next_u32(&mut self) -> u32 {
+        unimplemented!()
    }

-    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
-        let mut buf = [0u8; 8];
-
-        self.try_fill_bytes(&mut buf)?;
-
-        Ok(u64::from_le_bytes(buf))
+    #[inline]
+    fn next_u64(&mut self) -> u64 {
+        unimplemented!()
    }

-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Self::Error> {
+    #[inline]
+    fn fill_bytes(&mut self, dest: &mut [u8]) {
        let len = min(self.v.len(), dest.len());
-
        dest[..len].copy_from_slice(&self.v[..len]);
-
        rotate_left(&mut self.v, len);
+    }

+    #[inline]
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
+        self.fill_bytes(dest);
        Ok(())
    }
 }

 // This is meant for testing only
-impl TryCryptoRng for CycleRng {}
+impl CryptoRng for CycleRng {}
@@ -1,13 +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.

 mod cfrg_vectors;
-mod macros;
 mod mock_rng;
 mod parser;
 mod test_cfrg_vectors;
-
-pub(crate) mod helpers;
-
-pub(crate) use macros::test_all_curves;
@@ -1,6 +1,10 @@
-// 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;
@@ -11,50 +15,55 @@ pub(crate) fn rfc_to_json(input: &str) -> String {
 }

 fn parse_ciphersuites(input: &str) -> String {
-    let re = regex::Regex::new(r"\nA\.\d\. {2}(?P<ciphersuite>.+?)\n\n").unwrap();
+    let re = regex::Regex::new(r"## OPRF\((?P<ciphersuite>.+?)\)").unwrap();
    let mut ciphersuites = vec![];

    let chunks: Vec<&str> = re.split(input).collect();
-    for (count, caps) in (1..).zip(re.captures_iter(input)) {
+    let mut count = 1;
+    for caps in re.captures_iter(input) {
        let ciphersuite = format!(
            "\"{}\": {{ {} }}",
            &caps["ciphersuite"],
            parse_modes(chunks[count])
        );
-
        ciphersuites.push(ciphersuite);
+        count += 1;
    }

    ciphersuites.join(",\n")
 }

 fn parse_modes(input: &str) -> String {
-    let re = regex::Regex::new(r"A\.\d.\d\. {2}(?P<mode>.*?) Mode").unwrap();
+    let re = regex::Regex::new(r"### (?P<mode>.*+) Mode").unwrap();
    let mut modes = vec![];

    let chunks: Vec<&str> = re.split(input).collect();
-    for (count, caps) in (1..).zip(re.captures_iter(input)) {
+    let mut count = 1;
+    for caps in re.captures_iter(input) {
        let mode = format!(
            "\"{}\": [\n {} \n]",
            &caps["mode"],
            parse_vectors(chunks[count])
        );
        modes.push(mode);
+        count += 1;
    }

    modes.join(",\n")
 }

 fn parse_vectors(input: &str) -> String {
-    let re = regex::Regex::new(r"A\.\d.\d\.\d\. {2}Test Vector.*+\n").unwrap();
+    let re = regex::Regex::new(r"Test Vector.*+\n").unwrap();
    let mut vectors = vec![];

    let chunks: Vec<&str> = re.split(input).collect();
    let init_params = parse_params(chunks[0]);

-    for (count, _) in (1..).zip(re.captures_iter(input)) {
+    let mut count = 1;
+    for _ in re.captures_iter(input) {
        let params = format!("{{\n{},\n{}\n}}", init_params, parse_params(chunks[count]));
        vectors.push(params);
+        count += 1;
    }

    vectors.join(",\n")
@@ -1,11 +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.

 use alloc::string::String;
 use alloc::vec;
 use alloc::vec::Vec;
+use core::ops::Add;

+use digest::core_api::BlockSizeUser;
+use digest::OutputSizeUser;
+use generic_array::typenum::{IsLess, IsLessOrEqual, Sum, U256};
+use generic_array::ArrayLength;
 use serde_json::Value;

 use crate::tests::mock_rng::CycleRng;
@@ -91,7 +100,7 @@ fn test_vectors() -> Result<()> {

        let ristretto_oprf_tvs = json_to_test_vectors!(
            rfc,
-            String::from("ristretto255-SHA512"),
+            String::from("ristretto255, SHA-512"),
            String::from("OPRF")
        );
        assert_ne!(ristretto_oprf_tvs.len(), 0);
@@ -103,7 +112,7 @@ fn test_vectors() -> Result<()> {

        let ristretto_voprf_tvs = json_to_test_vectors!(
            rfc,
-            String::from("ristretto255-SHA512"),
+            String::from("ristretto255, SHA-512"),
            String::from("VOPRF")
        );
        assert_ne!(ristretto_voprf_tvs.len(), 0);
@@ -115,7 +124,7 @@ fn test_vectors() -> Result<()> {

        let ristretto_poprf_tvs = json_to_test_vectors!(
            rfc,
-            String::from("ristretto255-SHA512"),
+            String::from("ristretto255, SHA-512"),
            String::from("POPRF")
        );
        assert_ne!(ristretto_poprf_tvs.len(), 0);
@@ -127,7 +136,7 @@ fn test_vectors() -> Result<()> {
    }

    let p256_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("OPRF"));
+        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), 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)?;
@@ -136,7 +145,7 @@ fn test_vectors() -> Result<()> {
    test_oprf_evaluate::<NistP256>(&p256_oprf_tvs)?;

    let p256_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("VOPRF"));
+        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), 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)?;
@@ -145,7 +154,7 @@ fn test_vectors() -> Result<()> {
    test_voprf_evaluate::<NistP256>(&p256_voprf_tvs)?;

    let p256_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P256-SHA256"), String::from("POPRF"));
+        json_to_test_vectors!(rfc, String::from("P-256, SHA-256"), 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)?;
@@ -154,7 +163,7 @@ fn test_vectors() -> Result<()> {
    test_poprf_evaluate::<NistP256>(&p256_poprf_tvs)?;

    let p384_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("OPRF"));
+        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), 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)?;
@@ -163,7 +172,7 @@ fn test_vectors() -> Result<()> {
    test_oprf_evaluate::<NistP384>(&p384_oprf_tvs)?;

    let p384_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("VOPRF"));
+        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), 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)?;
@@ -172,7 +181,7 @@ fn test_vectors() -> Result<()> {
    test_voprf_evaluate::<NistP384>(&p384_voprf_tvs)?;

    let p384_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P384-SHA384"), String::from("POPRF"));
+        json_to_test_vectors!(rfc, String::from("P-384, SHA-384"), 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)?;
@@ -181,7 +190,7 @@ fn test_vectors() -> Result<()> {
    test_poprf_evaluate::<NistP384>(&p384_poprf_tvs)?;

    let p521_oprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("OPRF"));
+        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)?;
@@ -190,7 +199,7 @@ fn test_vectors() -> Result<()> {
    test_oprf_evaluate::<NistP521>(&p521_oprf_tvs)?;

    let p521_voprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("VOPRF"));
+        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)?;
@@ -199,7 +208,7 @@ fn test_vectors() -> Result<()> {
    test_voprf_evaluate::<NistP521>(&p521_voprf_tvs)?;

    let p521_poprf_tvs =
-        json_to_test_vectors!(rfc, String::from("P521-SHA512"), String::from("POPRF"));
+        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)?;
@@ -210,7 +219,11 @@ fn test_vectors() -> Result<()> {
    Ok(())
 }

-fn test_oprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_oprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        let server = OprfServer::<CS>::new_from_seed(&parameters.seed, &parameters.key_info)?;

@@ -222,7 +235,11 @@ fn test_oprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) ->
    Ok(())
 }

-fn test_voprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_voprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        let server = VoprfServer::<CS>::new_from_seed(&parameters.seed, &parameters.key_info)?;

@@ -238,7 +255,11 @@ fn test_voprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) ->
    Ok(())
 }

-fn test_poprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_poprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        let server = PoprfServer::<CS>::new_from_seed(&parameters.seed, &parameters.key_info)?;

@@ -255,7 +276,11 @@ fn test_poprf_seed_to_key<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) ->
 }

 // Tests input -> blind, blinded_element
-fn test_oprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_oprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let blind = CS::Group::deserialize_scalar(&parameters.blind[i])?;
@@ -276,7 +301,11 @@ fn test_oprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result
 }

 // Tests input -> blind, blinded_element
-fn test_voprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_voprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let blind = CS::Group::deserialize_scalar(&parameters.blind[i])?;
@@ -297,7 +326,11 @@ fn test_voprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Resul
 }

 // Tests input -> blind, blinded_element
-fn test_poprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_poprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let blind = CS::Group::deserialize_scalar(&parameters.blind[i])?;
@@ -318,7 +351,11 @@ fn test_poprf_blind<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Resul
 }

 // Tests sksm, blinded_element -> evaluation_element
-fn test_oprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_oprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let server = OprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -335,7 +372,13 @@ fn test_oprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters])
    Ok(())
 }

-fn test_voprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_voprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ScalarLen>,
+    Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ScalarLen>: ArrayLength<u8>,
+{
    for parameters in tvs {
        let mut rng = CycleRng::new(parameters.proof_random_scalar.clone());
        let server = VoprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -356,12 +399,18 @@ fn test_voprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters])
            assert_eq!(&parameter, &message.serialize().as_slice());
        }

-        assert_eq!(&parameters.proof, &proof.serialize().to_vec());
+        assert_eq!(&parameters.proof, &proof.serialize().as_slice());
    }
    Ok(())
 }

-fn test_poprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_poprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ScalarLen>,
+    Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ScalarLen>: ArrayLength<u8>,
+{
    for parameters in tvs {
        let mut rng = CycleRng::new(parameters.proof_random_scalar.clone());
        let server = PoprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -382,7 +431,8 @@ fn test_poprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters])
                blinded_elements.iter(),
                &prepared_evaluation_elements,
                &prepared_tweak,
-            )?;
+            )
+            .unwrap();

        let messages: Vec<_> = messages.collect();

@@ -390,13 +440,17 @@ fn test_poprf_blind_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters])
            assert_eq!(&parameter, &message.serialize().as_slice());
        }

-        assert_eq!(&parameters.proof, &proof.serialize().to_vec());
+        assert_eq!(&parameters.proof, &proof.serialize().as_slice());
    }
    Ok(())
 }

 // Tests input, blind, evaluation_element -> output
-fn test_oprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_oprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let client =
@@ -413,7 +467,11 @@ fn test_oprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Res
    Ok(())
 }

-fn test_voprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_voprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        let mut clients = vec![];
        for i in 0..parameters.input.len() {
@@ -448,7 +506,11 @@ fn test_voprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Re
    Ok(())
 }

-fn test_poprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_poprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        let mut clients = vec![];
        for i in 0..parameters.input.len() {
@@ -482,7 +544,11 @@ fn test_poprf_finalize<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Re
 }

 // Tests input, sksm -> output
-fn test_oprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_oprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let server = OprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -495,7 +561,11 @@ fn test_oprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Res
    Ok(())
 }

-fn test_voprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_voprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let server = VoprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -508,7 +578,11 @@ fn test_voprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Re
    Ok(())
 }

-fn test_poprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()> {
+fn test_poprf_evaluate<CS: CipherSuite>(tvs: &[VOPRFTestVectorParameters]) -> Result<()>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    for parameters in tvs {
        for i in 0..parameters.input.len() {
            let server = PoprfServer::<CS>::new_with_key(&parameters.sksm)?;
@@ -1,6 +1,10 @@
-// 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

@@ -9,14 +13,16 @@ use alloc::vec::Vec;
 use core::iter::{self, Map, Repeat, Zip};

 use derive_where::derive_where;
-use digest::Output;
-use hybrid_array::Array;
-use rand_core::{TryCryptoRng, TryRng};
+use digest::core_api::BlockSizeUser;
+use digest::{Digest, Output, OutputSizeUser};
+use generic_array::typenum::{IsLess, IsLessOrEqual, Unsigned, U256};
+use generic_array::GenericArray;
+use rand_core::{CryptoRng, RngCore};

 use crate::common::{
-    BlindedElement, EvaluationElement, FinalizeAfterUnblindResult, Mode, PreparedEvaluationElement,
-    Proof, derive_keypair, deterministic_blind_unchecked, finalize_after_unblind, generate_proof,
-    hash_to_group, server_evaluate_hash_input, verify_proof,
+    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,
 };
 #[cfg(feature = "serde")]
 use crate::serialization::serde::{Element, Scalar};
@@ -36,7 +42,11 @@ use crate::{CipherSuite, Error, Group, Result};
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct VoprfClient<CS: CipherSuite> {
+pub struct VoprfClient<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) blind: <CS::Group as Group>::Scalar,
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
@@ -52,7 +62,11 @@ pub struct VoprfClient<CS: CipherSuite> {
    derive(serde::Deserialize, serde::Serialize),
    serde(bound = "")
 )]
-pub struct VoprfServer<CS: CipherSuite> {
+pub struct VoprfServer<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    #[cfg_attr(feature = "serde", serde(with = "Scalar::<CS::Group>"))]
    pub(crate) sk: <CS::Group as Group>::Scalar,
    #[cfg_attr(feature = "serde", serde(with = "Element::<CS::Group>"))]
@@ -64,17 +78,21 @@ pub struct VoprfServer<CS: CipherSuite> {
 // =================== //
 /////////////////////////

-impl<CS: CipherSuite> VoprfClient<CS> {
+impl<CS: CipherSuite> VoprfClient<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Computes the first step for the multiplicative blinding version of
    /// DH-OPRF.
    ///
    /// # Errors
    /// [`Error::Input`] if the `input` is empty or longer then [`u16::MAX`].
-    pub fn blind<R: TryRng + TryCryptoRng>(
+    pub fn blind<R: RngCore + CryptoRng>(
        input: &[u8],
        blinding_factor_rng: &mut R,
    ) -> Result<VoprfClientBlindResult<CS>> {
-        let blind = CS::Group::random_scalar(blinding_factor_rng)?;
+        let blind = CS::Group::random_scalar(blinding_factor_rng);
        Self::deterministic_blind_unchecked_inner(input, blind)
    }

@@ -179,21 +197,25 @@ impl<CS: CipherSuite> VoprfClient<CS> {
        }
    }

-    /// Only used for test functions
+    // Only used for test functions
    #[cfg(test)]
    pub fn get_blind(&self) -> <CS::Group as Group>::Scalar {
        self.blind
    }
 }

-impl<CS: CipherSuite> VoprfServer<CS> {
+impl<CS: CipherSuite> VoprfServer<CS>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// Produces a new instance of a [VoprfServer] using a supplied RNG
    ///
    /// # Errors
    /// [`Error::Protocol`] if the protocol fails and can't be completed.
-    pub fn new<R: TryRng + TryCryptoRng>(rng: &mut R) -> Result<Self> {
-        let mut seed = Array::<_, <CS::Group as Group>::ScalarLen>::default();
-        rng.try_fill_bytes(&mut seed).map_err(|_| Error::Protocol)?;
+    pub fn new<R: RngCore + CryptoRng>(rng: &mut R) -> Result<Self> {
+        let mut seed = GenericArray::<_, <CS::Group as Group>::ScalarLen>::default();
+        rng.fill_bytes(&mut seed);
        // This can't fail as the hash output is type constrained.
        Self::new_from_seed(&seed, &[])
    }
@@ -224,7 +246,7 @@ impl<CS: CipherSuite> VoprfServer<CS> {
        Ok(Self { sk, pk })
    }

-    /// Only used for tests
+    // Only used for tests
    #[cfg(test)]
    pub fn get_private_key(&self) -> <CS::Group as Group>::Scalar {
        self.sk
@@ -233,7 +255,7 @@ impl<CS: CipherSuite> VoprfServer<CS> {
    /// Computes the second step for the multiplicative blinding version of
    /// DH-OPRF. This message is sent from the server (who holds the OPRF key)
    /// to the client.
-    pub fn blind_evaluate<R: TryRng + TryCryptoRng>(
+    pub fn blind_evaluate<R: RngCore + CryptoRng>(
        &self,
        rng: &mut R,
        blinded_element: &BlindedElement<CS>,
@@ -266,7 +288,7 @@ impl<CS: CipherSuite> VoprfServer<CS> {
    /// [`Error::Batch`] if the number of `blinded_elements` and
    /// `evaluation_elements` don't match or is longer then [`u16::MAX`]
    #[cfg(feature = "alloc")]
-    pub fn batch_blind_evaluate<'a, R: TryRng + TryCryptoRng, I>(
+    pub fn batch_blind_evaluate<'a, R: RngCore + CryptoRng, I>(
        &self,
        rng: &mut R,
        blinded_elements: &'a I,
@@ -317,7 +339,7 @@ impl<CS: CipherSuite> VoprfServer<CS> {
    pub fn batch_blind_evaluate_finish<
        'a,
        'b,
-        R: TryRng + TryCryptoRng,
+        R: RngCore + CryptoRng,
        IB: Iterator<Item = &'a BlindedElement<CS>> + ExactSizeIterator,
        IE,
    >(
@@ -338,14 +360,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 })
@@ -380,7 +402,11 @@ impl<CS: CipherSuite> VoprfServer<CS> {

 /// Contains the fields that are returned by a verifiable client blind
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
-pub struct VoprfClientBlindResult<CS: CipherSuite> {
+pub struct VoprfClientBlindResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The state to be persisted on the client
    pub state: VoprfClient<CS>,
    /// The message to send to the server
@@ -397,7 +423,11 @@ pub type VoprfClientBatchFinalizeResult<'a, C, I, II, IC, IM> = FinalizeAfterUnb

 /// Contains the fields that are returned by a verifiable server evaluate
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
-pub struct VoprfServerEvaluateResult<CS: CipherSuite> {
+pub struct VoprfServerEvaluateResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The message to send to the client
    pub message: EvaluationElement<CS>,
    /// The proof for the client to verify
@@ -407,7 +437,11 @@ pub struct VoprfServerEvaluateResult<CS: CipherSuite> {
 /// Contains the fields that are returned by a verifiable server batch evaluate
 #[derive_where(Debug; <CS::Group as Group>::Scalar, <CS::Group as Group>::Elem)]
 #[cfg(feature = "alloc")]
-pub struct VoprfServerBatchEvaluateResult<CS: CipherSuite> {
+pub struct VoprfServerBatchEvaluateResult<CS: CipherSuite>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
    /// The messages to send to the client
    pub messages: Vec<EvaluationElement<CS>>,
    /// The proof for the client to verify
@@ -438,6 +472,8 @@ pub type VoprfServerBatchEvaluateFinishedMessages<'a, CS, I> = Map<
 #[derive_where(Debug; <&'a I as IntoIterator>::IntoIter, <CS::Group as Group>::Scalar)]
 pub struct VoprfServerBatchEvaluateFinishResult<'a, CS: 'a + CipherSuite, I>
 where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
    &'a I: IntoIterator<Item = &'a PreparedEvaluationElement<CS>>,
 {
    /// The [`EvaluationElement`]s to send to the client
@@ -475,6 +511,8 @@ fn verifiable_unblind<'a, CS: 'a + CipherSuite, IC, IM>(
    proof: &Proof<CS>,
 ) -> Result<VoprfUnblindResult<'a, CS, IC, IM>>
 where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
    &'a IC: 'a + IntoIterator<Item = &'a VoprfClient<CS>>,
    <&'a IC as IntoIterator>::IntoIter: ExactSizeIterator,
    &'a IM: 'a + IntoIterator<Item = &'a EvaluationElement<CS>>,
@@ -503,6 +541,41 @@ where
        .map(|(blind, x)| x.0 * &CS::Group::invert_scalar(blind)))
 }

+type FinalizeAfterUnblindResult<'a, C, I, IE> = Map<
+    IE,
+    fn((I, <<C as CipherSuite>::Group as Group>::Elem)) -> Result<Output<<C as CipherSuite>::Hash>>,
+>;
+
+/// Returned values can only fail with [`Error::Input`].
+fn finalize_after_unblind<
+    'a,
+    CS: CipherSuite,
+    I: AsRef<[u8]>,
+    IE: 'a + Iterator<Item = (I, <CS::Group as Group>::Elem)>,
+>(
+    inputs_and_unblinded_elements: IE,
+) -> FinalizeAfterUnblindResult<'a, CS, I, IE>
+where
+    <CS::Hash as OutputSizeUser>::OutputSize:
+        IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+{
+    inputs_and_unblinded_elements.map(|(input, unblinded_element)| {
+        let elem_len = <CS::Group as Group>::ElemLen::U16.to_be_bytes();
+
+        // hashInput = I2OSP(len(input), 2) || input ||
+        //             I2OSP(len(unblindedElement), 2) || unblindedElement ||
+        //             "Finalize"
+        // return Hash(hashInput)
+        Ok(CS::Hash::new()
+            .chain_update(i2osp_2(input.as_ref().len()).map_err(|_| Error::Input)?)
+            .chain_update(input.as_ref())
+            .chain_update(elem_len)
+            .chain_update(CS::Group::serialize_elem(unblinded_element))
+            .chain_update(STR_FINALIZE)
+            .finalize())
+    })
+}
+
 ///////////
 // Tests //
 // ===== //
@@ -510,20 +583,46 @@ where

 #[cfg(test)]
 mod tests {
+    use core::ops::Add;
    use core::ptr;

    use ::alloc::vec;
    use ::alloc::vec::Vec;
-    use rand::rngs::SysRng;
+    use generic_array::typenum::Sum;
+    use generic_array::ArrayLength;
+    use rand::rngs::OsRng;

    use super::*;
-    use crate::Group;
    use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::tests::helpers::prf;
+    use crate::Group;

-    fn verifiable_retrieval<CS: CipherSuite>() {
+    fn prf<CS: CipherSuite>(
+        input: &[u8],
+        key: <CS::Group as Group>::Scalar,
+        mode: Mode,
+    ) -> Output<CS::Hash>
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, mode);
+        let point = CS::Group::hash_to_curve::<CS::Hash>(&[input], &dst.as_dst()).unwrap();
+
+        let res = point * &key;
+
+        finalize_after_unblind::<CS, _, _>(iter::once((input, res)))
+            .next()
+            .unwrap()
+            .unwrap()
+    }
+
+    fn verifiable_retrieval<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = VoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = VoprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server.blind_evaluate(&mut rng, &client_blind_result.message);
@@ -540,15 +639,19 @@ mod tests {
        assert_eq!(client_finalize_result, res2);
    }

-    fn verifiable_batch_retrieval<CS: CipherSuite>() {
-        let mut rng = SysRng;
+    fn verifiable_batch_retrieval<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        let mut rng = OsRng;
        let mut inputs = vec![];
        let mut client_states = vec![];
        let mut client_messages = vec![];
        let num_iterations = 10;
        for _ in 0..num_iterations {
            let mut input = [0u8; 32];
-            rng.try_fill_bytes(&mut input).unwrap();
+            rng.fill_bytes(&mut input);
            let client_blind_result = VoprfClient::<CS>::blind(&input, &mut rng).unwrap();
            inputs.push(input);
            client_states.push(client_blind_result.state);
@@ -584,15 +687,19 @@ mod tests {
        assert_eq!(client_finalize_result, res2);
    }

-    fn verifiable_batch_bad_public_key<CS: CipherSuite>() {
-        let mut rng = SysRng;
+    fn verifiable_batch_bad_public_key<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
+        let mut rng = OsRng;
        let mut inputs = vec![];
        let mut client_states = vec![];
        let mut client_messages = vec![];
        let num_iterations = 10;
        for _ in 0..num_iterations {
            let mut input = [0u8; 32];
-            rng.try_fill_bytes(&mut input).unwrap();
+            rng.fill_bytes(&mut input);
            let client_blind_result = VoprfClient::<CS>::blind(&input, &mut rng).unwrap();
            inputs.push(input);
            client_states.push(client_blind_result.state);
@@ -611,7 +718,7 @@ mod tests {
            .unwrap();
        let messages: Vec<_> = messages.collect();
        let wrong_pk = {
-            let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, Mode::Oprf);
+            let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, Mode::Oprf);
            // Choose a group element that is unlikely to be the right public key
            CS::Group::hash_to_curve::<CS::Hash>(&[b"msg"], &dst.as_dst()).unwrap()
        };
@@ -620,14 +727,18 @@ mod tests {
        assert!(client_finalize_result.is_err());
    }

-    fn verifiable_bad_public_key<CS: CipherSuite>() {
+    fn verifiable_bad_public_key<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = VoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = VoprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server.blind_evaluate(&mut rng, &client_blind_result.message);
        let wrong_pk = {
-            let dst = Dst::new::<CS, _>(STR_HASH_TO_GROUP, Mode::Oprf);
+            let dst = Dst::new::<CS, _, _>(STR_HASH_TO_GROUP, Mode::Oprf);
            // Choose a group element that is unlikely to be the right public key
            CS::Group::hash_to_curve::<CS::Hash>(&[b"msg"], &dst.as_dst()).unwrap()
        };
@@ -640,9 +751,13 @@ mod tests {
        assert!(client_finalize_result.is_err());
    }

-    fn verifiable_server_evaluate<CS: CipherSuite>() {
+    fn verifiable_server_evaluate<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = VoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = VoprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server.blind_evaluate(&mut rng, &client_blind_result.message);
@@ -666,12 +781,18 @@ mod tests {
        // inputs
        let wrong_input = b"wrong input";
        let server_evaluate = server.evaluate(wrong_input).unwrap();
-        assert_ne!(client_finalize, server_evaluate);
+        assert!(client_finalize != server_evaluate);
    }

-    fn zeroize_voprf_client<CS: CipherSuite>() {
+    fn zeroize_voprf_client<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ElemLen>: ArrayLength<u8>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = VoprfClient::<CS>::blind(input, &mut rng).unwrap();

        let mut state = client_blind_result.state;
@@ -683,9 +804,17 @@ mod tests {
        assert!(message.serialize().iter().all(|&x| x == 0));
    }

-    fn zeroize_voprf_server<CS: CipherSuite>() {
+    fn zeroize_voprf_server<CS: CipherSuite>()
+    where
+        <CS::Hash as OutputSizeUser>::OutputSize:
+            IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ElemLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ElemLen>: ArrayLength<u8>,
+        <CS::Group as Group>::ScalarLen: Add<<CS::Group as Group>::ScalarLen>,
+        Sum<<CS::Group as Group>::ScalarLen, <CS::Group as Group>::ScalarLen>: ArrayLength<u8>,
+    {
        let input = b"input";
-        let mut rng = SysRng;
+        let mut rng = OsRng;
        let client_blind_result = VoprfClient::<CS>::blind(input, &mut rng).unwrap();
        let server = VoprfServer::<CS>::new(&mut rng).unwrap();
        let server_result = server.blind_evaluate(&mut rng, &client_blind_result.message);
@@ -703,13 +832,53 @@ mod tests {
        assert!(proof.serialize().iter().all(|&x| x == 0));
    }

-    crate::tests::test_all_curves!(
-        verifiable_retrieval,
-        verifiable_batch_retrieval,
-        verifiable_bad_public_key,
-        verifiable_batch_bad_public_key,
-        verifiable_server_evaluate,
-        zeroize_voprf_client,
-        zeroize_voprf_server,
-    );
+    #[test]
+    fn test_functionality() -> Result<()> {
+        use p256::NistP256;
+        use p384::NistP384;
+        use p521::NistP521;
+
+        #[cfg(feature = "ristretto255")]
+        {
+            use crate::Ristretto255;
+
+            verifiable_retrieval::<Ristretto255>();
+            verifiable_batch_retrieval::<Ristretto255>();
+            verifiable_bad_public_key::<Ristretto255>();
+            verifiable_batch_bad_public_key::<Ristretto255>();
+            verifiable_server_evaluate::<Ristretto255>();
+
+            zeroize_voprf_client::<Ristretto255>();
+            zeroize_voprf_server::<Ristretto255>();
+        }
+
+        verifiable_retrieval::<NistP256>();
+        verifiable_batch_retrieval::<NistP256>();
+        verifiable_bad_public_key::<NistP256>();
+        verifiable_batch_bad_public_key::<NistP256>();
+        verifiable_server_evaluate::<NistP256>();
+
+        zeroize_voprf_client::<NistP256>();
+        zeroize_voprf_server::<NistP256>();
+
+        verifiable_retrieval::<NistP384>();
+        verifiable_batch_retrieval::<NistP384>();
+        verifiable_bad_public_key::<NistP384>();
+        verifiable_batch_bad_public_key::<NistP384>();
+        verifiable_server_evaluate::<NistP384>();
+
+        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(())
+    }
 }