chore: bump to 0.6.0-rc.0, migrate to elliptic-curve 0.14, hash2curve 0.14, rand_core 0.10

2026-06-27 14:35:50 +02:00
31 changed files with 954 additions and 1660 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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@3d3c42e5aac5ba805825da76410c181273ba90b1 # 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,179 @@
+name: Rust CI
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  cargo-audit:
+    name: Audit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache cargo-audit
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/.crates.toml
+            ~/.cargo/.crates2.json
+            ~/.cargo/bin/cargo-audit
+          key: cargo-audit
+
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
+
+      - name: Checkout sources
+        uses: actions/checkout@v6
+
+      - name: Run cargo audit
+        run: cargo audit -D warnings
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        backend_feature:
+          - --features ristretto255-ciphersuite
+          -
+        frontend_feature:
+          -
+          - --features danger
+          - --features serde
+        toolchain:
+          - stable
+          - 1.85.0
+    name: test
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+
+      - name: Install ${{ matrix.toolchain }} toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.toolchain }}
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --no-default-features ${{ matrix.backend_feature }}
+
+      - name: Run cargo test with alloc
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --no-default-features ${{ matrix.frontend_feature }},alloc ${{ matrix.backend_feature }}
+
+      - name: Run cargo test with std
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --no-default-features ${{ matrix.frontend_feature }},std ${{ matrix.backend_feature }}
+
+      - name: Run cargo test with all features enabled
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
+
+  build-no-std:
+    name: Build with no-std on ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          # for wasm
+          - wasm32-unknown-unknown
+          # for any no_std target
+          - thumbv6m-none-eabi
+        backend_feature:
+          -
+          - --features ristretto255-ciphersuite
+        frontend_feature:
+          -
+          - --features danger
+          - --features serde
+    steps:
+      - uses: actions/checkout@v6
+      - uses: hecrj/setup-rust-action@v2
+      - run: rustup target add ${{ matrix.target }}
+      - run: cargo build --verbose --target=${{ matrix.target }} --no-default-features ${{ matrix.frontend_feature }} ${{ matrix.backend_feature }}
+
+
+  clippy:
+    name: cargo clippy
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: clippy
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features --all-targets -- -D warnings
+
+      - name: Run cargo doc
+        uses: actions-rs/cargo@v1
+        env:
+          RUSTDOCFLAGS: -D warnings
+        with:
+          command: doc
+          args: --no-deps --document-private-items --features danger,std
+
+
+  rustfmt:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v6
+
+      - name: Install nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          components: rustfmt
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+  taplo:
+    name: Taplo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cache
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/.crates.toml
+            ~/.cargo/.crates2.json
+            ~/.cargo/bin/taplo
+          key: taplo
+
+      - name: Install Taplo
+        run: cargo install taplo-cli --locked
+
+      - name: Checkout sources
+        uses: actions/checkout@v6
+
+      - name: Run Taplo
+        run: taplo fmt --check
@@ -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,10 @@
 # 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
@@ -1,48 +1,20 @@
 # 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`.
-
+## 0.6.0-rc.0 (June 27, 2026)
 * 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 `generic-array` with `hybrid-array`
+* Updated `digest` dependency to 0.11
+* Updated `rand_core` dependency to 0.10
+* Updated `rand` dependency to 0.10
+* Updated `sha2` dependency to 0.11
+* Updated `p256`, `p384`, `p521` dependencies to 0.14.0-rc
 * Replaced `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>`
+* Updated `hash_to_scalar` to use `MapToCurve::Length` as OKM length per RFC 9380, replacing the removed `GroupDigest::hash_to_scalar` method
+* Updated `random_scalar` to consume exactly `ScalarLen` bytes per attempt, adapting to the new `rand_core 0.10` API
+* Added `OkmLen` associated type to `Group` trait

 ## 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
@@ -50,50 +22,40 @@ Forked from [facebook/voprf](https://github.com/facebook/voprf/) at `0.6.0-pre.1
 * Fixed docs issue

 ## 0.6.0-pre.0 (November 8, 2025)
-
 * MSRV bumped to 1.83
 * Updated Ristretto255 random scalar generation
 * Updated generic-array to v1

 ## 0.5.0 (March 6, 2024)
-
 * Just a version bump from v0.5.0-pre.7

 ## 0.5.0-pre.7 (January 11, 2024)
-
 * Updated to be in sync with RFC 9497

 ## 0.5.0-pre.6 (July 24, 2023)
-
 * Updated curve25519-dalek dependency to 4

 ## 0.5.0-pre.5 (June 27, 2023)
-
 * Updated curve25519-dalek dependency to 4.0.0-rc.3

 ## 0.5.0-pre.4 (May 20, 2023)
-
 * Updated curve25519-dalek dependency to 4.0.0-rc.2

 ## 0.5.0-pre.3 (March 4, 2023)
-
 * Updated to be in sync with draft-irtf-cfrg-voprf-19
 * Increased MSRV to 1.65
 * Updated p256 dependency to v0.13
 * Added p384 tests

 ## 0.5.0-pre.2 (February 3, 2023)
-
 * Increased MSRV to 1.60
 * Updated p256 dependency to v0.12
 * Updated curve25519-dalek dependency to 4.0.0-rc.1

 ## 0.5.0-pre.1 (December 19, 2022)
-
 * Updated curve25519-dalek dependency to 4.0.0-pre.5

 ## 0.4.0 (September 15, 2022)
-
 * Updated to be in sync with draft-irtf-cfrg-voprf-11, with
  the addition of the POPRF mode
 * Adds the evaluate() function to the servers to calculate the output of the OPRF
@@ -7,6 +7,6 @@ We use GitHub issues to track public bugs. Please ensure your description is
 clear and has sufficient instructions to be able to reproduce the issue.

 ## License
-By contributing to voprf-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,855 +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 2.0.118",
-]
-
-[[package]]
-name = "der"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d"
-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 2.0.118",
-]
-
-[[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.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.3",
-]
-
-[[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.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b"
-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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad64cc32c2dc466317c12ee5853e61f159f9eab1fe7efade0395dc2e7b43449"
-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.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2"
-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.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
-dependencies = [
- "serde_core",
- "serde_derive",
-]
-
-[[package]]
-name = "serde_core"
-version = "1.0.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.229"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 3.0.3",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.151"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
-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 = "syn"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
-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.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7cbbc0a705a0fd05cc3676525980d2bf5a9bc4adac6d6475209a7887cf59d19"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e817b7b52d0c7358d3246da9d69935ebb18116b2b102b4230dac079b4862f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.118",
-]
-
-[[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,20 +1,19 @@
 [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/"
+repository = "https://github.com/facebook/voprf/"
 rust-version = "1.87"
-version = "1.0.0"
+version = "0.6.0-rc.0"

 [features]
 alloc = []
 danger = []
-doctest = ["dep:p256", "dep:sha2"]
 default = ["ristretto255-ciphersuite", "dep:serde"]
 ristretto255 = ["dep:curve25519-dalek"]
 ristretto255-ciphersuite = ["ristretto255", "dep:sha2"]
@@ -22,35 +21,34 @@ serde = ["curve25519-dalek?/serde", "hybrid-array/serde", "dep:serde"]
 std = ["alloc"]

 [dependencies]
-curve25519-dalek = { version = "5", default-features = false, features = ["rand_core", "zeroize"], optional = true }
+curve25519-dalek = { version = "4", default-features = false, features = ["rand_core", "zeroize"], optional = true }
 derive-where = { version = "1", features = ["zeroize-on-drop"] }
-digest = { version = "0.11", features = ["zeroize"] }
+digest = "0.11"
 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 }
+hybrid-array = "0.4"
+rand_core = { version = "0.10", default-features = false, features = [] }
 serde = { version = "1", default-features = false, features = [
    "derive",
 ], 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 }
+sha2 = { version = "0.11", default-features = false, optional = true }
 subtle = { version = "2.6", default-features = false }
 zeroize = { version = "1.5", default-features = false }

 [dev-dependencies]
 hex = "0.4"
-p256 = { version = "0.14", default-features = false, features = [
+p256 = { version = "0.14.0-rc", default-features = false, features = [
    "hash2curve",
    "oprf",
 ] }
-p384 = { version = "0.14", default-features = false, features = [
+p384 = { version = "0.14.0-rc", default-features = false, features = [
    "hash2curve",
    "oprf",
 ] }
-p521 = { version = "0.14", default-features = false, features = [
+p521 = { version = "0.14.0-rc", default-features = false, features = [
    "hash2curve",
    "oprf",
 ] }
@@ -64,4 +62,3 @@ sha2 = "0.11"
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 targets = []
-features = ["doctest"]
@@ -1,4 +1,4 @@
-# voprf
+# voprf ![Build Status](https://github.com/novifinancial/voprf/workflows/Rust%20CI/badge.svg)
 An implementation of a (verifiable) oblivious pseudorandom function (VOPRF)

 A VOPRF is a verifiable oblivious pseudorandom function, a protocol between a client and a server. The regular (non-verifiable) OPRF is also supported in this implementation.
@@ -8,7 +8,7 @@ This implementation is based on [RFC 9497](https://www.rfc-editor.org/rfc/rfc949
 Documentation
 -------------

-The API can be found [here](https://docs.rs/voprf-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,7 +16,7 @@ Installation
 Add the following line to the dependencies of your `Cargo.toml`:

 ```
-voprf-vx = "1.0.0"
+voprf = { package = "voprf-vexahub", version = "0.6.0-rc.0" }
 ```

 ### Minimum Supported Rust Version
@@ -26,9 +26,7 @@ Rust **1.87** 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,20 +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.

 //! Defines the CipherSuite trait to specify the underlying primitives for VOPRF

 use crate::Group;
+use core::ops::Mul;
 use digest::block_api::BlockSizeUser;
 use digest::typenum::{IsLess, IsLessOrEqual, U256};
-use digest::{FixedOutput, HashMarker, OutputSizeUser};
-use hash2curve::{ExpandMsg, GroupDigest, MapToCurve, OprfParameters};
-use hybrid_array::ArraySize;
+use digest::{Digest, FixedOutput, HashMarker, OutputSizeUser};
 use hybrid_array::typenum::{IsGreaterOrEqual, Prod, True, U2};
+use hybrid_array::ArraySize;

 /// Configures the underlying primitives used in VOPRF
 pub trait CipherSuite
 where
+    <Self::Group as Group>::SecurityLevel: Mul<U2>,
    <Self::Hash as OutputSizeUser>::OutputSize: ArraySize
        + IsLess<U256>
        + IsLessOrEqual<<Self::Hash as BlockSizeUser>::BlockSize, Output = True>
@@ -30,23 +35,5 @@ where

    /// The main hash function to use (for HKDF computations and hashing
    /// transcripts).
-    type Hash: BlockSizeUser + Default + FixedOutput + HashMarker;
-}
-
-/// The hash function associated with a curve's OPRF `expand_message` implementation.
-type OprfHash<T> =
-    <<T as GroupDigest>::ExpandMsg as ExpandMsg<<T as MapToCurve>::SecurityLevel>>::Hash;
-
-impl<T: OprfParameters> CipherSuite for T
-where
-    T: Group,
-    OprfHash<T>: BlockSizeUser + Default + FixedOutput + HashMarker,
-    <OprfHash<T> as OutputSizeUser>::OutputSize: ArraySize
-        + IsLess<U256>
-        + IsLessOrEqual<<OprfHash<T> as BlockSizeUser>::BlockSize, Output = True>
-        + IsGreaterOrEqual<Prod<<T as Group>::SecurityLevel, U2>, Output = True>,
-{
-    const ID: &'static [u8] = T::ID;
-    type Group = T;
-    type Hash = OprfHash<T>;
+    type Hash: Digest + BlockSizeUser + Default + FixedOutput + HashMarker;
 }
@@ -1,16 +1,19 @@
-// 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::{Digest, Output, OutputSizeUser};
-use hybrid_array::typenum::{IsLess, U2, U9, U256, Unsigned};
+use hybrid_array::typenum::{IsLess, Unsigned, U2, U256, U9};
 use hybrid_array::{Array, ArrayN, ArraySize};
 use rand_core::{TryCryptoRng, TryRng};
 use subtle::ConstantTimeEq;
@@ -398,12 +401,6 @@ pub(crate) fn deterministic_blind_unchecked<CS: CipherSuite>(
    mode: Mode,
 ) -> Result<<CS::Group as Group>::Elem> {
    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)
 }

@@ -450,33 +447,6 @@ pub(crate) fn server_evaluate_hash_input<CS: CipherSuite>(
        .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: ArraySize> {
    dst_1: Array<u8, L>,
    dst_2: &'static [u8],
@@ -492,7 +462,7 @@ impl<L: ArraySize> Dst<L> {
        // <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"-"));
+            .concat(ArrayN::<u8, 1>::from([b'-']));

        let dst_1 = par_1.concat(par_2);
        let dst_2 = CS::ID;
@@ -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.

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

@@ -18,7 +22,7 @@ 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,
@@ -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 core::ops::{Add, Mul};
 use digest::block_api::BlockSizeUser;
@@ -12,20 +16,20 @@ use elliptic_curve::{
    AffinePoint, Field, FieldBytes, FieldBytesSize, Group as _, ProjectivePoint, PublicKey, Scalar,
    SecretKey,
 };
-use hash2curve::{ExpandMsgXmd, GroupDigest, MapToCurve, hash_to_scalar};
+use hash2curve::{hash_to_scalar, ExpandMsgXmd, GroupDigest};
 use hybrid_array::typenum::{IsGreaterOrEqual, Prod, Sum, True, U2};
 use hybrid_array::{Array, ArraySize};
 use rand_core::TryCryptoRng;

 use super::Group;
-use crate::{Error, InternalError, Result};
+use crate::{CipherSuite, 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: GroupDigest + CipherSuite + hash2curve::MapToCurve,
    C::SecurityLevel: Mul<U2>,
    C::SecurityLevel: ArraySize,
    <C::SecurityLevel as Mul<U2>>::Output: ArraySize,
@@ -33,7 +37,8 @@ where
    ScalarLen<Self>: ModulusSize,
    ScalarLen<Self>: ArraySize,
    ScalarLen<Self>: hybrid_array::typenum::NonZero,
-    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, <C as MapToCurve>::Length>>,
+    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, ScalarLen<Self>>>,
+    Scalar<Self>: elliptic_curve::ops::Reduce<Array<u8, <C as hash2curve::MapToCurve>::Length>>,
    AffinePoint<Self>: FromSec1Point<Self> + ToSec1Point<Self>,
    // `VoprfClientLen`, `PoprfClientLen`, `VoprfServerLen`, `PoprfServerLen`
    ScalarLen<Self>: Add<ElemLen<Self>>,
@@ -53,6 +58,8 @@ where

    type SecurityLevel = C::SecurityLevel;

+    type OkmLen = <C as hash2curve::MapToCurve>::Length;
+
    // Implements the `hash_to_curve()` function from
    // https://www.rfc-editor.org/rfc/rfc9380.html#section-3
    fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError> {
@@ -63,11 +70,11 @@ where
    fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
    where
        H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256>
-            + IsLessOrEqual<H::BlockSize, Output = True>
-            + IsGreaterOrEqual<Prod<C::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
+        C::SecurityLevel: Mul<U2>,
+        H::OutputSize: IsGreaterOrEqual<Prod<C::SecurityLevel, U2>, Output = True>,
    {
-        hash_to_scalar::<C, ExpandMsgXmd<H>, <C as MapToCurve>::Length>(input, dst)
+        hash_to_scalar::<C, ExpandMsgXmd<H>, <C as hash2curve::MapToCurve>::Length>(input, dst)
            .map_err(|_| InternalError::Input)
    }

@@ -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

@@ -60,7 +64,10 @@ where
    /// Used to enforce `H::OutputSize >= 2 * SecurityLevel` in
    /// `hash_to_curve` and `hash_to_scalar`, which corresponds to the
    /// `expand_message` requirement `len_in_bytes = 2 * k / 8`.
-    type SecurityLevel: ArraySize + Mul<U2>;
+    type SecurityLevel: ArraySize;
+
+    /// The OKM length for hash_to_scalar (>= ScalarLen, used by hash_to_field).
+    type OkmLen: ArraySize + hybrid_array::typenum::NonZero;

    /// Transforms a password and domain separation tag (DST) into a curve point
    ///
@@ -70,9 +77,9 @@ where
    fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError>
    where
        H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256>
-            + IsLessOrEqual<H::BlockSize, Output = True>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
+        Self::SecurityLevel: Mul<U2>,
+        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;

    /// Hashes a slice of pseudo-random bytes to a scalar
    ///
@@ -82,9 +89,9 @@ where
    fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
    where
        H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256>
-            + IsLessOrEqual<H::BlockSize, Output = True>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
+        Self::SecurityLevel: Mul<U2>,
+        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>;

    /// Get the base point for the group
    fn base_elem() -> Self::Elem;
@@ -1,9 +1,13 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-// Copyright (c) VexaHub and contributors.
 // Copyright (c) Meta Platforms, Inc. and affiliates.
+//
+// This source code is dual-licensed under either the MIT license found in the
+// LICENSE-MIT file in the root directory of this source tree or the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree. You may select, at your option, one of the above-listed
+// licenses.

 use core::num::NonZeroU16;
-
+use core::ops::Mul;
 use curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
 use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};
 use curve25519_dalek::scalar::Scalar;
@@ -11,10 +15,10 @@ use curve25519_dalek::traits::Identity;
 use digest::block_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,
+    IsGreaterOrEqual, IsLess, IsLessOrEqual, Prod, True, U16, U2, U256, U32, U64,
 };
+use hybrid_array::Array;
 use rand_core::{TryCryptoRng, TryRng};
 use subtle::ConstantTimeEq;

@@ -45,16 +49,27 @@ impl Group for Ristretto255 {

    type SecurityLevel = U16;

+    type OkmLen = U64;
+
    // Implements the `hash_to_ristretto255()` function from
    // https://www.rfc-editor.org/rfc/rfc9380.html#appendix-B
    fn hash_to_curve<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Elem, InternalError>
    where
        H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256>
-            + IsLessOrEqual<H::BlockSize, Output = True>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
+        Self::SecurityLevel: Mul<U2>,
+        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
    {
-        let uniform_bytes = expand_uniform_bytes::<H>(input, dst)?;
+        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(RistrettoPoint::from_uniform_bytes(&uniform_bytes))
    }
@@ -64,11 +79,20 @@ impl Group for Ristretto255 {
    fn hash_to_scalar<H>(input: &[&[u8]], dst: &[&[u8]]) -> Result<Self::Scalar, InternalError>
    where
        H: BlockSizeUser + Default + FixedOutput + HashMarker,
-        H::OutputSize: IsLess<U256>
-            + IsLessOrEqual<H::BlockSize, Output = True>
-            + IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
+        H::OutputSize: IsLess<U256> + IsLessOrEqual<H::BlockSize, Output = True>,
+        Self::SecurityLevel: Mul<U2>,
+        H::OutputSize: IsGreaterOrEqual<Prod<Self::SecurityLevel, U2>, Output = True>,
    {
-        let uniform_bytes = expand_uniform_bytes::<H>(input, dst)?;
+        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(Scalar::from_bytes_mod_order_wide(&uniform_bytes))
    }
@@ -132,22 +156,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,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.

 //! An implementation of a verifiable oblivious pseudorandom function (VOPRF)
 //!
@@ -16,7 +20,7 @@
 //! We will use the following choice in this example:
 //!
 //! ```ignore
-//! type CipherSuite = voprf_vx::Ristretto255;
+//! type CipherSuite = voprf::Ristretto255;
 //! ```
 //!
 //! ## Modes of Operation
@@ -47,12 +51,12 @@
 //!
 //! ```
 //! # #[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 voprf::OprfServer;
 //!
 //! let mut server_rng = SysRng;
 //! let server = OprfServer::<CipherSuite>::new(&mut server_rng);
@@ -67,12 +71,12 @@
 //!
 //! ```
 //! # #[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 voprf::OprfClient;
 //!
 //! let mut client_rng = SysRng;
 //! let client_blind_result = OprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
@@ -88,10 +92,10 @@
 //!
 //! ```
 //! # #[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 voprf::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -99,7 +103,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
+//! # use voprf::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let server_evaluate_result = server.blind_evaluate(&client_blind_result.message);
@@ -113,10 +117,10 @@
 //!
 //! ```
 //! # #[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 voprf::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -124,7 +128,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
+//! # use voprf::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
@@ -146,10 +150,10 @@
 //!
 //! ```
 //! # #[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 voprf::OprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -157,7 +161,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::OprfServer;
+//! # use voprf::OprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = OprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let message = server.blind_evaluate(&client_blind_result.message);
@@ -193,12 +197,12 @@
 //!
 //! ```
 //! # #[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 voprf::VoprfServer;
 //!
 //! let mut server_rng = SysRng;
 //! let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
@@ -220,12 +224,12 @@
 //!
 //! ```
 //! # #[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 voprf::VoprfClient;
 //!
 //! let mut client_rng = SysRng;
 //! let client_blind_result = VoprfClient::<CipherSuite>::blind(b"input", &mut client_rng)
@@ -242,10 +246,10 @@
 //!
 //! ```
 //! # #[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 voprf::{VoprfServerEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -253,7 +257,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerEvaluateResult { message, proof } =
@@ -269,10 +273,10 @@
 //!
 //! ```
 //! # #[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 voprf::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -280,7 +284,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
@@ -310,10 +314,10 @@
 //!
 //! ```
 //! # #[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 voprf::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -321,7 +325,7 @@
 //! #     b"input",
 //! #     &mut client_rng,
 //! # ).expect("Unable to construct client");
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let server_evaluate_result = server.blind_evaluate(
@@ -364,10 +368,10 @@
 //!
 //! ```
 //! # #[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 voprf::VoprfClient;
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! let mut client_rng = SysRng;
@@ -388,10 +392,10 @@
 //!
 //! ```
 //! # #[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 voprf::{VoprfServerBatchEvaluateFinishResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -405,7 +409,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let prepared_evaluation_elements = server.batch_blind_evaluate_prepare(client_messages.iter());
@@ -422,10 +426,10 @@
 //! ```
 //! # #[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 voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -439,7 +443,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! let VoprfServerBatchEvaluateResult { messages, proof } = server
@@ -456,10 +460,10 @@
 //! ```
 //! # #[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 voprf::{VoprfServerBatchEvaluateResult, VoprfClient};
 //! # use rand::{rngs::SysRng, Rng};
 //! #
 //! # let mut client_rng = SysRng;
@@ -473,7 +477,7 @@
 //! #     client_states.push(client_blind_result.state);
 //! #     client_messages.push(client_blind_result.message);
 //! # }
-//! # use voprf_vx::VoprfServer;
+//! # use voprf::VoprfServer;
 //! # let mut server_rng = SysRng;
 //! # let server = VoprfServer::<CipherSuite>::new(&mut server_rng).unwrap();
 //! # let VoprfServerBatchEvaluateResult { messages, proof } = server
@@ -1,19 +1,24 @@
-// 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 digest::{Digest, Output};
+use hybrid_array::typenum::Unsigned;
 use hybrid_array::Array;
 use rand_core::{TryCryptoRng, TryRng};

 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;
@@ -119,7 +124,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()
    }

@@ -216,6 +221,43 @@ pub struct OprfClientBlindResult<CS: CipherSuite> {
    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<'a, CS, I, IE> {
+    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,13 +267,29 @@ pub struct OprfClientBlindResult<CS: CipherSuite> {
 mod tests {
    use core::ptr;

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

    use super::*;
-    use crate::Group;
    use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::tests::helpers::prf;
+    use crate::Group;
+
+    fn prf<CS: CipherSuite>(
+        input: &[u8],
+        key: <CS::Group as Group>::Scalar,
+        info: &[u8],
+        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)), info)
+            .next()
+            .unwrap()
+            .unwrap()
+    }

    fn base_retrieval<CS: CipherSuite>() {
        let input = b"input";
@@ -240,7 +298,7 @@ mod tests {
        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);
    }

@@ -256,7 +314,7 @@ mod tests {

        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();
@@ -317,11 +375,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

@@ -15,9 +19,9 @@ use hybrid_array::{Array, ArraySize};
 use rand_core::{TryCryptoRng, TryRng};

 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};
@@ -367,7 +371,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 +379,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 })
@@ -732,8 +736,8 @@ mod tests {
    use rand::rngs::SysRng;

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

    fn prf<CS: CipherSuite>(
        input: &[u8],
@@ -873,11 +877,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,235 @@
-// 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 hybrid_array::Array;

 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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<u8, VoprfClientLen<CS>> {
+        <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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<u8, PoprfClientLen<CS>> {
+        <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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<u8, VoprfServerLen<CS>> {
+        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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<u8, PoprfServerLen<CS>> {
+        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> {
+    /// 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)?;
+
+        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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<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> {
+    /// Serialization into bytes
+    pub fn serialize(&self) -> Array<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,158 +261,6 @@ 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;
@@ -260,7 +321,6 @@ mod test {
        VoprfClient, VoprfServer,
    };

-    // Fuzz: no panics on arbitrary input
    macro_rules! test_deserialize {
        ($item:ident, $bytes:ident) => {
            #[cfg(feature = "ristretto255")]
@@ -268,43 +328,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 +381,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,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.

 //! The VOPRF test vectors taken from:
 //! https://www.rfc-editor.org/rfc/rfc9497#appendix-A
@@ -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,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::vec::Vec;
 use core::cmp::min;
@@ -1,13 +1,30 @@
-// 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;
+impl crate::CipherSuite for p256::NistP256 {
+    const ID: &'static [u8] = <p256::NistP256 as hash2curve::OprfParameters>::ID;
+    type Group = p256::NistP256;
+    type Hash = sha2::Sha256;
+}

-pub(crate) use macros::test_all_curves;
+impl crate::CipherSuite for p384::NistP384 {
+    const ID: &'static [u8] = <p384::NistP384 as hash2curve::OprfParameters>::ID;
+    type Group = p384::NistP384;
+    type Hash = sha2::Sha384;
+}
+
+impl crate::CipherSuite for p521::NistP521 {
+    const ID: &'static [u8] = <p521::NistP521 as hash2curve::OprfParameters>::ID;
+    type Group = p521::NistP521;
+    type Hash = sha2::Sha512;
+}
@@ -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;
@@ -15,14 +19,15 @@ fn parse_ciphersuites(input: &str) -> String {
    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")
@@ -33,13 +38,15 @@ fn parse_modes(input: &str) -> String {
    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")
@@ -52,9 +59,11 @@ fn parse_vectors(input: &str) -> String {
    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,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;
 use alloc::vec;
@@ -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,15 @@ use alloc::vec::Vec;
 use core::iter::{self, Map, Repeat, Zip};

 use derive_where::derive_where;
-use digest::Output;
+use digest::{Digest, Output};
+use hybrid_array::typenum::Unsigned;
 use hybrid_array::Array;
 use rand_core::{TryCryptoRng, TryRng};

 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};
@@ -338,14 +343,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 })
@@ -503,6 +508,37 @@ 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> {
+    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 //
 // ===== //
@@ -517,9 +553,24 @@ mod tests {
    use rand::rngs::SysRng;

    use super::*;
-    use crate::Group;
    use crate::common::{Dst, STR_HASH_TO_GROUP};
-    use crate::tests::helpers::prf;
+    use crate::Group;
+
+    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()
+    }

    fn verifiable_retrieval<CS: CipherSuite>() {
        let input = b"input";
@@ -666,7 +717,7 @@ 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>() {
@@ -703,13 +754,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(())
+    }
 }