diff --git a/.github/scripts/build-server.sh b/.github/scripts/build-server.sh
index 120a9065a4..16ebcf0ebc 100755
--- a/.github/scripts/build-server.sh
+++ b/.github/scripts/build-server.sh
@@ -6,8 +6,7 @@ environment=$1
aws s3 sync .git s3://tlsn-deploy/$environment/.git --delete
-cd notary-server
-cargo build --release
-aws s3 cp target/release/notary-server s3://tlsn-deploy/$environment/
+cargo build -p notary-server --release
+aws s3 cp ./target/release/notary-server s3://tlsn-deploy/$environment/
exit 0
diff --git a/.github/scripts/deploy-server.sh b/.github/scripts/deploy-server.sh
index 844bc6be3e..ff86ca1742 100755
--- a/.github/scripts/deploy-server.sh
+++ b/.github/scripts/deploy-server.sh
@@ -4,11 +4,11 @@ set -ex
environment=$1
branch=$2
-INSTANCE_ID=$(aws ec2 describe-instances --filters Name=tag:Name,Values=[tlsnotary-backend] --query "Reservations[*].Instances[*][InstanceId]" --output text)
+INSTANCE_ID=$(aws ec2 describe-instances --filters Name=tag:Name,Values=[tlsnotary-backend-v1] Name=instance-state-name,Values=[running] --query "Reservations[*].Instances[*][InstanceId]" --output text)
aws ec2 create-tags --resources $INSTANCE_ID --tags "Key=$environment,Value=$branch"
COMMIT_HASH=$(git rev-parse HEAD)
-DEPLOY_ID=$(aws deploy create-deployment --application-name tlsn-$environment --deployment-group-name tlsn-$environment-group --github-location repository=$GITHUB_REPOSITORY,commitId=$COMMIT_HASH --ignore-application-stop-failures --file-exists OVERWRITE --output text)
+DEPLOY_ID=$(aws deploy create-deployment --application-name tlsn-$environment-v1 --deployment-group-name tlsn-$environment-v1-group --github-location repository=$GITHUB_REPOSITORY,commitId=$COMMIT_HASH --ignore-application-stop-failures --file-exists OVERWRITE --output text)
while true; do
STATUS=$(aws deploy get-deployment --deployment-id $DEPLOY_ID --query 'deploymentInfo.status' --output text)
diff --git a/.github/scripts/modify-proxy.sh b/.github/scripts/modify-proxy.sh
new file mode 100755
index 0000000000..921b1641f3
--- /dev/null
+++ b/.github/scripts/modify-proxy.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# This script is triggered by Deploy server workflow in order to send an execution command of cd-scripts/modify_proxy.sh via AWS SSM to the proxy server
+
+set -e
+
+GH_OWNER="tlsnotary"
+GH_REPO="tlsn"
+BACKEND_INSTANCE_ID=$(aws ec2 describe-instances --filters Name=tag:Name,Values=[tlsnotary-backend-v1] Name=instance-state-name,Values=[running] --query "Reservations[*].Instances[*][InstanceId]" --output text)
+PROXY_INSTANCE_ID=$(aws ec2 describe-instances --filters Name=tag:Name,Values=[tlsnotary-web] Name=instance-state-name,Values=[running] --query "Reservations[*].Instances[*][InstanceId]" --output text)
+TAGS=$(aws ec2 describe-instances --instance-ids $BACKEND_INSTANCE_ID --query 'Reservations[*].Instances[*].Tags')
+
+TAG=$(echo $TAGS | jq -r '.[][][] | select(.Key == "stable").Value')
+PORT=$(echo $TAGS | jq -r '.[][][] | select(.Key == "port").Value')
+
+COMMAND_ID=$(aws ssm send-command --document-name "AWS-RunRemoteScript" --instance-ids $PROXY_INSTANCE_ID --parameters '{"sourceType":["GitHub"],"sourceInfo":["{\"owner\":\"'${GH_OWNER}'\", \"repository\":\"'${GH_REPO}'\", \"getOptions\":\"branch:'${TAG}'\", \"path\": \"cd-scripts\"}"],"commandLine":["modify_proxy.sh '${PORT}' '${TAG}' "]}' --output text --query "Command.CommandId")
+
+while true; do
+ SSM_STATUS=$(aws ssm list-command-invocations --command-id $COMMAND_ID --details --query "CommandInvocations[].Status" --output text)
+
+ if [ $SSM_STATUS != "Success" ] && [ $SSM_STATUS != "InProgress" ]; then
+ echo "Proxy modification failed"
+ aws ssm list-command-invocations --command-id $COMMAND_ID --details --query "CommandInvocations[].CommandPlugins[].{Status:Status,Output:Output}"
+ exit 1
+ elif [ $SSM_STATUS = "Success" ]; then
+ aws ssm list-command-invocations --command-id $COMMAND_ID --details --query "CommandInvocations[].CommandPlugins[].{Status:Status,Output:Output}"
+ echo "Success"
+ break
+ fi
+
+ sleep 2
+done
+
+exit 0
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
new file mode 100644
index 0000000000..61a1eac9c7
--- /dev/null
+++ b/.github/workflows/bench.yml
@@ -0,0 +1,27 @@
+name: Run Benchmarks
+on:
+ # manual trigger
+ workflow_dispatch:
+
+jobs:
+ run-benchmarks:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Build Docker Image
+ run: |
+ docker build -t tlsn-bench . -f ./crates/benches/benches.Dockerfile
+
+ - name: Run Benchmarks
+ run: |
+ docker run --privileged -v ${{ github.workspace }}/crates/benches/:/benches tlsn-bench
+
+ - name: Upload runtime_vs_latency.html
+ uses: actions/upload-artifact@v4
+ with:
+ name: benchmark_graphs
+ path: |
+ ./crates/benches/runtime_vs_latency.html
+ ./crates/benches/runtime_vs_bandwidth.html
diff --git a/.github/workflows/cd-server.yml b/.github/workflows/cd-server.yml
index 562f6b9058..123dc8cc94 100644
--- a/.github/workflows/cd-server.yml
+++ b/.github/workflows/cd-server.yml
@@ -44,13 +44,13 @@ jobs:
exit 1
fi
- - name: Wait for test workflow to succeed
+ - name: Wait for integration test workflow to succeed
if: github.event_name == 'push'
uses: lewagon/wait-on-check-action@v1.3.1
with:
ref: ${{ github.ref }}
- # Have to be specify '(notary-server)', as we are using matrix for build_and_test job in ci.yml, else it will fail, more details [here](https://github.com/lewagon/wait-on-check-action#check-name)
- check-name: 'Build and test (notary-server)'
+ # More details [here](https://github.com/lewagon/wait-on-check-action#check-name)
+ check-name: 'Run tests release build'
repo-token: ${{ secrets.GITHUB_TOKEN }}
# How frequent (in seconds) this job will call GitHub API to check the status of the job specified at 'check-name'
wait-interval: 60
@@ -71,12 +71,6 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
- components: clippy
-
- - name: Use caching
- uses: Swatinem/rust-cache@v2.5.0
- with:
- workspaces: ${{ matrix.package }} -> target
- name: Cargo build
run: |
@@ -85,3 +79,8 @@ jobs:
- name: Trigger Deployment
run: |
.github/scripts/deploy-server.sh ${{ steps.manipulate.outputs.env }} $GITHUB_REF_NAME
+
+ - name: Modify Proxy
+ if: ${{ steps.manipulate.outputs.env == 'stable' }}
+ run: |
+ .github/scripts/modify-proxy.sh
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 9779e52426..60767652ad 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -16,18 +16,18 @@ jobs:
contents: read
packages: write
steps:
- - name: Wait for test workflow to succeed
+ - name: Wait for integration test workflow to succeed
uses: lewagon/wait-on-check-action@v1.3.1
with:
ref: ${{ github.ref }}
- # Have to be specify '(notary-server)', as we are using matrix for build_and_test job in ci.yml, else it will fail, more details [here](https://github.com/lewagon/wait-on-check-action#check-name)
- check-name: 'Build and test (notary-server)'
+ # More details [here](https://github.com/lewagon/wait-on-check-action#check-name)
+ check-name: 'Run tests release build'
repo-token: ${{ secrets.GITHUB_TOKEN }}
# How frequent (in seconds) this job will call GitHub API to check the status of the job specified at 'check-name'
wait-interval: 60
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Log in to the Container registry
uses: docker/login-action@v2
@@ -49,4 +49,4 @@ jobs:
push: true
tags: ${{ steps.meta-notary-server.outputs.tags }}
labels: ${{ steps.meta-notary-server.outputs.labels }}
- file: ./notary-server/notary-server.Dockerfile
+ file: ./crates/notary/server/notary-server.Dockerfile
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27197dfdfb..3ab2a2f6de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,49 +13,39 @@ on:
env:
CARGO_TERM_COLOR: always
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
+ # We need a higher number of parallel rayon tasks than the default (which is 4)
+ # in order to prevent a deadlock, c.f.
+ # - https://github.com/tlsnotary/tlsn/issues/548
+ # - https://github.com/privacy-scaling-explorations/mpz/issues/178
+ # 32 seems to be big enough for the foreseeable future
+ RAYON_NUM_THREADS: 32
jobs:
- build_and_test:
- name: Build and test
- if: ( ! github.event.pull_request.draft )
+ fmt:
+ name: Check formatting
runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- package:
- - components/integration-tests
- - components/uid-mux
- - components/cipher
- - components/universal-hash
- - components/aead
- - components/key-exchange
- - components/point-addition
- - components/prf
- - components/tls
- - tlsn
- - notary-server
- include:
- - package: components/integration-tests
- release: true
- - package: notary-server
- release: true
- - package: tlsn
- all-features: true
- defaults:
- run:
- working-directory: ${{ matrix.package }}
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
+ # We use nightly to support `imports_granularity` feature
- name: Install nightly rust toolchain with rustfmt
uses: dtolnay/rust-toolchain@stable
with:
toolchain: nightly
components: rustfmt
- - name: "Check formatting"
+ - name: Use caching
+ uses: Swatinem/rust-cache@v2.7.3
+
+ - name: Check formatting
run: cargo +nightly fmt --check --all
+ build-and-test:
+ name: Build and test
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
- name: Install stable rust toolchain
uses: dtolnay/rust-toolchain@stable
@@ -63,32 +53,89 @@ jobs:
toolchain: stable
components: clippy
- - name: "Clippy"
- run: cargo clippy --all-features --examples -- -D warnings
-
- name: Use caching
- uses: Swatinem/rust-cache@v2.5.0
+ uses: Swatinem/rust-cache@v2.7.3
+
+ - name: Clippy
+ run: cargo clippy --all-features --all-targets -- -D warnings
+
+ - name: Build
+ run: cargo build --all-targets
+
+ - name: Test
+ run: cargo test
+ build-wasm:
+ name: Build and test wasm
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Install stable rust toolchain
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ targets: wasm32-unknown-unknown
+ toolchain: stable
+
+ - name: Install nightly rust toolchain
+ uses: dtolnay/rust-toolchain@stable
with:
- workspaces: ${{ matrix.package }} -> target
+ targets: wasm32-unknown-unknown,x86_64-unknown-linux-gnu
+ toolchain: nightly
+ components: rust-src
+
+ - name: Install chromedriver
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y chromium-chromedriver
- - name: "Build"
- run: cargo build ${{ matrix.release && '--release' }}
+ - name: Install wasm-pack
+ run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+ - name: Use caching
+ uses: Swatinem/rust-cache@v2.7.3
- - name: "Test"
- if: ${{ matrix.release != true }}
- run: cargo test --lib --bins --tests --examples --workspace
+ - name: Run tests
+ run: |
+ cd crates/wasm-test-runner
+ ./run.sh
+ tests-integration:
+ name: Run tests release build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
- - name: "Test all features"
- if: ${{ matrix.release != true && matrix.all-features == true }}
- run: cargo test --lib --bins --tests --examples --workspace --all-features
+ - name: Install stable rust toolchain
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ toolchain: stable
- - name: "Integration Test"
- if: ${{ matrix.release == true }}
- run: cargo test --release --tests
+ - name: Use caching
+ uses: Swatinem/rust-cache@v2.7.3
- - name: "Integration Test all features"
- if: ${{ matrix.release == true && matrix.all-features == true }}
- run: cargo test --release --tests --all-features
+ - name: Add custom DNS entry to /etc/hosts for notary TLS test
+ run: echo "127.0.0.1 tlsnotaryserver.io" | sudo tee -a /etc/hosts
- - name: "Check that benches compile"
- run: cargo bench --no-run
+ - name: Run integration tests
+ run: cargo test --profile tests-integration --workspace --exclude tlsn-tls-client --exclude tlsn-tls-core -- --include-ignored
+ coverage:
+ runs-on: ubuntu-latest
+ env:
+ CARGO_TERM_COLOR: always
+ steps:
+ - uses: actions/checkout@v4
+ - name: Install stable rust toolchain
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ toolchain: stable
+ - name: Install cargo-llvm-cov
+ uses: taiki-e/install-action@cargo-llvm-cov
+ - name: Generate code coverage
+ run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v4
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ files: lcov.info
+ fail_ci_if_error: true
\ No newline at end of file
diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml
new file mode 100644
index 0000000000..d28b07aac8
--- /dev/null
+++ b/.github/workflows/rebase.yml
@@ -0,0 +1,24 @@
+name: Automatic Rebase
+on:
+ issue_comment:
+ types: [created]
+jobs:
+ rebase:
+ name: Rebase
+ runs-on: ubuntu-latest
+ if: >-
+ github.event.issue.pull_request != '' &&
+ contains(github.event.comment.body, '/rebase') &&
+ github.event.comment.author_association == 'MEMBER'
+ steps:
+ - name: Checkout the latest code
+ uses: actions/checkout@v4
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
+ - name: Automatic Rebase
+ uses: cirrus-actions/rebase@1.8
+ with:
+ autosquash: false
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml
index 11fd84c022..5c86ee6cd8 100644
--- a/.github/workflows/rustdoc.yml
+++ b/.github/workflows/rustdoc.yml
@@ -12,10 +12,9 @@ env:
jobs:
rustdoc:
- if: ( ! github.event.pull_request.draft )
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Install Rust Toolchain (Stable)
uses: dtolnay/rust-toolchain@stable
@@ -23,18 +22,18 @@ jobs:
toolchain: stable
- name: "rustdoc"
- run: cd tlsn; cargo doc -p tlsn-core -p tlsn-prover -p tlsn-verifier --no-deps --all-features
+ run: cargo doc -p tlsn-core -p tlsn-prover -p tlsn-verifier --no-deps --all-features
# --target-dir ${GITHUB_WORKSPACE}/docs
# https://dev.to/deciduously/prepare-your-rust-api-docs-for-github-pages-2n5i
- name: "Add index file -> tlsn_prover"
run: |
- echo "" > tlsn/target/doc/index.html
+ echo "" > target/doc/index.html
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref == 'refs/heads/dev' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
- publish_dir: tlsn/target/doc/
+ publish_dir: target/doc/
# cname: rustdocs.tlsnotary.org
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
deleted file mode 100644
index 6b87afb181..0000000000
--- a/.github/workflows/wasm.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: wasm-build
-
-on:
- push:
- branches:
- - dev
- tags:
- - "[v]?[0-9]+.[0-9]+.[0-9]+*"
- pull_request:
- branches:
- - dev
-
-env:
- CARGO_TERM_COLOR: always
- CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
-
-jobs:
- build_and_test:
- name: Build for target wasm32-unknown-unknown
- runs-on: ubuntu-latest
- strategy:
- fail-fast: false
- matrix:
- package:
- - tlsn/tlsn-core
- - tlsn/tlsn-prover
- - components/tls/tls-client
- defaults:
- run:
- working-directory: ${{ matrix.package }}
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
-
- - name: Install stable rust toolchain
- uses: dtolnay/rust-toolchain@stable
- with:
- targets: wasm32-unknown-unknown
- toolchain: stable
-
- - name: Use caching
- uses: Swatinem/rust-cache@v2.5.0
- with:
- workspaces: ${{ matrix.package }} -> ../target
-
- - name: "Build"
- run: cargo build --target wasm32-unknown-unknown
diff --git a/.gitignore b/.gitignore
index c169048c8c..f79cb086da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ Cargo.lock
# logs
*.log
+
+# metrics
+*.csv
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index ef88a6b9c9..0000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4147bd9727..ea212bbdbc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,27 +16,20 @@ keywords.
Try to do one pull request per change.
-### Updating the changelog
+## Linting
-Update the changes you have made in
-[CHANGELOG](CHANGELOG.md)
-file under the **Unreleased** section.
+Before a Pull Request (PR) can be merged, the Continuous Integration (CI) pipeline automatically lints all code using [Clippy](https://doc.rust-lang.org/stable/clippy/usage.html). To ensure your code is free of linting issues before creating a PR, run the following command:
-Add the changes of your pull request to one of the following subsections,
-depending on the types of changes defined by
-[Keep a changelog](https://keepachangelog.com/en/1.0.0/):
-
-- `Added` for new features.
-- `Changed` for changes in existing functionality.
-- `Deprecated` for soon-to-be removed features.
-- `Removed` for now removed features.
-- `Fixed` for any bug fixes.
-- `Security` in case of vulnerabilities.
+```sh
+cargo clippy --all-features --all-targets -- -D warnings
+```
-If the required subsection does not exist yet under **Unreleased**, create it!
+This command will lint your code with all features and targets enabled, and treat any warnings as errors, ensuring that your code meets the required standards.
## Style
+This repository includes a `rustfmt.toml` file with custom formatting settings that are automatically validated by CI before any Pull Requests (PRs) can be merged. To ensure your code adheres to these standards, format your code using this configuration before submitting a PR. We strongly recommend enabling *auto format on save* to streamline this process. In Visual Studio Code (VSCode), you can enable this feature by turning on [`editor.formatOnSave`](https://code.visualstudio.com/docs/editor/codebasics#_formatting) in the settings.
+
### Capitalization and punctuation
Both line comments and doc comments must be capitalized. Each sentence must end with a period.
@@ -61,6 +54,7 @@ Comments for function arguments must adhere to this pattern:
/// Performs a certain computation. Any other description of the function.
///
/// # Arguments
+///
/// * `arg1` - The first argument.
/// * `arg2` - The second argument.
pub fn compute(...
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000000..e36d547f73
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,148 @@
+[workspace]
+members = [
+ "crates/benches",
+ "crates/common",
+ "crates/components/aead",
+ "crates/components/authdecode/authdecode",
+ "crates/components/authdecode/authdecode-core",
+ "crates/components/authdecode/transcript",
+ "crates/components/block-cipher",
+ "crates/components/hmac-sha256",
+ "crates/components/hmac-sha256-circuits",
+ "crates/components/key-exchange",
+ "crates/components/poseidon-halo2",
+ "crates/components/stream-cipher",
+ "crates/components/universal-hash",
+ "crates/core",
+ "crates/data-fixtures",
+ "crates/examples",
+ "crates/formats",
+ "crates/notary/client",
+ "crates/notary/server",
+ "crates/notary/tests-integration",
+ "crates/prover",
+ "crates/server-fixture/certs",
+ "crates/server-fixture/server",
+ "crates/tests-integration",
+ "crates/tls/backend",
+ "crates/tls/client",
+ "crates/tls/client-async",
+ "crates/tls/core",
+ "crates/tls/mpc",
+ "crates/tls/server-fixture",
+ "crates/verifier",
+ "crates/wasm",
+ "crates/wasm-test-runner",
+]
+resolver = "2"
+
+[profile.tests-integration]
+inherits = "release"
+opt-level = 1
+
+[workspace.dependencies]
+notary-client = { path = "crates/notary/client" }
+notary-server = { path = "crates/notary/server" }
+poseidon-halo2 = { path = "crates/components/poseidon-halo2" }
+tlsn-authdecode = { path = "crates/components/authdecode/authdecode" }
+tlsn-authdecode-core = { path = "crates/components/authdecode/authdecode-core" }
+tlsn-authdecode-transcript = { path = "crates/components/authdecode/transcript" }
+tls-server-fixture = { path = "crates/tls/server-fixture" }
+tlsn-aead = { path = "crates/components/aead" }
+tlsn-block-cipher = { path = "crates/components/block-cipher" }
+tlsn-common = { path = "crates/common" }
+tlsn-core = { path = "crates/core" }
+tlsn-data-fixtures = { path = "crates/data-fixtures" }
+tlsn-formats = { path = "crates/formats" }
+tlsn-hmac-sha256 = { path = "crates/components/hmac-sha256" }
+tlsn-hmac-sha256-circuits = { path = "crates/components/hmac-sha256-circuits" }
+tlsn-key-exchange = { path = "crates/components/key-exchange" }
+tlsn-prover = { path = "crates/prover" }
+tlsn-server-fixture = { path = "crates/server-fixture/server" }
+tlsn-server-fixture-certs = { path = "crates/server-fixture/certs" }
+tlsn-stream-cipher = { path = "crates/components/stream-cipher" }
+tlsn-tls-backend = { path = "crates/tls/backend" }
+tlsn-tls-client = { path = "crates/tls/client" }
+tlsn-tls-client-async = { path = "crates/tls/client-async" }
+tlsn-tls-core = { path = "crates/tls/core" }
+tlsn-tls-mpc = { path = "crates/tls/mpc" }
+tlsn-universal-hash = { path = "crates/components/universal-hash" }
+tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "e7b2db6" }
+tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "e7b2db6" }
+tlsn-verifier = { path = "crates/verifier" }
+
+mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-common = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-ole = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "b8ae7ac" }
+
+serio = { version = "0.1" }
+spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "e7b2db6" }
+uid-mux = { version = "0.1", features = ["serio"] }
+
+aes = { version = "0.8" }
+aes-gcm = { version = "0.9" }
+anyhow = { version = "1.0" }
+async-trait = { version = "0.1" }
+async-tungstenite = { version = "0.25" }
+axum = { version = "0.7" }
+bcs = { version = "0.1" }
+bincode = { version = "1.3" }
+blake3 = { version = "1.5" }
+bytes = { version = "1.4" }
+chrono = { version = "0.4" }
+cipher = { version = "0.4" }
+criterion = { version = "0.5" }
+ctr = { version = "0.9" }
+derive_builder = { version = "0.12" }
+digest = { version = "0.10" }
+elliptic-curve = { version = "0.13" }
+enum-try-as-inner = { version = "0.1" }
+env_logger = { version = "0.10" }
+futures = { version = "0.3" }
+futures-rustls = { version = "0.26" }
+futures-util = { version = "0.3" }
+generic-array = { version = "0.14" }
+hex = { version = "0.4" }
+hmac = { version = "0.12" }
+http = { version = "1.1" }
+http-body-util = { version = "0.1" }
+hyper = { version = "1.1" }
+hyper-util = { version = "0.1" }
+k256 = { version = "0.13" }
+log = { version = "0.4" }
+once_cell = { version = "1.19" }
+opaque-debug = { version = "0.3" }
+p256 = { version = "0.13" }
+pkcs8 = { version = "0.10" }
+pin-project-lite = { version = "0.2" }
+rand = { version = "0.8" }
+rand_chacha = { version = "0.3" }
+rand_core = { version = "0.6" }
+regex = { version = "1.10" }
+ring = { version = "0.17" }
+rs_merkle = { git = "https://github.com/tlsnotary/rs-merkle.git", rev = "85f3e82" }
+rstest = { version = "0.17" }
+rustls = { version = "0.21" }
+rustls-pemfile = { version = "1.0" }
+sct = { version = "0.7" }
+serde = { version = "1.0" }
+serde_json = { version = "1.0" }
+sha2 = { version = "0.10" }
+signature = { version = "2.2" }
+thiserror = { version = "1.0" }
+tokio = { version = "1.38" }
+tokio-rustls = { version = "0.24" }
+tokio-util = { version = "0.7" }
+tracing = { version = "0.1" }
+tracing-subscriber = { version = "0.3" }
+uuid = { version = "1.4" }
+web-time = { version = "0.2" }
+webpki = { version = "0.22" }
+webpki-roots = { version = "0.26" }
+ws_stream_tungstenite = { version = "0.13" }
+zeroize = { version = "1.8" }
diff --git a/README.md b/README.md
index e127563920..1d5bf00596 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@
[mit-badge]: https://img.shields.io/badge/license-MIT-blue.svg
[apache-badge]: https://img.shields.io/github/license/saltstack/salt
-[actions-badge]: https://github.com/tlsnotary/tlsn/actions/workflows/ci.yml/badge.svg
-[actions-url]: https://github.com/tlsnotary/tlsn/actions?query=workflow%3Arust+branch%3Adev
+[actions-badge]: https://github.com/tlsnotary/tlsn/actions/workflows/ci.yml/badge.svg?branch=dev
+[actions-url]: https://github.com/tlsnotary/tlsn/actions?query=workflow%3Aci+branch%3Adev
[Website](https://tlsnotary.org) |
[Documentation](https://docs.tlsnotary.org) |
@@ -18,6 +18,8 @@
# TLSNotary
+**Data provenance and privacy with secure multi-party computation**
+
## ⚠️ Notice
This project is currently under active development and should not be used in production. Expect bugs and regular major breaking changes.
@@ -30,25 +32,44 @@ All crates in this repository are licensed under either of
at your option.
-## Overview
+## Branches
+
+- [`main`](https://github.com/tlsnotary/tlsn/tree/main)
+ - Default branch — points to the latest release.
+ - This is stable and suitable for most users.
+- [`dev`](https://github.com/tlsnotary/tlsn/tree/dev)
+ - Development branch — contains the latest PRs.
+ - Developers should submit their PRs against this branch.
+
+## Directory
+
+- [examples](./crates/examples/): Examples on how to use the TLSNotary protocol.
+- [tlsn-prover](./crates/prover/): The library for the prover component.
+- [tlsn-verifier](./crates/verifier/): The library for the verifier component.
+- [notary](./crates/notary/): Implements the [notary server](https://docs.tlsnotary.org/intro.html#tls-verification-with-a-general-purpose-notary) and its client.
+- [components](./crates/components/): Houses low-level libraries.
+
+This repository contains the source code for the Rust implementation of the TLSNotary protocol. For additional tools and implementations related to TLSNotary, visit . This includes repositories such as [`tlsn-js`](https://github.com/tlsnotary/tlsn-js), [`tlsn-extension`](https://github.com/tlsnotary/tlsn-extension), [`explorer`](https://github.com/tlsnotary/explorer), among others.
-- **tls**: Home of the TLS logic of our protocol like handshake en-/decryption, ghash, **currently outdated**
-- **utils**: Utility functions which are frequently used everywhere
-- **actors**: Provides actors, which implement protocol-specific functionality using
- the actor pattern. They usually wrap an aio module
-- **universal-hash**: Implements ghash, which is used AES-GCM. Poly-1305 coming soon.
-- **point-addition**: Used in key-exchange and allows to compute a two party sharing of
- an EC curve point
-### General remarks
+## Development
-- the TLSNotary codebase makes heavy use of async Rust. Usually an aio
- crate/module implements the network IO and wraps a core crate/module which
- provides the protocol implementation. This is a frequent pattern you will
- encounter in the codebase.
-- some protocols are implemented using the actor pattern to facilitate
- asynchronous message processing with shared state.
+> [!IMPORTANT]
+> **Note on Rust-to-WASM Compilation**: This project requires compiling Rust into WASM, which needs [`clang`](https://clang.llvm.org/) version 16.0.0 or newer. MacOS users, be aware that Xcode's default `clang` might be older. If you encounter the error `No available targets are compatible with triple "wasm32-unknown-unknown"`, it's likely due to an outdated `clang`. Updating `clang` to a newer version should resolve this issue.
+>
+> For MacOS aarch64 users, if Apple's default `clang` isn't working, try installing `llvm` via Homebrew (`brew install llvm`). You can then prioritize the Homebrew `clang` over the default macOS version by modifying your `PATH`. Add the following line to your shell configuration file (e.g., `.bashrc`, `.zshrc`):
+> ```sh
+> export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+> ```
+If you run into this error:
+```
+Could not find directory of OpenSSL installation, and this `-sys` crate cannot
+ proceed without this knowledge. If OpenSSL is installed and this crate had
+ trouble finding it, you can set the `OPENSSL_DIR` environment variable for the
+ compilation process.
+```
+Make sure you have the development packages of OpenSSL installed (`libssl-dev` on Ubuntu or `openssl-devel` on Fedora).
## Contribution
@@ -56,4 +77,4 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
dual licensed as above, without any additional terms or conditions.
-See [CONTRIBUTING.md](CONTRIBUTING.md).
\ No newline at end of file
+See [CONTRIBUTING.md](CONTRIBUTING.md).
diff --git a/appspec-scripts/after_install.sh b/appspec-scripts/after_install.sh
deleted file mode 100755
index 062ad35599..0000000000
--- a/appspec-scripts/after_install.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-export PATH=$PATH:/home/ubuntu/.cargo/bin
-
-APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
-
-# Prepare directory
-sudo rm -rf ~/$APP_NAME/tlsn
-sudo mv ~/tlsn/ ~/$APP_NAME
-sudo mkdir -p ~/$APP_NAME/tlsn/notary-server/target/release
-sudo chown -R ubuntu.ubuntu ~/$APP_NAME
-
-# Download .git directory
-aws s3 cp s3://tlsn-deploy/$APP_NAME/.git ~/$APP_NAME/tlsn/.git --recursive
-
-# Download binary
-aws s3 cp s3://tlsn-deploy/$APP_NAME/notary-server ~/$APP_NAME/tlsn/notary-server/target/release
-chmod +x ~/$APP_NAME/tlsn/notary-server/target/release/notary-server
-
-exit 0
diff --git a/appspec-scripts/before_install.sh b/appspec-scripts/before_install.sh
deleted file mode 100755
index 07b5380508..0000000000
--- a/appspec-scripts/before_install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-#set -e
-
-APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
-
-if [ ! -d $APP_NAME ]; then
- mkdir ~/$APP_NAME
-fi
-
-exit 0
diff --git a/appspec-scripts/start_app.sh b/appspec-scripts/start_app.sh
deleted file mode 100755
index 08cd49ab22..0000000000
--- a/appspec-scripts/start_app.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-export PATH=$PATH:/home/ubuntu/.cargo/bin
-
-APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
-
-cd ~/$APP_NAME/tlsn/notary-server
-target/release/notary-server --config-file ~/.notary/$APP_NAME/config.yaml &> ~/$APP_NAME/tlsn/notary.log &
-
-exit 0
diff --git a/appspec-scripts/stop_app.sh b/appspec-scripts/stop_app.sh
deleted file mode 100755
index 3a30a291b1..0000000000
--- a/appspec-scripts/stop_app.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
-
-PID=$(pgrep -f notary.*$APP_NAME)
-kill -15 $PID
-
-exit 0
diff --git a/appspec-scripts/validate_app.sh b/appspec-scripts/validate_app.sh
deleted file mode 100755
index 8efbc9727e..0000000000
--- a/appspec-scripts/validate_app.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# Verify proccess is running
-APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
-
-pgrep -f notary.*$APP_NAME
-[ $? -eq 0 ] || exit 1
-
-# Verify that listening sockets exist
-if [ "$APPLICATION_NAME" == "tlsn-nightly" ]; then
- port=7048
-else
- port=7047
-fi
-
-exposed_ports=$(netstat -lnt4 | egrep -cw $port)
-[ $exposed_ports -eq 1 ] || exit 1
-
-exit 0
diff --git a/appspec.yml b/appspec.yml
index c6cf353d44..c1f6125f4c 100644
--- a/appspec.yml
+++ b/appspec.yml
@@ -10,22 +10,22 @@ permissions:
group: ubuntu
hooks:
BeforeInstall:
- - location: appspec-scripts/before_install.sh
+ - location: cd-scripts/appspec-scripts/before_install.sh
timeout: 300
runas: ubuntu
AfterInstall:
- - location: appspec-scripts/after_install.sh
+ - location: cd-scripts/appspec-scripts/after_install.sh
timeout: 300
runas: ubuntu
ApplicationStart:
- - location: appspec-scripts/start_app.sh
+ - location: cd-scripts/appspec-scripts/start_app.sh
timeout: 300
runas: ubuntu
ApplicationStop:
- - location: appspec-scripts/stop_app.sh
+ - location: cd-scripts/appspec-scripts/stop_app.sh
timeout: 300
runas: ubuntu
ValidateService:
- - location: appspec-scripts/validate_app.sh
+ - location: cd-scripts/appspec-scripts/validate_app.sh
timeout: 300
runas: ubuntu
diff --git a/build_all.sh b/build_all.sh
deleted file mode 100755
index e6945b7af4..0000000000
--- a/build_all.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-for package in components/uid-mux components/actors/actor-ot components/cipher components/universal-hash components/aead components/key-exchange components/point-addition components/prf components/tls tlsn; do
- pushd $package
- # cargo update
- cargo clean
- cargo build
- cargo test
- cargo clippy --all-features -- -D warnings || exit
- popd
-done
diff --git a/cd-scripts/appspec-scripts/after_install.sh b/cd-scripts/appspec-scripts/after_install.sh
new file mode 100755
index 0000000000..a6041c08db
--- /dev/null
+++ b/cd-scripts/appspec-scripts/after_install.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+
+TAG=$(curl http://169.254.169.254/latest/meta-data/tags/instance/stable)
+APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
+
+if [ $APP_NAME = "stable" ]; then
+ # Prepare directories for stable versions
+ sudo mkdir ~/${APP_NAME}_${TAG}
+ sudo mv ~/tlsn ~/${APP_NAME}_${TAG}
+ sudo mkdir -p ~/${APP_NAME}_${TAG}/tlsn/notary/target/release
+ sudo chown -R ubuntu.ubuntu ~/${APP_NAME}_${TAG}
+
+ # Download .git directory
+ aws s3 cp s3://tlsn-deploy/$APP_NAME/.git ~/${APP_NAME}_${TAG}/tlsn/.git --recursive
+
+ # Download binary
+ aws s3 cp s3://tlsn-deploy/$APP_NAME/notary-server ~/${APP_NAME}_${TAG}/tlsn/notary/target/release
+ chmod +x ~/${APP_NAME}_${TAG}/tlsn/notary/target/release/notary-server
+else
+ # Prepare directory for dev
+ sudo rm -rf ~/$APP_NAME/tlsn
+ sudo mv ~/tlsn/ ~/$APP_NAME
+ sudo mkdir -p ~/$APP_NAME/tlsn/notary/target/release
+ sudo chown -R ubuntu.ubuntu ~/$APP_NAME
+
+ # Download .git directory
+ aws s3 cp s3://tlsn-deploy/$APP_NAME/.git ~/$APP_NAME/tlsn/.git --recursive
+
+ # Download binary
+ aws s3 cp s3://tlsn-deploy/$APP_NAME/notary-server ~/$APP_NAME/tlsn/notary/target/release
+ chmod +x ~/$APP_NAME/tlsn/notary/target/release/notary-server
+fi
+
+exit 0
diff --git a/cd-scripts/appspec-scripts/before_install.sh b/cd-scripts/appspec-scripts/before_install.sh
new file mode 100755
index 0000000000..76a47c6115
--- /dev/null
+++ b/cd-scripts/appspec-scripts/before_install.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
+
+if [ $APP_NAME = "stable" ]; then
+ VERSIONS_DEPLOYED=$(find ~/ -maxdepth 1 -type d -name 'stable_*')
+ VERSIONS_DEPLOYED_COUNT=$(echo $VERSIONS_DEPLOYED | wc -w)
+
+ if [ $VERSIONS_DEPLOYED_COUNT -gt 3 ]; then
+ echo "More than 3 stable versions found"
+ exit 1
+ fi
+else
+ if [ ! -d ~/$APP_NAME ]; then
+ mkdir ~/$APP_NAME
+ fi
+fi
+
+exit 0
diff --git a/cd-scripts/appspec-scripts/start_app.sh b/cd-scripts/appspec-scripts/start_app.sh
new file mode 100755
index 0000000000..0d449f6222
--- /dev/null
+++ b/cd-scripts/appspec-scripts/start_app.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Port tagging will also be used to manipulate proxy server via modify_proxy.sh script
+set -ex
+
+TAG=$(curl http://169.254.169.254/latest/meta-data/tags/instance/stable)
+APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
+
+if [ $APP_NAME = "stable" ]; then
+ # Check if all stable ports are in use. If true, terminate the deployment
+ [[ $(netstat -lnt4 | egrep -c ':(7047|7057|7067)\s') -eq 3 ]] && { echo "All stable ports are in use"; exit 1; }
+ STABLE_PORTS="7047 7057 7067"
+ for PORT in $STABLE_PORTS; do
+ PORT_LISTENING=$(netstat -lnt4 | egrep -cw $PORT || true)
+ if [ $PORT_LISTENING -eq 0 ]; then
+ ~/${APP_NAME}_${TAG}/tlsn/notary/target/release/notary-server --config-file ~/.notary/${APP_NAME}_${PORT}/config.yaml &> ~/${APP_NAME}_${TAG}/tlsn/notary.log &
+ # Create a tag that will be used for service validation
+ INSTANCE_ID=$(curl http://169.254.169.254/latest/meta-data/instance-id)
+ aws ec2 create-tags --resources $INSTANCE_ID --tags "Key=port,Value=$PORT"
+ break
+ fi
+ done
+else
+ ~/$APP_NAME/tlsn/notary/target/release/notary-server --config-file ~/.notary/$APP_NAME/config.yaml &> ~/$APP_NAME/tlsn/notary.log &
+fi
+
+exit 0
diff --git a/cd-scripts/appspec-scripts/stop_app.sh b/cd-scripts/appspec-scripts/stop_app.sh
new file mode 100755
index 0000000000..ae92a8c06c
--- /dev/null
+++ b/cd-scripts/appspec-scripts/stop_app.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+# AWS CodeDeploy hook sequence: https://docs.aws.amazon.com/codedeploy/latest/userguide/reference-appspec-file-structure-hooks.html#appspec-hooks-server
+set -ex
+
+APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
+
+if [ $APP_NAME = "stable" ]; then
+ VERSIONS_DEPLOYED=$(find ~/ -maxdepth 1 -type d -name 'stable_*')
+ VERSIONS_DEPLOYED_COUNT=$(echo $VERSIONS_DEPLOYED | wc -w)
+
+ # Remove oldest version if exists
+ if [ $VERSIONS_DEPLOYED_COUNT -eq 3 ]; then
+ echo "Candidate versions to be removed:"
+ OLDEST_DIR=""
+ OLDEST_TIME=""
+
+ for DIR in $VERSIONS_DEPLOYED; do
+ TIME=$(stat -c %W $DIR)
+
+ if [ -z $OLDEST_TIME ] || [ $TIME -lt $OLDEST_TIME ]; then
+ OLDEST_DIR=$DIR
+ OLDEST_TIME=$TIME
+ fi
+ done
+
+ echo "The oldest version is running under: $OLDEST_DIR"
+ PID=$(lsof $OLDEST_DIR/tlsn/notary/target/release/notary-server | awk '{ print $2 }' | tail -1)
+ kill -15 $PID || true
+ rm -rf $OLDEST_DIR
+ fi
+else
+ PID=$(pgrep -f notary.*$APP_NAME)
+ kill -15 $PID || true
+fi
+
+exit 0
diff --git a/cd-scripts/appspec-scripts/validate_app.sh b/cd-scripts/appspec-scripts/validate_app.sh
new file mode 100755
index 0000000000..3921fd337f
--- /dev/null
+++ b/cd-scripts/appspec-scripts/validate_app.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+# Verify proccess is running
+APP_NAME=$(echo $APPLICATION_NAME | awk -F- '{ print $2 }')
+
+# Verify that listening sockets exist
+if [ $APP_NAME = "stable" ]; then
+ PORT=$(curl http://169.254.169.254/latest/meta-data/tags/instance/port)
+ ps -ef | grep notary.*$APP_NAME.*$PORT | grep -v grep
+ [ $? -eq 0 ] || exit 1
+else
+ PORT=7048
+ pgrep -f notary.*$APP_NAME
+ [ $? -eq 0 ] || exit 1
+fi
+
+EXPOSED_PORTS=$(netstat -lnt4 | egrep -cw $PORT)
+[ $EXPOSED_PORTS -eq 1 ] || exit 1
+
+exit 0
diff --git a/cd-scripts/modify_proxy.sh b/cd-scripts/modify_proxy.sh
new file mode 100755
index 0000000000..1abb5e5665
--- /dev/null
+++ b/cd-scripts/modify_proxy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# This script is executed on proxy side, in order to assign the available port to latest stable version
+set -e
+
+PORT=$1
+VERSION=$2
+
+sed -i "/# Port $PORT/{n;s/v[0-9].[0-9].[0-9]-[a-z]*.[0-9]*/$VERSION/g}" /etc/nginx/sites-available/tlsnotary-pse
+sed -i "/# Port $PORT/{n;n;s/v[0-9].[0-9].[0-9]-[a-z]*.[0-9]*/$VERSION/g}" /etc/nginx/sites-available/tlsnotary-pse
+
+nginx -t
+nginx -s reload
+
+exit 0
diff --git a/components/aead/Cargo.toml b/components/aead/Cargo.toml
deleted file mode 100644
index 546bc9a514..0000000000
--- a/components/aead/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[package]
-name = "tlsn-aead"
-authors = ["TLSNotary Team"]
-description = "This crate provides an implementation of a two-party version of AES-GCM behind an AEAD trait"
-keywords = ["tls", "mpc", "2pc", "aead", "aes", "aes-gcm"]
-categories = ["cryptography"]
-license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.3"
-edition = "2021"
-
-[lib]
-name = "aead"
-
-[features]
-default = ["mock"]
-mock = []
-tracing = [
- "dep:tracing",
- "tlsn-block-cipher/tracing",
- "tlsn-stream-cipher/tracing",
- "tlsn-universal-hash/tracing",
-]
-
-[dependencies]
-tlsn-block-cipher = { path = "../cipher/block-cipher" }
-tlsn-stream-cipher = { path = "../cipher/stream-cipher" }
-tlsn-universal-hash = { path = "../universal-hash" }
-mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-
-async-trait = "0.1"
-derive_builder = "0.12"
-thiserror = "1"
-futures = "0.3"
-serde = "1"
-tracing = { version = "0.1", optional = true }
-
-[dev-dependencies]
-tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
-aes-gcm = "0.10"
diff --git a/components/aead/src/aes_gcm/tag.rs b/components/aead/src/aes_gcm/tag.rs
deleted file mode 100644
index f3f3d1c71a..0000000000
--- a/components/aead/src/aes_gcm/tag.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::ops::Add;
-
-use crate::AeadError;
-
-pub(crate) const AES_GCM_TAG_LEN: usize = 16;
-
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub(crate) struct AesGcmTagShare(pub(crate) [u8; 16]);
-
-impl AesGcmTagShare {
- pub(crate) fn from_unchecked(share: &[u8]) -> Result {
- if share.len() != 16 {
- return Err(AeadError::ValidationError(
- "Received tag share is not 16 bytes long".to_string(),
- ));
- }
- let mut result = [0u8; 16];
- result.copy_from_slice(share);
- Ok(Self(result))
- }
-}
-
-impl AsRef<[u8]> for AesGcmTagShare {
- fn as_ref(&self) -> &[u8] {
- &self.0
- }
-}
-
-impl Add for AesGcmTagShare {
- type Output = Vec;
-
- fn add(self, rhs: Self) -> Self::Output {
- self.0
- .iter()
- .zip(rhs.0.iter())
- .map(|(a, b)| a ^ b)
- .collect()
- }
-}
-
-/// Builds padded data for GHASH
-#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", ret))]
-pub(crate) fn build_ghash_data(mut aad: Vec, mut ciphertext: Vec) -> Vec {
- let associated_data_bitlen = (aad.len() as u64) * 8;
- let text_bitlen = (ciphertext.len() as u64) * 8;
-
- let len_block = ((associated_data_bitlen as u128) << 64) + (text_bitlen as u128);
-
- // pad data to be a multiple of 16 bytes
- let aad_padded_block_count = (aad.len() / 16) + (aad.len() % 16 != 0) as usize;
- aad.resize(aad_padded_block_count * 16, 0);
-
- let ciphertext_padded_block_count =
- (ciphertext.len() / 16) + (ciphertext.len() % 16 != 0) as usize;
- ciphertext.resize(ciphertext_padded_block_count * 16, 0);
-
- let mut data: Vec = Vec::with_capacity(aad.len() + ciphertext.len() + 16);
- data.extend(aad);
- data.extend(ciphertext);
- data.extend_from_slice(&len_block.to_be_bytes());
-
- data
-}
diff --git a/components/aead/src/msg.rs b/components/aead/src/msg.rs
deleted file mode 100644
index a15d318633..0000000000
--- a/components/aead/src/msg.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-//! Message types for AEAD protocols.
-
-use serde::{Deserialize, Serialize};
-
-use mpz_core::{commit::Decommitment, hash::Hash};
-
-/// Aead messages.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[allow(missing_docs)]
-pub enum AeadMessage {
- TagShareCommitment(Hash),
- TagShareDecommitment(Decommitment),
- TagShare(TagShare),
-}
-
-/// A tag share.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct TagShare {
- /// The share of the tag.
- pub share: Vec,
-}
-
-impl From for TagShare {
- fn from(tag_share: crate::aes_gcm::AesGcmTagShare) -> Self {
- Self {
- share: tag_share.0.to_vec(),
- }
- }
-}
diff --git a/components/cipher/Cargo.toml b/components/cipher/Cargo.toml
deleted file mode 100644
index f75fa46e89..0000000000
--- a/components/cipher/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[workspace]
-members = ["stream-cipher", "block-cipher"]
-resolver = "2"
-
-[workspace.dependencies]
-# tlsn
-mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-
-# crypto
-aes = "0.8"
-ctr = "0.9.2"
-cipher = "0.4.3"
-
-# async
-async-trait = "0.1"
-futures = "0.3"
-tokio = { version = "1", default-features = false }
-
-# testing
-rstest = "0.17"
-criterion = "0.5"
-
-# error/log
-thiserror = "1"
-tracing = "0.1"
-
-# misc
-derive_builder = "0.12"
diff --git a/components/cipher/block-cipher/src/cipher.rs b/components/cipher/block-cipher/src/cipher.rs
deleted file mode 100644
index 21d2713606..0000000000
--- a/components/cipher/block-cipher/src/cipher.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-use std::marker::PhantomData;
-
-use async_trait::async_trait;
-
-use mpz_garble::{value::ValueRef, Decode, DecodePrivate, Execute, Memory};
-use utils::id::NestedId;
-
-use crate::{BlockCipher, BlockCipherCircuit, BlockCipherConfig, BlockCipherError};
-
-struct State {
- execution_id: NestedId,
- key: Option,
-}
-
-/// An MPC block cipher
-pub struct MpcBlockCipher
-where
- C: BlockCipherCircuit,
- E: Memory + Execute + Decode + DecodePrivate + Send + Sync,
-{
- state: State,
-
- executor: E,
-
- _cipher: PhantomData,
-}
-
-impl MpcBlockCipher
-where
- C: BlockCipherCircuit,
- E: Memory + Execute + Decode + DecodePrivate + Send + Sync,
-{
- /// Creates a new MPC block cipher
- ///
- /// # Arguments
- ///
- /// * `config` - The configuration for the block cipher
- /// * `executor` - The executor to use for the MPC
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(executor))
- )]
- pub fn new(config: BlockCipherConfig, executor: E) -> Self {
- let execution_id = NestedId::new(&config.id).append_counter();
- Self {
- state: State {
- execution_id,
- key: None,
- },
- executor,
- _cipher: PhantomData,
- }
- }
-}
-
-#[async_trait]
-impl BlockCipher for MpcBlockCipher
-where
- C: BlockCipherCircuit,
- E: Memory + Execute + Decode + DecodePrivate + Send + Sync + Send,
-{
- #[cfg_attr(feature = "tracing", tracing::instrument(level = "info", skip(self)))]
- fn set_key(&mut self, key: ValueRef) {
- self.state.key = Some(key);
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self, plaintext), err)
- )]
- async fn encrypt_private(&mut self, plaintext: Vec) -> Result, BlockCipherError> {
- let len = plaintext.len();
- let block: C::BLOCK = plaintext
- .try_into()
- .map_err(|_| BlockCipherError::InvalidInputLength(C::BLOCK_LEN, len))?;
-
- let key = self.state.key.clone().ok_or(BlockCipherError::KeyNotSet)?;
-
- let id = self.state.execution_id.increment_in_place().to_string();
-
- let msg = self
- .executor
- .new_private_input::(&format!("{}/msg", &id))?;
- let ciphertext = self
- .executor
- .new_output::(&format!("{}/ciphertext", &id))?;
-
- self.executor.assign(&msg, block)?;
-
- self.executor
- .execute(C::circuit(), &[key, msg], &[ciphertext.clone()])
- .await?;
-
- let mut outputs = self.executor.decode(&[ciphertext]).await?;
-
- let ciphertext: C::BLOCK = if let Ok(ciphertext) = outputs
- .pop()
- .expect("ciphertext should be present")
- .try_into()
- {
- ciphertext
- } else {
- panic!("ciphertext should be a block")
- };
-
- Ok(ciphertext.into())
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self), err)
- )]
- async fn encrypt_blind(&mut self) -> Result, BlockCipherError> {
- let key = self.state.key.clone().ok_or(BlockCipherError::KeyNotSet)?;
-
- let id = self.state.execution_id.increment_in_place().to_string();
-
- let msg = self
- .executor
- .new_blind_input::(&format!("{}/msg", &id))?;
- let ciphertext = self
- .executor
- .new_output::(&format!("{}/ciphertext", &id))?;
-
- self.executor
- .execute(C::circuit(), &[key, msg], &[ciphertext.clone()])
- .await?;
-
- let mut outputs = self.executor.decode(&[ciphertext]).await?;
-
- let ciphertext: C::BLOCK = if let Ok(ciphertext) = outputs
- .pop()
- .expect("ciphertext should be present")
- .try_into()
- {
- ciphertext
- } else {
- panic!("ciphertext should be a block")
- };
-
- Ok(ciphertext.into())
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self, plaintext), err)
- )]
- async fn encrypt_share(&mut self, plaintext: Vec) -> Result, BlockCipherError> {
- let len = plaintext.len();
- let block: C::BLOCK = plaintext
- .try_into()
- .map_err(|_| BlockCipherError::InvalidInputLength(C::BLOCK_LEN, len))?;
-
- let key = self.state.key.clone().ok_or(BlockCipherError::KeyNotSet)?;
-
- let id = self.state.execution_id.increment_in_place().to_string();
-
- let msg = self
- .executor
- .new_public_input::(&format!("{}/msg", &id))?;
- let ciphertext = self
- .executor
- .new_output::(&format!("{}/ciphertext", &id))?;
-
- self.executor.assign(&msg, block)?;
-
- self.executor
- .execute(C::circuit(), &[key, msg], &[ciphertext.clone()])
- .await?;
-
- let mut outputs = self.executor.decode_shared(&[ciphertext]).await?;
-
- let share: C::BLOCK =
- if let Ok(share) = outputs.pop().expect("share should be present").try_into() {
- share
- } else {
- panic!("share should be a block")
- };
-
- Ok(share.into())
- }
-}
diff --git a/components/cipher/block-cipher/src/lib.rs b/components/cipher/block-cipher/src/lib.rs
deleted file mode 100644
index 37b84afaaa..0000000000
--- a/components/cipher/block-cipher/src/lib.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-//! This crate provides a 2PC block cipher implementation.
-//!
-//! Both parties work together to encrypt or share an encrypted block using a shared key.
-
-#![deny(missing_docs, unreachable_pub, unused_must_use)]
-#![deny(clippy::all)]
-#![deny(unsafe_code)]
-
-mod cipher;
-mod circuit;
-mod config;
-
-use async_trait::async_trait;
-
-use mpz_garble::value::ValueRef;
-
-pub use crate::{
- cipher::MpcBlockCipher,
- circuit::{Aes128, BlockCipherCircuit},
-};
-pub use config::{BlockCipherConfig, BlockCipherConfigBuilder, BlockCipherConfigBuilderError};
-
-/// Errors that can occur when using the block cipher
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum BlockCipherError {
- #[error(transparent)]
- MemoryError(#[from] mpz_garble::MemoryError),
- #[error(transparent)]
- ExecutionError(#[from] mpz_garble::ExecutionError),
- #[error(transparent)]
- DecodeError(#[from] mpz_garble::DecodeError),
- #[error("Cipher key not set")]
- KeyNotSet,
- #[error("Input does not match block length: expected {0}, got {1}")]
- InvalidInputLength(usize, usize),
-}
-
-/// A trait for MPC block ciphers
-#[async_trait]
-pub trait BlockCipher: Send + Sync
-where
- Cipher: BlockCipherCircuit,
-{
- /// Sets the key for the block cipher.
- fn set_key(&mut self, key: ValueRef);
-
- /// Encrypts the given plaintext keeping it hidden from the other party(s).
- ///
- /// Returns the ciphertext
- ///
- /// * `plaintext` - The plaintext to encrypt
- async fn encrypt_private(&mut self, plaintext: Vec) -> Result, BlockCipherError>;
-
- /// Encrypts a plaintext provided by the other party(s).
- ///
- /// Returns the ciphertext
- async fn encrypt_blind(&mut self) -> Result, BlockCipherError>;
-
- /// Encrypts a plaintext provided by both parties. Fails if the
- /// plaintext provided by both parties does not match.
- ///
- /// Returns an additive share of the ciphertext
- ///
- /// * `plaintext` - The plaintext to encrypt
- async fn encrypt_share(&mut self, plaintext: Vec) -> Result, BlockCipherError>;
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- use mpz_garble::{protocol::deap::mock::create_mock_deap_vm, Memory, Vm};
-
- use crate::circuit::Aes128;
-
- use ::aes::Aes128 as TestAes128;
- use ::cipher::{BlockEncrypt, KeyInit};
-
- fn aes128(key: [u8; 16], msg: [u8; 16]) -> [u8; 16] {
- let mut msg = msg.into();
- let cipher = TestAes128::new(&key.into());
- cipher.encrypt_block(&mut msg);
- msg.into()
- }
-
- #[tokio::test]
- async fn test_block_cipher_blind() {
- let leader_config = BlockCipherConfig::builder().id("test").build().unwrap();
- let follower_config = BlockCipherConfig::builder().id("test").build().unwrap();
-
- let key = [0u8; 16];
-
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("test").await;
- let leader_thread = leader_vm.new_thread("test").await.unwrap();
- let follower_thread = follower_vm.new_thread("test").await.unwrap();
-
- // Key is public just for this test, typically it is private
- let leader_key = leader_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let follower_key = follower_thread.new_public_input::<[u8; 16]>("key").unwrap();
-
- leader_thread.assign(&leader_key, key).unwrap();
- follower_thread.assign(&follower_key, key).unwrap();
-
- let mut leader = MpcBlockCipher::::new(leader_config, leader_thread);
- leader.set_key(leader_key);
-
- let mut follower = MpcBlockCipher::::new(follower_config, follower_thread);
- follower.set_key(follower_key);
-
- let plaintext = [0u8; 16];
-
- let (leader_ciphertext, follower_ciphertext) = tokio::try_join!(
- leader.encrypt_private(plaintext.to_vec()),
- follower.encrypt_blind()
- )
- .unwrap();
-
- let expected = aes128(key, plaintext);
-
- assert_eq!(leader_ciphertext, expected.to_vec());
- assert_eq!(leader_ciphertext, follower_ciphertext);
- }
-
- #[tokio::test]
- async fn test_block_cipher_share() {
- let leader_config = BlockCipherConfig::builder().id("test").build().unwrap();
- let follower_config = BlockCipherConfig::builder().id("test").build().unwrap();
-
- let key = [0u8; 16];
-
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("test").await;
- let leader_thread = leader_vm.new_thread("test").await.unwrap();
- let follower_thread = follower_vm.new_thread("test").await.unwrap();
-
- // Key is public just for this test, typically it is private
- let leader_key = leader_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let follower_key = follower_thread.new_public_input::<[u8; 16]>("key").unwrap();
-
- leader_thread.assign(&leader_key, key).unwrap();
- follower_thread.assign(&follower_key, key).unwrap();
-
- let mut leader = MpcBlockCipher::::new(leader_config, leader_thread);
- leader.set_key(leader_key);
-
- let mut follower = MpcBlockCipher::::new(follower_config, follower_thread);
- follower.set_key(follower_key);
-
- let plaintext = [0u8; 16];
-
- let (leader_share, follower_share) = tokio::try_join!(
- leader.encrypt_share(plaintext.to_vec()),
- follower.encrypt_share(plaintext.to_vec())
- )
- .unwrap();
-
- let expected = aes128(key, plaintext);
-
- let result: [u8; 16] = std::array::from_fn(|i| leader_share[i] ^ follower_share[i]);
-
- assert_eq!(result, expected);
- }
-}
diff --git a/components/cipher/stream-cipher/benches/mock.rs b/components/cipher/stream-cipher/benches/mock.rs
deleted file mode 100644
index bae9b694e4..0000000000
--- a/components/cipher/stream-cipher/benches/mock.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use criterion::{criterion_group, criterion_main, Criterion, Throughput};
-
-use mpz_garble::{protocol::deap::mock::create_mock_deap_vm, Memory, Vm};
-use tlsn_stream_cipher::{
- Aes128Ctr, CtrCircuit, MpcStreamCipher, StreamCipher, StreamCipherConfigBuilder,
-};
-
-async fn bench_stream_cipher_encrypt(thread_count: usize, len: usize) {
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("test").await;
-
- let leader_thread = leader_vm.new_thread("key_config").await.unwrap();
- let leader_key = leader_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let leader_iv = leader_thread.new_public_input::<[u8; 4]>("iv").unwrap();
-
- leader_thread.assign(&leader_key, [0u8; 16]).unwrap();
- leader_thread.assign(&leader_iv, [0u8; 4]).unwrap();
-
- let follower_thread = follower_vm.new_thread("key_config").await.unwrap();
- let follower_key = follower_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let follower_iv = follower_thread.new_public_input::<[u8; 4]>("iv").unwrap();
-
- follower_thread.assign(&follower_key, [0u8; 16]).unwrap();
- follower_thread.assign(&follower_iv, [0u8; 4]).unwrap();
-
- let leader_thread_pool = leader_vm
- .new_thread_pool("mock", thread_count)
- .await
- .unwrap();
- let follower_thread_pool = follower_vm
- .new_thread_pool("mock", thread_count)
- .await
- .unwrap();
-
- let leader_config = StreamCipherConfigBuilder::default()
- .id("test".to_string())
- .build()
- .unwrap();
-
- let follower_config = StreamCipherConfigBuilder::default()
- .id("test".to_string())
- .build()
- .unwrap();
-
- let mut leader = MpcStreamCipher::::new(leader_config, leader_thread_pool);
- leader.set_key(leader_key, leader_iv);
-
- let mut follower = MpcStreamCipher::::new(follower_config, follower_thread_pool);
- follower.set_key(follower_key, follower_iv);
-
- let plaintext = vec![0u8; len];
- let explicit_nonce = vec![0u8; 8];
-
- _ = tokio::try_join!(
- leader.encrypt_private(explicit_nonce.clone(), plaintext),
- follower.encrypt_blind(explicit_nonce, len)
- )
- .unwrap();
-
- _ = tokio::try_join!(leader_vm.finalize(), follower_vm.finalize()).unwrap();
-}
-
-async fn bench_stream_cipher_zk(thread_count: usize, len: usize) {
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("test").await;
-
- let key = [0u8; 16];
- let iv = [0u8; 4];
-
- let leader_thread = leader_vm.new_thread("key_config").await.unwrap();
- let leader_key = leader_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let leader_iv = leader_thread.new_public_input::<[u8; 4]>("iv").unwrap();
-
- leader_thread.assign(&leader_key, key).unwrap();
- leader_thread.assign(&leader_iv, iv).unwrap();
-
- let follower_thread = follower_vm.new_thread("key_config").await.unwrap();
- let follower_key = follower_thread.new_public_input::<[u8; 16]>("key").unwrap();
- let follower_iv = follower_thread.new_public_input::<[u8; 4]>("iv").unwrap();
-
- follower_thread.assign(&follower_key, key).unwrap();
- follower_thread.assign(&follower_iv, iv).unwrap();
-
- let leader_thread_pool = leader_vm
- .new_thread_pool("mock", thread_count)
- .await
- .unwrap();
- let follower_thread_pool = follower_vm
- .new_thread_pool("mock", thread_count)
- .await
- .unwrap();
-
- let leader_config = StreamCipherConfigBuilder::default()
- .id("test".to_string())
- .build()
- .unwrap();
-
- let follower_config = StreamCipherConfigBuilder::default()
- .id("test".to_string())
- .build()
- .unwrap();
-
- let mut leader = MpcStreamCipher::::new(leader_config, leader_thread_pool);
- leader.set_key(leader_key, leader_iv);
-
- let mut follower = MpcStreamCipher::::new(follower_config, follower_thread_pool);
- follower.set_key(follower_key, follower_iv);
-
- let plaintext = vec![0u8; len];
- let explicit_nonce = [0u8; 8];
- let ciphertext = Aes128Ctr::apply_keystream(&key, &iv, 2, &explicit_nonce, &plaintext).unwrap();
-
- _ = tokio::try_join!(
- leader.prove_plaintext(explicit_nonce.to_vec(), plaintext),
- follower.verify_plaintext(explicit_nonce.to_vec(), ciphertext)
- )
- .unwrap();
-
- _ = tokio::try_join!(leader_vm.finalize(), follower_vm.finalize()).unwrap();
-}
-
-fn criterion_benchmark(c: &mut Criterion) {
- let rt = tokio::runtime::Runtime::new().unwrap();
- let thread_count = 8;
- let len = 1024;
-
- let mut group = c.benchmark_group("stream_cipher/encrypt_private");
- group.throughput(Throughput::Bytes(len as u64));
- group.bench_function(format!("{}", len), |b| {
- b.to_async(&rt)
- .iter(|| async { bench_stream_cipher_encrypt(thread_count, len).await })
- });
-
- drop(group);
-
- let mut group = c.benchmark_group("stream_cipher/zk");
- group.throughput(Throughput::Bytes(len as u64));
- group.bench_function(format!("{}", len), |b| {
- b.to_async(&rt)
- .iter(|| async { bench_stream_cipher_zk(thread_count, len).await })
- });
-
- drop(group);
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
diff --git a/components/cipher/stream-cipher/src/stream_cipher.rs b/components/cipher/stream-cipher/src/stream_cipher.rs
deleted file mode 100644
index 601bf6921a..0000000000
--- a/components/cipher/stream-cipher/src/stream_cipher.rs
+++ /dev/null
@@ -1,842 +0,0 @@
-use async_trait::async_trait;
-use mpz_circuits::types::Value;
-use std::{collections::HashMap, fmt::Debug, marker::PhantomData};
-
-use mpz_garble::{
- value::ValueRef, Decode, DecodePrivate, Execute, Memory, Prove, Thread, ThreadPool, Verify,
-};
-use utils::id::NestedId;
-
-use crate::{
- cipher::CtrCircuit,
- circuit::build_array_xor,
- config::{InputText, KeyBlockConfig, StreamCipherConfig},
- StreamCipher, StreamCipherError,
-};
-
-/// An MPC stream cipher.
-pub struct MpcStreamCipher
-where
- C: CtrCircuit,
- E: Thread + Execute + Decode + DecodePrivate + Send + Sync,
-{
- config: StreamCipherConfig,
- state: State,
- thread_pool: ThreadPool,
-
- _cipher: PhantomData,
-}
-
-struct State {
- /// Encoded key and IV for the cipher.
- encoded_key_iv: Option,
- /// Key and IV for the cipher.
- key_iv: Option,
- /// Unique identifier for each execution of the cipher.
- execution_id: NestedId,
- /// Unique identifier for each byte in the transcript.
- transcript_counter: NestedId,
- /// Unique identifier for each byte in the ciphertext (prefixed with execution id).
- ciphertext_counter: NestedId,
- /// Persists the transcript counter for each transcript id.
- transcript_state: HashMap,
-}
-
-#[derive(Clone)]
-struct EncodedKeyAndIv {
- key: ValueRef,
- iv: ValueRef,
-}
-
-#[derive(Clone)]
-struct KeyAndIv {
- key: Vec,
- iv: Vec,
-}
-
-impl MpcStreamCipher
-where
- C: CtrCircuit,
- E: Thread + Execute + Prove + Verify + Decode + DecodePrivate + Send + Sync + 'static,
-{
- /// Creates a new counter-mode cipher.
- pub fn new(config: StreamCipherConfig, thread_pool: ThreadPool) -> Self {
- let execution_id = NestedId::new(&config.id).append_counter();
- let transcript_counter = NestedId::new(&config.transcript_id).append_counter();
- let ciphertext_counter = execution_id.append_string("ciphertext").append_counter();
-
- Self {
- config,
- state: State {
- encoded_key_iv: None,
- key_iv: None,
- execution_id,
- transcript_counter,
- ciphertext_counter,
- transcript_state: HashMap::new(),
- },
- thread_pool,
- _cipher: PhantomData,
- }
- }
-
- /// Returns unique identifiers for the next bytes in the transcript.
- fn plaintext_ids(&mut self, len: usize) -> Vec {
- (0..len)
- .map(|_| {
- self.state
- .transcript_counter
- .increment_in_place()
- .to_string()
- })
- .collect()
- }
-
- /// Returns unique identifiers for the next bytes in the ciphertext.
- fn ciphertext_ids(&mut self, len: usize) -> Vec {
- (0..len)
- .map(|_| {
- self.state
- .ciphertext_counter
- .increment_in_place()
- .to_string()
- })
- .collect()
- }
-
- async fn compute_keystream(
- &mut self,
- explicit_nonce: Vec,
- start_ctr: usize,
- len: usize,
- mode: ExecutionMode,
- ) -> Result {
- let EncodedKeyAndIv { key, iv } = self
- .state
- .encoded_key_iv
- .clone()
- .ok_or(StreamCipherError::KeyIvNotSet)?;
-
- let explicit_nonce_len = explicit_nonce.len();
- let explicit_nonce: C::NONCE = explicit_nonce.try_into().map_err(|_| {
- StreamCipherError::InvalidExplicitNonceLength {
- expected: C::NONCE_LEN,
- actual: explicit_nonce_len,
- }
- })?;
-
- // Divide msg length by block size rounding up
- let block_count = (len / C::BLOCK_LEN) + (len % C::BLOCK_LEN != 0) as usize;
-
- let block_configs = (0..block_count)
- .map(|i| {
- KeyBlockConfig::::new(
- key.clone(),
- iv.clone(),
- explicit_nonce,
- (start_ctr + i) as u32,
- )
- })
- .collect::>();
-
- let execution_id = self.state.execution_id.increment_in_place();
-
- let keystream = compute_keystream(
- &mut self.thread_pool,
- execution_id,
- block_configs,
- len,
- mode,
- )
- .await?;
-
- Ok(keystream)
- }
-
- /// Applies the keystream to the provided input text.
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "trace", skip(self), err)
- )]
- async fn apply_keystream(
- &mut self,
- input_text: InputText,
- keystream: ValueRef,
- mode: ExecutionMode,
- ) -> Result {
- let execution_id = self.state.execution_id.increment_in_place();
-
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| {
- Box::pin(apply_keystream(
- thread,
- mode,
- execution_id,
- input_text,
- keystream,
- ))
- });
-
- let output_text = scope.wait().await.into_iter().next().unwrap()?;
-
- Ok(output_text)
- }
-
- async fn decode_public(&mut self, value: ValueRef) -> Result {
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.decode(&[value]).await }));
- let mut output = scope.wait().await.into_iter().next().unwrap()?;
- Ok(output.pop().unwrap())
- }
-
- async fn decode_private(&mut self, value: ValueRef) -> Result {
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.decode_private(&[value]).await }));
- let mut output = scope.wait().await.into_iter().next().unwrap()?;
- Ok(output.pop().unwrap())
- }
-
- async fn decode_blind(&mut self, value: ValueRef) -> Result<(), StreamCipherError> {
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.decode_blind(&[value]).await }));
- scope.wait().await.into_iter().next().unwrap()?;
- Ok(())
- }
-
- async fn prove(&mut self, value: ValueRef) -> Result<(), StreamCipherError> {
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.prove(&[value]).await }));
- scope.wait().await.into_iter().next().unwrap()?;
- Ok(())
- }
-
- async fn verify(&mut self, value: ValueRef, expected: Value) -> Result<(), StreamCipherError> {
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| {
- Box::pin(async move { thread.verify(&[value], &[expected]).await })
- });
- scope.wait().await.into_iter().next().unwrap()?;
- Ok(())
- }
-}
-
-#[async_trait]
-impl StreamCipher for MpcStreamCipher
-where
- C: CtrCircuit,
- E: Thread + Execute + Prove + Verify + Decode + DecodePrivate + Send + Sync + 'static,
-{
- fn set_key(&mut self, key: ValueRef, iv: ValueRef) {
- self.state.encoded_key_iv = Some(EncodedKeyAndIv { key, iv });
- }
-
- async fn decode_key_private(&mut self) -> Result<(), StreamCipherError> {
- let EncodedKeyAndIv { key, iv } = self
- .state
- .encoded_key_iv
- .clone()
- .ok_or(StreamCipherError::KeyIvNotSet)?;
-
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.decode_private(&[key, iv]).await }));
- let output = scope.wait().await.into_iter().next().unwrap()?;
-
- let [key, iv]: [_; 2] = output.try_into().expect("decoded 2 values");
- let key: Vec = key.try_into().expect("key is an array");
- let iv: Vec = iv.try_into().expect("iv is an array");
-
- self.state.key_iv = Some(KeyAndIv { key, iv });
-
- Ok(())
- }
-
- async fn decode_key_blind(&mut self) -> Result<(), StreamCipherError> {
- let EncodedKeyAndIv { key, iv } = self
- .state
- .encoded_key_iv
- .clone()
- .ok_or(StreamCipherError::KeyIvNotSet)?;
-
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.decode_blind(&[key, iv]).await }));
- scope.wait().await.into_iter().next().unwrap()?;
-
- Ok(())
- }
-
- fn set_transcript_id(&mut self, id: &str) {
- let current_id = self
- .state
- .transcript_counter
- .root()
- .expect("root id is set");
- let current_counter = self.state.transcript_counter.clone();
- self.state
- .transcript_state
- .insert(current_id.to_string(), current_counter);
-
- if let Some(counter) = self.state.transcript_state.get(id) {
- self.state.transcript_counter = counter.clone();
- } else {
- self.state.transcript_counter = NestedId::new(id).append_counter();
- }
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self, plaintext), err)
- )]
- async fn encrypt_public(
- &mut self,
- explicit_nonce: Vec,
- plaintext: Vec,
- ) -> Result, StreamCipherError> {
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- plaintext.len(),
- ExecutionMode::Mpc,
- )
- .await?;
-
- let plaintext_ids = self.plaintext_ids(plaintext.len());
- let ciphertext = self
- .apply_keystream(
- InputText::Public {
- ids: plaintext_ids,
- text: plaintext,
- },
- keystream,
- ExecutionMode::Mpc,
- )
- .await?;
-
- let ciphertext: Vec = self
- .decode_public(ciphertext)
- .await?
- .try_into()
- .expect("ciphertext is array");
-
- Ok(ciphertext)
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self, plaintext), err)
- )]
- async fn encrypt_private(
- &mut self,
- explicit_nonce: Vec,
- plaintext: Vec,
- ) -> Result, StreamCipherError> {
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- plaintext.len(),
- ExecutionMode::Mpc,
- )
- .await?;
-
- let plaintext_ids = self.plaintext_ids(plaintext.len());
- let ciphertext = self
- .apply_keystream(
- InputText::Private {
- ids: plaintext_ids,
- text: plaintext,
- },
- keystream,
- ExecutionMode::Mpc,
- )
- .await?;
-
- let ciphertext: Vec = self
- .decode_public(ciphertext)
- .await?
- .try_into()
- .expect("ciphertext is array");
-
- Ok(ciphertext)
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self), err)
- )]
- async fn encrypt_blind(
- &mut self,
- explicit_nonce: Vec,
- len: usize,
- ) -> Result, StreamCipherError> {
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- len,
- ExecutionMode::Mpc,
- )
- .await?;
-
- let plaintext_ids = self.plaintext_ids(len);
- let ciphertext = self
- .apply_keystream(
- InputText::Blind { ids: plaintext_ids },
- keystream,
- ExecutionMode::Mpc,
- )
- .await?;
-
- let ciphertext: Vec = self
- .decode_public(ciphertext)
- .await?
- .try_into()
- .expect("ciphertext is array");
-
- Ok(ciphertext)
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self), err)
- )]
- async fn decrypt_public(
- &mut self,
- explicit_nonce: Vec,
- ciphertext: Vec,
- ) -> Result, StreamCipherError> {
- // TODO: We may want to support writing to the transcript when decrypting
- // in public mode.
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- ciphertext.len(),
- ExecutionMode::Mpc,
- )
- .await?;
-
- let ciphertext_ids = self.ciphertext_ids(ciphertext.len());
- let plaintext = self
- .apply_keystream(
- InputText::Public {
- ids: ciphertext_ids,
- text: ciphertext,
- },
- keystream,
- ExecutionMode::Mpc,
- )
- .await?;
-
- let plaintext: Vec = self
- .decode_public(plaintext)
- .await?
- .try_into()
- .expect("plaintext is array");
-
- Ok(plaintext)
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self), err)
- )]
- async fn decrypt_private(
- &mut self,
- explicit_nonce: Vec,
- ciphertext: Vec,
- ) -> Result, StreamCipherError> {
- let keystream_ref = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- ciphertext.len(),
- ExecutionMode::Mpc,
- )
- .await?;
-
- let keystream: Vec = self
- .decode_private(keystream_ref.clone())
- .await?
- .try_into()
- .expect("keystream is array");
-
- let plaintext = ciphertext
- .into_iter()
- .zip(keystream)
- .map(|(c, k)| c ^ k)
- .collect::>();
-
- // Prove plaintext encrypts back to ciphertext
- let plaintext_ids = self.plaintext_ids(plaintext.len());
- let ciphertext = self
- .apply_keystream(
- InputText::Private {
- ids: plaintext_ids,
- text: plaintext.clone(),
- },
- keystream_ref,
- ExecutionMode::Prove,
- )
- .await?;
-
- self.prove(ciphertext).await?;
-
- Ok(plaintext)
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(self), err)
- )]
- async fn decrypt_blind(
- &mut self,
- explicit_nonce: Vec,
- ciphertext: Vec,
- ) -> Result<(), StreamCipherError> {
- let keystream_ref = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- ciphertext.len(),
- ExecutionMode::Mpc,
- )
- .await?;
-
- self.decode_blind(keystream_ref.clone()).await?;
-
- // Verify the plaintext encrypts back to ciphertext
- let plaintext_ids = self.plaintext_ids(ciphertext.len());
- let ciphertext_ref = self
- .apply_keystream(
- InputText::Blind { ids: plaintext_ids },
- keystream_ref,
- ExecutionMode::Verify,
- )
- .await?;
-
- self.verify(ciphertext_ref, ciphertext.into()).await?;
-
- Ok(())
- }
-
- async fn prove_plaintext(
- &mut self,
- explicit_nonce: Vec,
- ciphertext: Vec,
- ) -> Result, StreamCipherError> {
- let KeyAndIv { key, iv } = self
- .state
- .key_iv
- .clone()
- .ok_or(StreamCipherError::KeyIvNotSet)?;
-
- let plaintext = C::apply_keystream(
- &key,
- &iv,
- self.config.start_ctr,
- &explicit_nonce,
- &ciphertext,
- )?;
-
- // Prove plaintext encrypts back to ciphertext
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- plaintext.len(),
- ExecutionMode::Prove,
- )
- .await?;
-
- let plaintext_ids = self.plaintext_ids(plaintext.len());
- let ciphertext = self
- .apply_keystream(
- InputText::Private {
- ids: plaintext_ids,
- text: plaintext.clone(),
- },
- keystream,
- ExecutionMode::Prove,
- )
- .await?;
-
- self.prove(ciphertext).await?;
-
- Ok(plaintext)
- }
-
- async fn verify_plaintext(
- &mut self,
- explicit_nonce: Vec,
- ciphertext: Vec,
- ) -> Result<(), StreamCipherError> {
- let keystream = self
- .compute_keystream(
- explicit_nonce,
- self.config.start_ctr,
- ciphertext.len(),
- ExecutionMode::Verify,
- )
- .await?;
-
- let plaintext_ids = self.plaintext_ids(ciphertext.len());
- let ciphertext_ref = self
- .apply_keystream(
- InputText::Blind { ids: plaintext_ids },
- keystream,
- ExecutionMode::Verify,
- )
- .await?;
-
- self.verify(ciphertext_ref, ciphertext.into()).await?;
-
- Ok(())
- }
-
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(self), err)
- )]
- async fn share_keystream_block(
- &mut self,
- explicit_nonce: Vec,
- ctr: usize,
- ) -> Result, StreamCipherError> {
- let EncodedKeyAndIv { key, iv } = self
- .state
- .encoded_key_iv
- .clone()
- .ok_or(StreamCipherError::KeyIvNotSet)?;
-
- let explicit_nonce_len = explicit_nonce.len();
- let explicit_nonce: C::NONCE = explicit_nonce.try_into().map_err(|_| {
- StreamCipherError::InvalidExplicitNonceLength {
- expected: C::NONCE_LEN,
- actual: explicit_nonce_len,
- }
- })?;
-
- let block_id = self.state.execution_id.increment_in_place();
- let mut scope = self.thread_pool.new_scope();
- scope.push(move |thread| {
- Box::pin(async move {
- let key_block = compute_key_block(
- thread,
- block_id,
- KeyBlockConfig::::new(key, iv, explicit_nonce, ctr as u32),
- ExecutionMode::Mpc,
- )
- .await?;
-
- let share = thread
- .decode_shared(&[key_block])
- .await?
- .into_iter()
- .next()
- .unwrap();
-
- Ok::<_, StreamCipherError>(share)
- })
- });
-
- let share: Vec = scope
- .wait()
- .await
- .into_iter()
- .next()
- .unwrap()?
- .try_into()
- .expect("share is an array");
-
- Ok(share)
- }
-}
-
-#[derive(Debug, Clone, Copy)]
-enum ExecutionMode {
- Mpc,
- Prove,
- Verify,
-}
-
-async fn apply_keystream(
- thread: &mut T,
- mode: ExecutionMode,
- execution_id: NestedId,
- input_text: InputText,
- keystream: ValueRef,
-) -> Result {
- let input_text = match input_text {
- InputText::Public { ids, text } => {
- let refs = text
- .into_iter()
- .zip(ids)
- .map(|(byte, id)| {
- let value_ref = thread.new_public_input::(&id)?;
- thread.assign(&value_ref, byte)?;
-
- Ok::<_, StreamCipherError>(value_ref)
- })
- .collect::, _>>()?;
- thread.array_from_values(&refs)?
- }
- InputText::Private { ids, text } => {
- let refs = text
- .into_iter()
- .zip(ids)
- .map(|(byte, id)| {
- let value_ref = thread.new_private_input::(&id)?;
- thread.assign(&value_ref, byte)?;
-
- Ok::<_, StreamCipherError>(value_ref)
- })
- .collect::, _>>()?;
- thread.array_from_values(&refs)?
- }
- InputText::Blind { ids } => {
- let refs = ids
- .into_iter()
- .map(|id| thread.new_blind_input::(&id))
- .collect::, _>>()?;
- thread.array_from_values(&refs)?
- }
- };
-
- let output_text = thread.new_array_output::(
- &execution_id.append_string("output").to_string(),
- input_text.len(),
- )?;
-
- let circ = build_array_xor(input_text.len());
-
- match mode {
- ExecutionMode::Mpc => {
- thread
- .execute(circ, &[input_text, keystream], &[output_text.clone()])
- .await?;
- }
- ExecutionMode::Prove => {
- thread
- .execute_prove(circ, &[input_text, keystream], &[output_text.clone()])
- .await?;
- }
- ExecutionMode::Verify => {
- thread
- .execute_verify(circ, &[input_text, keystream], &[output_text.clone()])
- .await?;
- }
- }
-
- Ok(output_text)
-}
-
-#[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "trace", skip(thread_pool), err)
-)]
-async fn compute_keystream<
- T: Thread + Memory + Execute + Prove + Verify + Decode + DecodePrivate + Send + 'static,
- C: CtrCircuit,
->(
- thread_pool: &mut ThreadPool,
- execution_id: NestedId,
- configs: Vec>,
- len: usize,
- mode: ExecutionMode,
-) -> Result {
- let mut block_id = execution_id.append_counter();
- let mut scope = thread_pool.new_scope();
-
- for config in configs {
- let block_id = block_id.increment_in_place();
- scope.push(move |thread| Box::pin(compute_key_block(thread, block_id, config, mode)));
- }
-
- let key_blocks = scope
- .wait()
- .await
- .into_iter()
- .collect::, _>>()?;
-
- // Flatten the key blocks into a single array.
- let keystream = key_blocks
- .iter()
- .flat_map(|block| block.iter())
- .take(len)
- .cloned()
- .map(|id| ValueRef::Value { id })
- .collect::>();
-
- let mut scope = thread_pool.new_scope();
- scope.push(move |thread| Box::pin(async move { thread.array_from_values(&keystream) }));
-
- let keystream = scope.wait().await.into_iter().next().unwrap()?;
-
- Ok(keystream)
-}
-
-#[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "trace", skip(thread), err)
-)]
-async fn compute_key_block<
- T: Memory + Execute + Prove + Verify + Decode + DecodePrivate + Send,
- C: CtrCircuit,
->(
- thread: &mut T,
- block_id: NestedId,
- config: KeyBlockConfig,
- mode: ExecutionMode,
-) -> Result {
- let KeyBlockConfig {
- key,
- iv,
- explicit_nonce,
- ctr,
- ..
- } = config;
-
- let explicit_nonce_ref = thread.new_public_input::<::NONCE>(
- &block_id.append_string("explicit_nonce").to_string(),
- )?;
- let ctr_ref = thread.new_public_input::<[u8; 4]>(&block_id.append_string("ctr").to_string())?;
- let key_block =
- thread.new_output::(&block_id.append_string("key_block").to_string())?;
-
- thread.assign(&explicit_nonce_ref, explicit_nonce)?;
- thread.assign(&ctr_ref, ctr.to_be_bytes())?;
-
- // Execute circuit
- match mode {
- ExecutionMode::Mpc => {
- thread
- .execute(
- C::circuit(),
- &[key, iv, explicit_nonce_ref, ctr_ref],
- &[key_block.clone()],
- )
- .await?;
- }
- ExecutionMode::Prove => {
- thread
- .execute_prove(
- C::circuit(),
- &[key, iv, explicit_nonce_ref, ctr_ref],
- &[key_block.clone()],
- )
- .await?;
- }
- ExecutionMode::Verify => {
- thread
- .execute_verify(
- C::circuit(),
- &[key, iv, explicit_nonce_ref, ctr_ref],
- &[key_block.clone()],
- )
- .await?;
- }
- }
-
- Ok(key_block)
-}
diff --git a/components/integration-tests/Cargo.toml b/components/integration-tests/Cargo.toml
deleted file mode 100644
index 6f6402566b..0000000000
--- a/components/integration-tests/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "integration-tests"
-version = "0.0.0"
-edition = "2021"
-publish = false
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
-[profile.release]
-lto = true
-
-
-[dev-dependencies]
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-tlsn-block-cipher = { path = "../cipher/block-cipher" }
-tlsn-stream-cipher = { path = "../cipher/stream-cipher" }
-tlsn-universal-hash = { path = "../universal-hash" }
-tlsn-aead = { path = "../aead" }
-tlsn-key-exchange = { path = "../key-exchange" }
-tlsn-point-addition = { path = "../point-addition" }
-tlsn-hmac-sha256 = { path = "../prf/hmac-sha256" }
-tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-
-uid-mux = { path = "../uid-mux" }
-
-p256 = { version = "0.13" }
-
-futures = "0.3"
-rand_chacha = "0.3"
-rand = "0.8"
-
-tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
-tokio-util = { version = "0.7", features = ["compat"] }
diff --git a/components/integration-tests/tests/test.rs b/components/integration-tests/tests/test.rs
deleted file mode 100644
index 04cefbfde0..0000000000
--- a/components/integration-tests/tests/test.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-use aead::{
- aes_gcm::{AesGcmConfig, MpcAesGcm, Role as AesGcmRole},
- Aead,
-};
-use block_cipher::{Aes128, BlockCipherConfigBuilder, MpcBlockCipher};
-use ff::Gf2_128;
-use futures::StreamExt;
-use hmac_sha256::{MpcPrf, Prf, PrfConfig, SessionKeys};
-use key_exchange::{KeyExchange, KeyExchangeConfig, Role as KeyExchangeRole};
-use mpz_garble::{config::Role as GarbleRole, protocol::deap::DEAPVm, Vm};
-use mpz_ot::{
- actor::kos::{ReceiverActor, SenderActor},
- chou_orlandi::{
- Receiver as BaseReceiver, ReceiverConfig as BaseReceiverConfig, Sender as BaseSender,
- SenderConfig as BaseSenderConfig,
- },
- kos::{Receiver, ReceiverConfig, Sender, SenderConfig},
-};
-use mpz_share_conversion as ff;
-use mpz_share_conversion::{ShareConversionReveal, ShareConversionVerify};
-use p256::{NonZeroScalar, PublicKey, SecretKey};
-use point_addition::{MpcPointAddition, Role as PointAdditionRole, P256};
-use rand::SeedableRng;
-use rand_chacha::ChaCha20Rng;
-use tlsn_stream_cipher::{Aes128Ctr, MpcStreamCipher, StreamCipherConfig};
-use tlsn_universal_hash::ghash::{Ghash, GhashConfig};
-use tokio_util::compat::TokioAsyncReadCompatExt;
-use uid_mux::{yamux, UidYamux};
-use utils_aio::{codec::BincodeMux, mux::MuxChannel};
-
-const OT_SETUP_COUNT: usize = 50_000;
-
-/// The following integration test checks the interplay of individual components of the TLSNotary
-/// protocol. These are:
-/// - channel multiplexing
-/// - oblivious transfer
-/// - point addition
-/// - key exchange
-/// - prf
-/// - aead cipher (stream cipher + ghash)
-#[tokio::test]
-async fn test_components() {
- let mut rng = ChaCha20Rng::seed_from_u64(0);
-
- let (leader_socket, follower_socket) = tokio::io::duplex(1 << 25);
-
- let mut leader_mux = UidYamux::new(
- yamux::Config::default(),
- leader_socket.compat(),
- yamux::Mode::Client,
- );
- let mut follower_mux = UidYamux::new(
- yamux::Config::default(),
- follower_socket.compat(),
- yamux::Mode::Server,
- );
-
- let leader_mux_control = leader_mux.control();
- let follower_mux_control = follower_mux.control();
-
- tokio::spawn(async move { leader_mux.run().await.unwrap() });
- tokio::spawn(async move { follower_mux.run().await.unwrap() });
-
- let mut leader_mux = BincodeMux::new(leader_mux_control);
- let mut follower_mux = BincodeMux::new(follower_mux_control);
-
- let leader_ot_sender_config = SenderConfig::default();
- let follower_ot_recvr_config = ReceiverConfig::default();
-
- let follower_ot_sender_config = SenderConfig::builder().sender_commit().build().unwrap();
- let leader_ot_recvr_config = ReceiverConfig::builder().sender_commit().build().unwrap();
-
- let (leader_ot_sender_sink, leader_ot_sender_stream) =
- leader_mux.get_channel("ot/0").await.unwrap().split();
-
- let (follower_ot_recvr_sink, follower_ot_recvr_stream) =
- follower_mux.get_channel("ot/0").await.unwrap().split();
-
- let (leader_ot_receiver_sink, leader_ot_receiver_stream) =
- leader_mux.get_channel("ot/1").await.unwrap().split();
-
- let (follower_ot_sender_sink, follower_ot_sender_stream) =
- follower_mux.get_channel("ot/1").await.unwrap().split();
-
- let mut leader_ot_sender_actor = SenderActor::new(
- Sender::new(
- leader_ot_sender_config,
- BaseReceiver::new(BaseReceiverConfig::default()),
- ),
- leader_ot_sender_sink,
- leader_ot_sender_stream,
- );
-
- let mut follower_ot_recvr_actor = ReceiverActor::new(
- Receiver::new(
- follower_ot_recvr_config,
- BaseSender::new(BaseSenderConfig::default()),
- ),
- follower_ot_recvr_sink,
- follower_ot_recvr_stream,
- );
-
- let mut leader_ot_recvr_actor = ReceiverActor::new(
- Receiver::new(
- leader_ot_recvr_config,
- BaseSender::new(
- BaseSenderConfig::builder()
- .receiver_commit()
- .build()
- .unwrap(),
- ),
- ),
- leader_ot_receiver_sink,
- leader_ot_receiver_stream,
- );
-
- let mut follower_ot_sender_actor = SenderActor::new(
- Sender::new(
- follower_ot_sender_config,
- BaseReceiver::new(
- BaseReceiverConfig::builder()
- .receiver_commit()
- .build()
- .unwrap(),
- ),
- ),
- follower_ot_sender_sink,
- follower_ot_sender_stream,
- );
-
- let leader_ot_sender = leader_ot_sender_actor.sender();
- let follower_ot_recvr = follower_ot_recvr_actor.receiver();
-
- let leader_ot_recvr = leader_ot_recvr_actor.receiver();
- let follower_ot_sender = follower_ot_sender_actor.sender();
-
- tokio::spawn(async move {
- leader_ot_sender_actor.setup(OT_SETUP_COUNT).await.unwrap();
- leader_ot_sender_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- follower_ot_recvr_actor.setup(OT_SETUP_COUNT).await.unwrap();
- follower_ot_recvr_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- leader_ot_recvr_actor.setup(OT_SETUP_COUNT).await.unwrap();
- leader_ot_recvr_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- follower_ot_sender_actor
- .setup(OT_SETUP_COUNT)
- .await
- .unwrap();
- follower_ot_sender_actor.run().await.unwrap();
- follower_ot_sender_actor.reveal().await.unwrap();
- });
-
- let mut leader_vm = DEAPVm::new(
- "vm",
- GarbleRole::Leader,
- [0u8; 32],
- leader_mux.get_channel("vm").await.unwrap(),
- Box::new(leader_mux.clone()),
- leader_ot_sender.clone(),
- leader_ot_recvr.clone(),
- );
-
- let mut follower_vm = DEAPVm::new(
- "vm",
- GarbleRole::Follower,
- [1u8; 32],
- follower_mux.get_channel("vm").await.unwrap(),
- Box::new(follower_mux.clone()),
- follower_ot_sender.clone(),
- follower_ot_recvr.clone(),
- );
-
- let leader_p256_sender = ff::ConverterSender::::new(
- ff::SenderConfig::builder().id("p256/0").build().unwrap(),
- leader_ot_sender.clone(),
- leader_mux.get_channel("p256/0").await.unwrap(),
- );
-
- let leader_p256_receiver = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder().id("p256/1").build().unwrap(),
- follower_ot_recvr.clone(),
- leader_mux.get_channel("p256/1").await.unwrap(),
- );
-
- let follower_p256_sender = ff::ConverterSender::::new(
- ff::SenderConfig::builder().id("p256/1").build().unwrap(),
- leader_ot_sender.clone(),
- follower_mux.get_channel("p256/1").await.unwrap(),
- );
-
- let follower_p256_receiver = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder().id("p256/0").build().unwrap(),
- follower_ot_recvr.clone(),
- follower_mux.get_channel("p256/0").await.unwrap(),
- );
-
- let leader_pa_sender = MpcPointAddition::new(PointAdditionRole::Leader, leader_p256_sender);
- let leader_pa_receiver = MpcPointAddition::new(PointAdditionRole::Leader, leader_p256_receiver);
-
- let follower_pa_sender =
- MpcPointAddition::new(PointAdditionRole::Follower, follower_p256_sender);
-
- let follower_pa_receiver =
- MpcPointAddition::new(PointAdditionRole::Follower, follower_p256_receiver);
-
- let mut leader_ke = key_exchange::KeyExchangeCore::new(
- leader_mux.get_channel("ke").await.unwrap(),
- leader_pa_sender,
- leader_pa_receiver,
- leader_vm.new_thread("ke").await.unwrap(),
- KeyExchangeConfig::builder()
- .id("ke")
- .role(KeyExchangeRole::Leader)
- .build()
- .unwrap(),
- );
-
- let mut follower_ke = key_exchange::KeyExchangeCore::new(
- follower_mux.get_channel("ke").await.unwrap(),
- follower_pa_sender,
- follower_pa_receiver,
- follower_vm.new_thread("ke").await.unwrap(),
- KeyExchangeConfig::builder()
- .id("ke")
- .role(KeyExchangeRole::Follower)
- .build()
- .unwrap(),
- );
-
- let (leader_pms, follower_pms) =
- futures::try_join!(leader_ke.setup(), follower_ke.setup()).unwrap();
-
- let mut leader_prf = MpcPrf::new(
- PrfConfig::builder()
- .role(hmac_sha256::Role::Leader)
- .build()
- .unwrap(),
- leader_vm.new_thread("prf/0").await.unwrap(),
- leader_vm.new_thread("prf/1").await.unwrap(),
- );
- let mut follower_prf = MpcPrf::new(
- PrfConfig::builder()
- .role(hmac_sha256::Role::Follower)
- .build()
- .unwrap(),
- follower_vm.new_thread("prf/0").await.unwrap(),
- follower_vm.new_thread("prf/1").await.unwrap(),
- );
-
- futures::try_join!(
- leader_prf.setup(leader_pms.into_value()),
- follower_prf.setup(follower_pms.into_value())
- )
- .unwrap();
-
- let block_cipher_config = BlockCipherConfigBuilder::default()
- .id("aes")
- .build()
- .unwrap();
- let leader_block_cipher = MpcBlockCipher::::new(
- block_cipher_config.clone(),
- leader_vm.new_thread("block_cipher").await.unwrap(),
- );
- let follower_block_cipher = MpcBlockCipher::::new(
- block_cipher_config,
- follower_vm.new_thread("block_cipher").await.unwrap(),
- );
-
- let stream_cipher_config = StreamCipherConfig::builder()
- .id("aes-ctr")
- .transcript_id("tx")
- .build()
- .unwrap();
- let leader_stream_cipher = MpcStreamCipher::::new(
- stream_cipher_config.clone(),
- leader_vm.new_thread_pool("aes-ctr", 4).await.unwrap(),
- );
- let follower_stream_cipher = MpcStreamCipher::::new(
- stream_cipher_config,
- follower_vm.new_thread_pool("aes-ctr", 4).await.unwrap(),
- );
-
- let mut leader_gf2 = ff::ConverterSender::::new(
- ff::SenderConfig::builder()
- .id("gf2")
- .record()
- .build()
- .unwrap(),
- leader_ot_sender.clone(),
- leader_mux.get_channel("gf2").await.unwrap(),
- );
-
- let mut follower_gf2 = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder()
- .id("gf2")
- .record()
- .build()
- .unwrap(),
- follower_ot_recvr.clone(),
- follower_mux.get_channel("gf2").await.unwrap(),
- );
-
- let ghash_config = GhashConfig::builder()
- .id("aes_gcm/ghash")
- .initial_block_count(64)
- .build()
- .unwrap();
-
- let leader_ghash = Ghash::new(ghash_config.clone(), leader_gf2.handle().unwrap());
- let follower_ghash = Ghash::new(ghash_config, follower_gf2.handle().unwrap());
-
- let mut leader_aead = MpcAesGcm::new(
- AesGcmConfig::builder()
- .id("aes_gcm")
- .role(AesGcmRole::Leader)
- .build()
- .unwrap(),
- leader_mux.get_channel("aes_gcm").await.unwrap(),
- Box::new(leader_block_cipher),
- Box::new(leader_stream_cipher),
- Box::new(leader_ghash),
- );
-
- let mut follower_aead = MpcAesGcm::new(
- AesGcmConfig::builder()
- .id("aes_gcm")
- .role(AesGcmRole::Follower)
- .build()
- .unwrap(),
- follower_mux.get_channel("aes_gcm").await.unwrap(),
- Box::new(follower_block_cipher),
- Box::new(follower_stream_cipher),
- Box::new(follower_ghash),
- );
-
- let leader_private_key = SecretKey::random(&mut rng);
- let follower_private_key = SecretKey::random(&mut rng);
- let server_public_key = PublicKey::from_secret_scalar(&NonZeroScalar::random(&mut rng));
-
- // Setup complete
-
- let _ = tokio::try_join!(
- leader_ke.compute_client_key(leader_private_key),
- follower_ke.compute_client_key(follower_private_key)
- )
- .unwrap();
-
- leader_ke.set_server_key(server_public_key);
-
- tokio::try_join!(leader_ke.compute_pms(), follower_ke.compute_pms()).unwrap();
-
- let (leader_session_keys, follower_session_keys) = tokio::try_join!(
- leader_prf.compute_session_keys_private([0u8; 32], [0u8; 32]),
- follower_prf.compute_session_keys_blind()
- )
- .unwrap();
-
- let SessionKeys {
- client_write_key: leader_key,
- client_iv: leader_iv,
- ..
- } = leader_session_keys;
-
- let SessionKeys {
- client_write_key: follower_key,
- client_iv: follower_iv,
- ..
- } = follower_session_keys;
-
- tokio::try_join!(
- leader_aead.set_key(leader_key, leader_iv),
- follower_aead.set_key(follower_key, follower_iv)
- )
- .unwrap();
-
- let msg = vec![0u8; 4096];
-
- let _ = tokio::try_join!(
- leader_aead.encrypt_private(vec![0u8; 8], msg.clone(), vec![]),
- follower_aead.encrypt_blind(vec![0u8; 8], msg.len(), vec![])
- )
- .unwrap();
-
- follower_ot_sender.shutdown().await.unwrap();
-
- tokio::try_join!(leader_vm.finalize(), follower_vm.finalize()).unwrap();
- tokio::try_join!(leader_gf2.reveal(), follower_gf2.verify()).unwrap();
-}
diff --git a/components/key-exchange/Cargo.toml b/components/key-exchange/Cargo.toml
deleted file mode 100644
index 0fdcb43a22..0000000000
--- a/components/key-exchange/Cargo.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-[package]
-name = "tlsn-key-exchange"
-authors = ["TLSNotary Team"]
-description = "Implementation of the TLSNotary-specific key-exchange protocol"
-keywords = ["tls", "mpc", "2pc", "pms", "key-exchange"]
-categories = ["cryptography"]
-license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.3"
-edition = "2021"
-
-[lib]
-name = "key_exchange"
-
-[features]
-default = ["mock"]
-tracing = ["dep:tracing", "tlsn-point-addition/tracing"]
-mock = []
-
-[dependencies]
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-tlsn-point-addition = { path = "../point-addition" }
-p256 = { version = "0.13", features = ["ecdh"] }
-async-trait = "0.1"
-thiserror = "1"
-serde = "1"
-futures = "0.3"
-derive_builder = "0.12"
-tracing = { version = "0.1", optional = true }
-
-[dev-dependencies]
-rand_chacha = "0.3"
-rand_core = "0.6"
-tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }
diff --git a/components/key-exchange/src/circuit.rs b/components/key-exchange/src/circuit.rs
deleted file mode 100644
index 82818ea6cc..0000000000
--- a/components/key-exchange/src/circuit.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-//! This module provides the circuits used in the key exchange protocol
-
-use std::sync::Arc;
-
-use mpz_circuits::{circuits::big_num::nbyte_add_mod_trace, Circuit, CircuitBuilder};
-
-/// NIST P-256 prime big-endian
-static P: [u8; 32] = [
- 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-];
-
-/// Circuit for combining additive shares of the PMS, twice
-///
-/// # Inputs
-///
-/// 0. PMS_SHARE_A: 32 bytes PMS Additive Share
-/// 1. PMS_SHARE_B: 32 bytes PMS Additive Share
-/// 2. PMS_SHARE_C: 32 bytes PMS Additive Share
-/// 3. PMS_SHARE_D: 32 bytes PMS Additive Share
-///
-/// # Outputs
-/// 0. PMS1: Pre-master Secret = PMS_SHARE_A + PMS_SHARE_B
-/// 1. PMS2: Pre-master Secret = PMS_SHARE_C + PMS_SHARE_D
-/// 2. EQ: Equality check of PMS1 and PMS2
-pub(crate) fn build_pms_circuit() -> Arc {
- let builder = CircuitBuilder::new();
- let share_a = builder.add_array_input::();
- let share_b = builder.add_array_input::();
- let share_c = builder.add_array_input::();
- let share_d = builder.add_array_input::();
-
- let a = nbyte_add_mod_trace(builder.state(), share_a, share_b, P);
- let b = nbyte_add_mod_trace(builder.state(), share_c, share_d, P);
-
- let eq: [_; 32] = std::array::from_fn(|i| a[i] ^ b[i]);
-
- builder.add_output(a);
- builder.add_output(b);
- builder.add_output(eq);
-
- Arc::new(builder.build().expect("pms circuit is valid"))
-}
diff --git a/components/key-exchange/src/exchange.rs b/components/key-exchange/src/exchange.rs
deleted file mode 100644
index a84bdd8548..0000000000
--- a/components/key-exchange/src/exchange.rs
+++ /dev/null
@@ -1,621 +0,0 @@
-//! This module implements the key exchange logic
-
-use async_trait::async_trait;
-use futures::{SinkExt, StreamExt};
-use mpz_garble::{value::ValueRef, Decode, Execute, Load, Memory};
-
-use mpz_share_conversion_core::fields::{p256::P256, Field};
-use p256::{EncodedPoint, PublicKey, SecretKey};
-use point_addition::PointAddition;
-use std::fmt::Debug;
-
-use utils_aio::expect_msg_or_err;
-
-use crate::{
- circuit::build_pms_circuit,
- config::{KeyExchangeConfig, Role},
- KeyExchange, KeyExchangeChannel, KeyExchangeError, KeyExchangeMessage, Pms,
-};
-
-enum State {
- Initialized,
- Setup {
- share_a: ValueRef,
- share_b: ValueRef,
- share_c: ValueRef,
- share_d: ValueRef,
- pms_1: ValueRef,
- pms_2: ValueRef,
- eq: ValueRef,
- },
- KeyExchange {
- share_a: ValueRef,
- share_b: ValueRef,
- share_c: ValueRef,
- share_d: ValueRef,
- pms_1: ValueRef,
- pms_2: ValueRef,
- eq: ValueRef,
- },
- Complete,
- Error,
-}
-
-/// The instance for performing the key exchange protocol
-///
-/// Can be either a leader or a follower depending on the `role` field in [KeyExchangeConfig]
-pub struct KeyExchangeCore {
- /// A channel for exchanging messages between leader and follower
- channel: KeyExchangeChannel,
- /// The sender instance for performing point addition
- point_addition_sender: PS,
- /// The receiver instance for performing point addition
- point_addition_receiver: PR,
- /// MPC executor
- executor: E,
- /// The private key of the party behind this instance, either follower or leader
- private_key: Option,
- /// The public key of the server
- server_key: Option,
- /// The config used for the key exchange protocol
- config: KeyExchangeConfig,
- /// The state of the protocol
- state: State,
-}
-
-impl Debug for KeyExchangeCore
-where
- PS: PointAddition + Send + Debug,
- PR: PointAddition + Send + Debug,
- E: Memory + Execute + Decode + Send,
-{
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- f.debug_struct("KeyExchangeCore")
- .field("channel", &"{{ ... }}")
- .field("point_addition_sender", &"{{ ... }}")
- .field("point_addition_receiver", &"{{ ... }}")
- .field("executor", &"{{ ... }}")
- .field("private_key", &"{{ ... }}")
- .field("server_key", &self.server_key)
- .field("config", &self.config)
- .finish()
- }
-}
-
-impl KeyExchangeCore
-where
- PS: PointAddition + Send + Debug,
- PR: PointAddition + Send + Debug,
- E: Memory + Execute + Decode + Send,
-{
- /// Creates a new [KeyExchangeCore]
- ///
- /// * `channel` - The channel for sending messages between leader and follower
- /// * `point_addition_sender` - The point addition sender instance used during key exchange
- /// * `point_addition_receiver` - The point addition receiver instance used during key exchange
- /// * `executor` - The MPC executor
- /// * `config` - The config used for the key exchange protocol
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(
- level = "info",
- skip(channel, executor, point_addition_sender, point_addition_receiver),
- ret
- )
- )]
- pub fn new(
- channel: KeyExchangeChannel,
- point_addition_sender: PS,
- point_addition_receiver: PR,
- executor: E,
- config: KeyExchangeConfig,
- ) -> Self {
- Self {
- channel,
- point_addition_sender,
- point_addition_receiver,
- executor,
- private_key: None,
- server_key: None,
- config,
- state: State::Initialized,
- }
- }
-
- async fn compute_pms_shares(&mut self) -> Result<(P256, P256), KeyExchangeError> {
- let state = std::mem::replace(&mut self.state, State::Error);
-
- let State::Setup {
- share_a,
- share_b,
- share_c,
- share_d,
- pms_1,
- pms_2,
- eq,
- } = state
- else {
- todo!()
- };
-
- let server_key = match self.config.role() {
- Role::Leader => {
- // Send server public key to follower
- if let Some(server_key) = &self.server_key {
- self.channel
- .send(KeyExchangeMessage::ServerPublicKey((*server_key).into()))
- .await?;
-
- *server_key
- } else {
- return Err(KeyExchangeError::NoServerKey);
- }
- }
- Role::Follower => {
- // Receive server's public key from leader
- let message =
- expect_msg_or_err!(self.channel, KeyExchangeMessage::ServerPublicKey)?;
- let server_key = message.try_into()?;
-
- self.server_key = Some(server_key);
-
- server_key
- }
- };
-
- let private_key = self
- .private_key
- .take()
- .ok_or(KeyExchangeError::NoPrivateKey)?;
-
- // Compute the leader's/follower's share of the pre-master secret
- //
- // We need to mimic the [diffie-hellman](p256::ecdh::diffie_hellman) function without the
- // [SharedSecret](p256::ecdh::SharedSecret) wrapper, because this makes it harder to get
- // the result as an EC curve point.
- let shared_secret = {
- let public_projective = server_key.to_projective();
- (public_projective * private_key.to_nonzero_scalar().as_ref()).to_affine()
- };
-
- let encoded_point = EncodedPoint::from(PublicKey::from_affine(shared_secret)?);
- let (sender_share, receiver_share) = futures::try_join!(
- self.point_addition_sender
- .compute_x_coordinate_share(encoded_point),
- self.point_addition_receiver
- .compute_x_coordinate_share(encoded_point)
- )?;
-
- self.state = State::KeyExchange {
- share_a,
- share_b,
- share_c,
- share_d,
- pms_1,
- pms_2,
- eq,
- };
-
- match self.config.role() {
- Role::Leader => Ok((sender_share, receiver_share)),
- Role::Follower => Ok((receiver_share, sender_share)),
- }
- }
-
- async fn compute_pms_for(
- &mut self,
- pms_share1: P256,
- pms_share2: P256,
- ) -> Result {
- let state = std::mem::replace(&mut self.state, State::Error);
-
- let State::KeyExchange {
- share_a,
- share_b,
- share_c,
- share_d,
- pms_1,
- pms_2,
- eq,
- } = state
- else {
- todo!()
- };
-
- let pms_share1: [u8; 32] = pms_share1
- .to_be_bytes()
- .try_into()
- .expect("pms share is 32 bytes");
- let pms_share2: [u8; 32] = pms_share2
- .to_be_bytes()
- .try_into()
- .expect("pms share is 32 bytes");
-
- match self.config.role() {
- Role::Leader => {
- self.executor.assign(&share_a, pms_share1)?;
- self.executor.assign(&share_c, pms_share2)?;
- }
- Role::Follower => {
- self.executor.assign(&share_b, pms_share1)?;
- self.executor.assign(&share_d, pms_share2)?;
- }
- }
-
- self.executor
- .execute(
- build_pms_circuit(),
- &[share_a, share_b, share_c, share_d],
- &[pms_1.clone(), pms_2, eq.clone()],
- )
- .await?;
-
- #[cfg(feature = "tracing")]
- tracing::event!(tracing::Level::DEBUG, "Successfully executed PMS circuit!");
-
- let mut outputs = self.executor.decode(&[eq]).await?;
-
- let eq: [u8; 32] = outputs.remove(0).try_into().expect("eq is 32 bytes");
-
- // Eq should be all zeros if pms_1 == pms_2
- if eq != [0u8; 32] {
- return Err(KeyExchangeError::CheckFailed);
- }
-
- self.state = State::Complete;
-
- // Both parties use pms_1 as the pre-master secret
- Ok(Pms::new(pms_1))
- }
-}
-
-#[async_trait]
-impl KeyExchange for KeyExchangeCore
-where
- PS: PointAddition + Send + Debug,
- PR: PointAddition + Send + Debug,
- E: Memory + Load + Execute + Decode + Send,
-{
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(self), ret)
- )]
- fn server_key(&self) -> Option {
- self.server_key
- }
-
- /// Set the server's public key
- #[cfg_attr(feature = "tracing", tracing::instrument(level = "info", skip(self)))]
- fn set_server_key(&mut self, server_key: PublicKey) {
- self.server_key = Some(server_key);
- }
-
- async fn setup(&mut self) -> Result {
- let state = std::mem::replace(&mut self.state, State::Error);
-
- let State::Initialized = state else {
- return Err(KeyExchangeError::InvalidState(
- "expected to be in Initialized state".to_string(),
- ));
- };
-
- let (share_a, share_b, share_c, share_d) = match self.config.role() {
- Role::Leader => {
- let share_a = self
- .executor
- .new_private_input::<[u8; 32]>("pms/share_a")
- .unwrap();
- let share_b = self
- .executor
- .new_blind_input::<[u8; 32]>("pms/share_b")
- .unwrap();
- let share_c = self
- .executor
- .new_private_input::<[u8; 32]>("pms/share_c")
- .unwrap();
- let share_d = self
- .executor
- .new_blind_input::<[u8; 32]>("pms/share_d")
- .unwrap();
-
- (share_a, share_b, share_c, share_d)
- }
- Role::Follower => {
- let share_a = self
- .executor
- .new_blind_input::<[u8; 32]>("pms/share_a")
- .unwrap();
- let share_b = self
- .executor
- .new_private_input::<[u8; 32]>("pms/share_b")
- .unwrap();
- let share_c = self
- .executor
- .new_blind_input::<[u8; 32]>("pms/share_c")
- .unwrap();
- let share_d = self
- .executor
- .new_private_input::<[u8; 32]>("pms/share_d")
- .unwrap();
-
- (share_a, share_b, share_c, share_d)
- }
- };
-
- let pms_1 = self.executor.new_output::<[u8; 32]>("pms/1")?;
- let pms_2 = self.executor.new_output::<[u8; 32]>("pms/2")?;
- let eq = self.executor.new_output::<[u8; 32]>("pms/eq")?;
-
- self.executor
- .load(
- build_pms_circuit(),
- &[
- share_a.clone(),
- share_b.clone(),
- share_c.clone(),
- share_d.clone(),
- ],
- &[pms_1.clone(), pms_2.clone(), eq.clone()],
- )
- .await?;
-
- self.state = State::Setup {
- share_a,
- share_b,
- share_c,
- share_d,
- pms_1: pms_1.clone(),
- pms_2,
- eq,
- };
-
- Ok(Pms::new(pms_1))
- }
-
- /// Compute the client's public key
- ///
- /// The client's public key in this context is the combined public key (EC point addition) of
- /// the leader's public key and the follower's public key.
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(self, private_key), ret, err)
- )]
- async fn compute_client_key(
- &mut self,
- private_key: SecretKey,
- ) -> Result, KeyExchangeError> {
- let public_key = private_key.public_key();
- self.private_key = Some(private_key);
-
- match self.config.role() {
- Role::Leader => {
- // Receive public key from follower
- let message =
- expect_msg_or_err!(self.channel, KeyExchangeMessage::FollowerPublicKey)?;
- let follower_public_key: PublicKey = message.try_into()?;
-
- // Combine public keys
- let client_public_key = PublicKey::from_affine(
- (public_key.to_projective() + follower_public_key.to_projective()).to_affine(),
- )?;
-
- Ok(Some(client_public_key))
- }
- Role::Follower => {
- // Send public key to leader
- self.channel
- .send(KeyExchangeMessage::FollowerPublicKey(public_key.into()))
- .await?;
-
- Ok(None)
- }
- }
- }
-
- /// Computes the PMS
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(self), err)
- )]
- async fn compute_pms(&mut self) -> Result {
- let (pms_share1, pms_share2) = self.compute_pms_shares().await?;
-
- self.compute_pms_for(pms_share1, pms_share2).await
- }
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
-
- use mpz_garble::{
- protocol::deap::mock::{
- create_mock_deap_vm, MockFollower, MockFollowerThread, MockLeader, MockLeaderThread,
- },
- Vm,
- };
- use mpz_share_conversion_core::fields::{p256::P256, Field};
- use p256::{NonZeroScalar, PublicKey, SecretKey};
- use rand_chacha::ChaCha20Rng;
- use rand_core::SeedableRng;
-
- use crate::{
- mock::{create_mock_key_exchange_pair, MockKeyExchange},
- KeyExchangeError,
- };
-
- async fn create_pair() -> (
- (
- MockKeyExchange,
- MockKeyExchange,
- ),
- (MockLeader, MockFollower),
- ) {
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("test").await;
- (
- create_mock_key_exchange_pair(
- "test",
- leader_vm.new_thread("ke").await.unwrap(),
- follower_vm.new_thread("ke").await.unwrap(),
- ),
- (leader_vm, follower_vm),
- )
- }
-
- #[tokio::test]
- async fn test_key_exchange() {
- let mut rng = ChaCha20Rng::from_seed([0_u8; 32]);
-
- let leader_private_key = SecretKey::random(&mut rng);
- let follower_private_key = SecretKey::random(&mut rng);
- let server_public_key = PublicKey::from_secret_scalar(&NonZeroScalar::random(&mut rng));
-
- let ((mut leader, mut follower), (_leader_vm, _follower_vm)) = create_pair().await;
-
- let client_public_key = perform_key_exchange(
- &mut leader,
- &mut follower,
- leader_private_key.clone(),
- follower_private_key.clone(),
- server_public_key,
- )
- .await;
-
- let expected_client_public_key = PublicKey::from_affine(
- (leader_private_key.public_key().to_projective()
- + follower_private_key.public_key().to_projective())
- .to_affine(),
- )
- .unwrap();
-
- assert_eq!(client_public_key, expected_client_public_key);
- }
-
- #[tokio::test]
- async fn test_compute_pms_share() {
- let mut rng = ChaCha20Rng::from_seed([0_u8; 32]);
-
- let leader_private_key = SecretKey::random(&mut rng);
- let follower_private_key = SecretKey::random(&mut rng);
- let server_private_key = NonZeroScalar::random(&mut rng);
- let server_public_key = PublicKey::from_secret_scalar(&server_private_key);
-
- let ((mut leader, mut follower), (_leader_vm, _follower_vm)) = create_pair().await;
-
- let client_public_key = perform_key_exchange(
- &mut leader,
- &mut follower,
- leader_private_key.clone(),
- follower_private_key.clone(),
- server_public_key,
- )
- .await;
-
- leader.set_server_key(server_public_key);
-
- let ((l_pms1, l_pms2), (f_pms1, f_pms2)) =
- tokio::try_join!(leader.compute_pms_shares(), follower.compute_pms_shares()).unwrap();
-
- let expected_ecdh_x =
- p256::ecdh::diffie_hellman(server_private_key, client_public_key.as_affine());
-
- assert_eq!(
- expected_ecdh_x.raw_secret_bytes().to_vec(),
- (l_pms1 + f_pms1).to_be_bytes()
- );
- assert_eq!(
- expected_ecdh_x.raw_secret_bytes().to_vec(),
- (l_pms2 + f_pms2).to_be_bytes()
- );
- assert_eq!(l_pms1 + f_pms1, l_pms2 + f_pms2);
- assert_ne!(l_pms1, f_pms1);
- assert_ne!(l_pms2, f_pms2);
- assert_ne!(l_pms1, l_pms2);
- assert_ne!(f_pms1, f_pms2);
- }
-
- #[tokio::test]
- async fn test_compute_pms() {
- let mut rng = ChaCha20Rng::from_seed([0_u8; 32]);
-
- let leader_private_key = SecretKey::random(&mut rng);
- let follower_private_key = SecretKey::random(&mut rng);
- let server_private_key = NonZeroScalar::random(&mut rng);
- let server_public_key = PublicKey::from_secret_scalar(&server_private_key);
-
- let ((mut leader, mut follower), (_leader_vm, _follower_vm)) = create_pair().await;
-
- _ = perform_key_exchange(
- &mut leader,
- &mut follower,
- leader_private_key.clone(),
- follower_private_key.clone(),
- server_public_key,
- )
- .await;
-
- leader.set_server_key(server_public_key);
-
- let (_leader_pms, _follower_pms) =
- tokio::try_join!(leader.compute_pms(), follower.compute_pms()).unwrap();
-
- assert_eq!(leader.server_key.unwrap(), server_public_key);
- assert_eq!(follower.server_key.unwrap(), server_public_key);
- }
-
- #[tokio::test]
- async fn test_compute_pms_fail() {
- let mut rng = ChaCha20Rng::from_seed([0_u8; 32]);
-
- let leader_private_key = SecretKey::random(&mut rng);
- let follower_private_key = SecretKey::random(&mut rng);
- let server_private_key = NonZeroScalar::random(&mut rng);
- let server_public_key = PublicKey::from_secret_scalar(&server_private_key);
-
- let ((mut leader, mut follower), (_leader_vm, _follower_vm)) = create_pair().await;
-
- _ = perform_key_exchange(
- &mut leader,
- &mut follower,
- leader_private_key.clone(),
- follower_private_key.clone(),
- server_public_key,
- )
- .await;
-
- leader.set_server_key(server_public_key);
-
- let ((mut l_pms1, l_pms2), (f_pms1, f_pms2)) =
- tokio::try_join!(leader.compute_pms_shares(), follower.compute_pms_shares()).unwrap();
-
- l_pms1 = l_pms1 + P256::one();
-
- let err = tokio::try_join!(
- leader.compute_pms_for(l_pms1, l_pms2),
- follower.compute_pms_for(f_pms1, f_pms2)
- )
- .unwrap_err();
-
- assert!(matches!(err, KeyExchangeError::CheckFailed));
- }
-
- async fn perform_key_exchange(
- leader: &mut impl KeyExchange,
- follower: &mut impl KeyExchange,
- leader_private_key: SecretKey,
- follower_private_key: SecretKey,
- server_public_key: PublicKey,
- ) -> PublicKey {
- tokio::try_join!(leader.setup(), follower.setup()).unwrap();
-
- let (client_public_key, _) = tokio::try_join!(
- leader.compute_client_key(leader_private_key),
- follower.compute_client_key(follower_private_key)
- )
- .unwrap();
-
- leader.set_server_key(server_public_key);
-
- client_public_key.unwrap()
- }
-}
diff --git a/components/key-exchange/src/lib.rs b/components/key-exchange/src/lib.rs
deleted file mode 100644
index 945cc1959e..0000000000
--- a/components/key-exchange/src/lib.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-//! # The Key Exchange Protocol
-//!
-//! This crate implements a key exchange protocol with 3 parties, namely server, leader and
-//! follower. The goal is to end up with a shared secret (ECDH) between the server and the client.
-//! The client in this context is leader and follower combined, which means that each of them will
-//! end up with a share of the shared secret. The leader will do all the necessary communication
-//! with the server alone and forward all messages from and to the follower.
-//!
-//! A detailed description of this protocol can be found in our documentation
-//! .
-
-#![deny(missing_docs, unreachable_pub, unused_must_use)]
-#![deny(clippy::all)]
-#![forbid(unsafe_code)]
-
-mod circuit;
-mod config;
-mod exchange;
-#[cfg(feature = "mock")]
-pub mod mock;
-pub mod msg;
-
-pub use config::{
- KeyExchangeConfig, KeyExchangeConfigBuilder, KeyExchangeConfigBuilderError, Role,
-};
-pub use exchange::KeyExchangeCore;
-pub use msg::KeyExchangeMessage;
-
-/// A channel for exchanging key exchange messages
-pub type KeyExchangeChannel = Box>;
-
-use async_trait::async_trait;
-use mpz_garble::value::ValueRef;
-use p256::{PublicKey, SecretKey};
-use utils_aio::duplex::Duplex;
-
-/// Pre-master secret.
-#[derive(Debug, Clone)]
-pub struct Pms(ValueRef);
-
-impl Pms {
- /// Create a new PMS
- pub fn new(value: ValueRef) -> Self {
- Self(value)
- }
-
- /// Get the value of the PMS
- pub fn into_value(self) -> ValueRef {
- self.0
- }
-}
-
-/// An error that can occur during the key exchange protocol
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum KeyExchangeError {
- #[error(transparent)]
- IOError(#[from] std::io::Error),
- #[error(transparent)]
- MemoryError(#[from] mpz_garble::MemoryError),
- #[error(transparent)]
- LoadError(#[from] mpz_garble::LoadError),
- #[error(transparent)]
- ExecutionError(#[from] mpz_garble::ExecutionError),
- #[error(transparent)]
- DecodeError(#[from] mpz_garble::DecodeError),
- #[error(transparent)]
- PointAdditionError(#[from] point_addition::PointAdditionError),
- #[error(transparent)]
- PublicKey(#[from] p256::elliptic_curve::Error),
- #[error(transparent)]
- KeyParseError(#[from] msg::KeyParseError),
- #[error("Server Key not set")]
- NoServerKey,
- #[error("Private key not set")]
- NoPrivateKey,
- #[error("invalid state: {0}")]
- InvalidState(String),
- #[error("PMS equality check failed")]
- CheckFailed,
-}
-
-/// A trait for the 3-party key exchange protocol
-#[async_trait]
-pub trait KeyExchange {
- /// Get the server's public key
- fn server_key(&self) -> Option;
-
- /// Set the server's public key
- fn set_server_key(&mut self, server_key: PublicKey);
-
- /// Performs any necessary one-time setup, returning a reference to the PMS.
- ///
- /// The PMS will not be assigned until `compute_pms` is called.
- async fn setup(&mut self) -> Result;
-
- /// Compute the client's public key
- ///
- /// The client's public key in this context is the combined public key (EC point addition) of
- /// the leader's public key and the follower's public key.
- async fn compute_client_key(
- &mut self,
- private_key: SecretKey,
- ) -> Result, KeyExchangeError>;
-
- /// Computes the PMS
- async fn compute_pms(&mut self) -> Result;
-}
diff --git a/components/key-exchange/src/mock.rs b/components/key-exchange/src/mock.rs
deleted file mode 100644
index 1da507764f..0000000000
--- a/components/key-exchange/src/mock.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-//! This module provides mock types for key exchange leader and follower and a function to create
-//! such a pair
-
-use crate::{KeyExchangeConfig, KeyExchangeCore, KeyExchangeMessage, Role};
-
-use mpz_garble::{Decode, Execute, Memory};
-use point_addition::mock::{
- mock_point_converter_pair, MockPointAdditionReceiver, MockPointAdditionSender,
-};
-use utils_aio::duplex::MemoryDuplex;
-
-/// A mock key exchange instance
-pub type MockKeyExchange =
- KeyExchangeCore;
-
-/// Create a mock pair of key exchange leader and follower
-pub fn create_mock_key_exchange_pair(
- id: &str,
- leader_executor: E,
- follower_executor: E,
-) -> (MockKeyExchange, MockKeyExchange) {
- let (leader_pa_sender, follower_pa_recvr) = mock_point_converter_pair(&format!("{}/pa/0", id));
- let (follower_pa_sender, leader_pa_recvr) = mock_point_converter_pair(&format!("{}/pa/1", id));
-
- let (leader_channel, follower_channel) = MemoryDuplex::::new();
-
- let key_exchange_config_leader = KeyExchangeConfig::builder()
- .id(id)
- .role(Role::Leader)
- .build()
- .unwrap();
-
- let key_exchange_config_follower = KeyExchangeConfig::builder()
- .id(id)
- .role(Role::Follower)
- .build()
- .unwrap();
-
- let leader = KeyExchangeCore::new(
- Box::new(leader_channel),
- leader_pa_sender,
- leader_pa_recvr,
- leader_executor,
- key_exchange_config_leader,
- );
-
- let follower = KeyExchangeCore::new(
- Box::new(follower_channel),
- follower_pa_sender,
- follower_pa_recvr,
- follower_executor,
- key_exchange_config_follower,
- );
-
- (leader, follower)
-}
diff --git a/components/point-addition/Cargo.toml b/components/point-addition/Cargo.toml
deleted file mode 100644
index 3772569800..0000000000
--- a/components/point-addition/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "tlsn-point-addition"
-authors = ["TLSNotary Team"]
-description = "Addition of EC points using 2PC, producing additive secret-shares of the resulting x-coordinate"
-keywords = ["tls", "mpc", "2pc", "ecc", "elliptic"]
-categories = ["cryptography"]
-license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.3"
-edition = "2021"
-
-[lib]
-name = "point_addition"
-
-[features]
-default = ["mock"]
-mock = ["dep:mpz-core"]
-tracing = ["dep:tracing"]
-
-[dependencies]
-mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54", optional = true }
-mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-p256 = { version = "0.13", features = ["arithmetic"] }
-tracing = { version = "0.1", optional = true }
-async-trait = "0.1"
-thiserror = "1"
-
-[dev-dependencies]
-tokio = { version = "1.23", features = ["macros", "rt", "rt-multi-thread"] }
-rand_chacha = "0.3"
-rand = "0.8"
diff --git a/components/point-addition/src/conversion.rs b/components/point-addition/src/conversion.rs
deleted file mode 100644
index 1da5e4c4c2..0000000000
--- a/components/point-addition/src/conversion.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-//! This module implements a secure two-party computation protocol for adding two private EC points
-//! and secret-sharing the resulting x coordinate (the shares are field elements of the field
-//! underlying the elliptic curve).
-//! This protocol has semi-honest security.
-//!
-//! The protocol is described in
-
-use std::marker::PhantomData;
-
-use super::{PointAddition, PointAdditionError};
-use async_trait::async_trait;
-use mpz_share_conversion::ShareConversion;
-use mpz_share_conversion_core::fields::{p256::P256, Field};
-use p256::EncodedPoint;
-
-/// The instance used for adding the curve points
-#[derive(Debug)]
-pub struct MpcPointAddition
-where
- F: Field,
- C: ShareConversion,
-{
- /// Indicates which role this converter instance will fulfill
- role: Role,
- /// The share converter
- converter: C,
-
- _field: PhantomData,
-}
-
-/// The role: either Leader or Follower
-///
-/// Follower needs to perform an inversion operation on the point during point addition
-#[allow(missing_docs)]
-#[derive(Debug, Clone, Copy)]
-pub enum Role {
- Leader,
- Follower,
-}
-
-impl Role {
- /// Adapt the point depending on the role
- ///
- /// One party needs to adapt the coordinates. We decided that this is the follower's job.
- fn adapt_point(&self, [x, y]: [V; 2]) -> [V; 2] {
- match self {
- Role::Leader => [x, y],
- Role::Follower => [-x, -y],
- }
- }
-}
-
-impl MpcPointAddition
-where
- F: Field,
- C: ShareConversion + std::fmt::Debug,
-{
- /// Create a new [MpcPointAddition] instance
- #[cfg_attr(feature = "tracing", tracing::instrument(level = "info", ret))]
- pub fn new(role: Role, converter: C) -> Self {
- Self {
- converter,
- role,
- _field: PhantomData,
- }
- }
-
- /// Perform the conversion of P = A + B => P_x = a + b
- ///
- /// Since we are only interested in the x-coordinate of P (for the PMS) and because elliptic
- /// curve point addition is an expensive operation in 2PC, we secret-share the x-coordinate
- /// of P as a simple addition of field elements between the two parties. So we go from an EC
- /// point addition to an addition of field elements for the x-coordinate.
- #[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip(point), err)
- )]
- async fn convert(&mut self, point: [F; 2]) -> Result {
- let [x, y] = point;
- let [x_n, y_n] = self.role.adapt_point([x, y]);
-
- let a2m_output = self.converter.to_multiplicative(vec![y_n, x_n]).await?;
-
- let a = a2m_output[0];
- let b = a2m_output[1];
-
- let c = a * b.inverse();
- let c = c * c;
-
- let d = self.converter.to_additive(vec![c]).await?[0];
- let x_r = d + -x;
-
- Ok(x_r)
- }
-}
-
-#[async_trait]
-impl PointAddition for MpcPointAddition
-where
- C: ShareConversion + Send + Sync + std::fmt::Debug,
-{
- type Point = EncodedPoint;
- type XCoordinate = P256;
-
- async fn compute_x_coordinate_share(
- &mut self,
- point: Self::Point,
- ) -> Result {
- let [x, y] = point_to_p256(point)?;
- self.convert([x, y]).await
- }
-}
-
-/// Convert the external library's point type to our library's field type
-#[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "debug", skip(point), err)
-)]
-pub(crate) fn point_to_p256(point: EncodedPoint) -> Result<[P256; 2], PointAdditionError> {
- let mut x: [u8; 32] = (*point.x().ok_or(PointAdditionError::Coordinates)?).into();
- let mut y: [u8; 32] = (*point.y().ok_or(PointAdditionError::Coordinates)?).into();
-
- // reverse to little endian
- x.reverse();
- y.reverse();
-
- let x = P256::try_from(x).unwrap();
- let y = P256::try_from(y).unwrap();
-
- Ok([x, y])
-}
diff --git a/components/point-addition/src/lib.rs b/components/point-addition/src/lib.rs
deleted file mode 100644
index de7ef2ea0f..0000000000
--- a/components/point-addition/src/lib.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-//! A secure two-party computation (2PC) library for converting additive shares of an elliptic
-//! curve (EC) point into additive shares of said point's x-coordinate. The additive shares of the
-//! x-coordinate are finite field elements.
-
-#![deny(missing_docs, unreachable_pub, unused_must_use)]
-#![deny(clippy::all)]
-#![forbid(unsafe_code)]
-
-use async_trait::async_trait;
-use mpz_share_conversion::ShareConversionError;
-use mpz_share_conversion_core::fields::Field;
-
-mod conversion;
-
-/// A mock implementation of the [PointAddition] trait
-#[cfg(feature = "mock")]
-pub mod mock;
-
-pub use conversion::{MpcPointAddition, Role};
-pub use mpz_share_conversion_core::fields::p256::P256;
-
-/// The error type for [PointAddition]
-#[allow(missing_docs)]
-#[derive(Debug, thiserror::Error)]
-pub enum PointAdditionError {
- #[error(transparent)]
- ShareConversion(#[from] ShareConversionError),
- #[error("Unable to get coordinates from elliptic curve point")]
- Coordinates,
-}
-
-/// A trait for secret-sharing the sum of two elliptic curve points as a sum of field elements
-///
-/// This trait is for securely secret-sharing the addition of two elliptic curve points.
-/// Let `P + Q = O = (x, y)`. Each party receives additive shares of the x-coordinate.
-#[async_trait]
-pub trait PointAddition {
- /// The elliptic curve point type
- type Point;
- /// The x-coordinate type for the finite field underlying the EC
- type XCoordinate: Field;
-
- /// Adds two elliptic curve points in 2PC, returning respective secret shares
- /// of the resulting x-coordinate to both parties.
- async fn compute_x_coordinate_share(
- &mut self,
- point: Self::Point,
- ) -> Result;
-}
-
-#[cfg(test)]
-mod tests {
- use crate::{conversion::point_to_p256, mock::mock_point_converter_pair, PointAddition};
- use mpz_core::Block;
- use mpz_share_conversion_core::{fields::p256::P256, Field};
- use p256::{
- elliptic_curve::sec1::{FromEncodedPoint, ToEncodedPoint},
- EncodedPoint, NonZeroScalar, ProjectivePoint, PublicKey,
- };
- use rand::{Rng, SeedableRng};
- use rand_chacha::ChaCha12Rng;
-
- #[tokio::test]
- async fn test_point_conversion() {
- let mut rng = ChaCha12Rng::from_seed([0_u8; 32]);
-
- let p1: [u8; 32] = rng.gen();
- let p2: [u8; 32] = rng.gen();
-
- let p1 = curve_point_from_be_bytes(p1);
- let p2 = curve_point_from_be_bytes(p2);
-
- let p = add_curve_points(&p1, &p2);
-
- let (mut c1, mut c2) = mock_point_converter_pair("test");
-
- let c1_fut = c1.compute_x_coordinate_share(p1);
- let c2_fut = c2.compute_x_coordinate_share(p2);
-
- let (c1_output, c2_output) = tokio::join!(c1_fut, c2_fut);
- let (c1_output, c2_output) = (c1_output.unwrap(), c2_output.unwrap());
-
- assert_eq!(point_to_p256(p).unwrap()[0], c1_output + c2_output);
- }
-
- #[test]
- fn test_point_to_p256() {
- let mut rng = ChaCha12Rng::from_seed([0_u8; 32]);
-
- let p_expected: [u8; 32] = rng.gen();
- let p_expected = curve_point_from_be_bytes(p_expected);
-
- let p256: [P256; 2] = point_to_p256(p_expected).unwrap();
-
- let x: [u8; 32] = p256[0].to_be_bytes().try_into().unwrap();
- let y: [u8; 32] = p256[1].to_be_bytes().try_into().unwrap();
-
- let p = EncodedPoint::from_affine_coordinates(&x.into(), &y.into(), false);
-
- assert_eq!(p_expected, p);
- }
-
- fn curve_point_from_be_bytes(bytes: [u8; 32]) -> EncodedPoint {
- let scalar = NonZeroScalar::from_repr(bytes.into()).unwrap();
- let pk = PublicKey::from_secret_scalar(&scalar);
- pk.to_encoded_point(false)
- }
-
- fn add_curve_points(p1: &EncodedPoint, p2: &EncodedPoint) -> EncodedPoint {
- let p1 = ProjectivePoint::from_encoded_point(p1).unwrap();
- let p2 = ProjectivePoint::from_encoded_point(p2).unwrap();
- let p = p1 + p2;
- p.to_encoded_point(false)
- }
-}
diff --git a/components/point-addition/src/mock.rs b/components/point-addition/src/mock.rs
deleted file mode 100644
index 4860ce8421..0000000000
--- a/components/point-addition/src/mock.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::{MpcPointAddition, Role};
-use mpz_share_conversion::{
- mock::{mock_converter_pair, MockConverterReceiver, MockConverterSender},
- ReceiverConfig, SenderConfig,
-};
-use mpz_share_conversion_core::fields::p256::P256;
-
-/// A mock point addition sender implementing [MpcPointAddition] for [P256]
-pub type MockPointAdditionSender = MpcPointAddition>;
-
-/// A mock point addition receiver implementing [MpcPointAddition] for [P256]
-pub type MockPointAdditionReceiver = MpcPointAddition>;
-
-/// Create a pair of [MpcPointAddition] instances
-pub fn mock_point_converter_pair(id: &str) -> (MockPointAdditionSender, MockPointAdditionReceiver) {
- let (sender, receiver) = mock_converter_pair(
- SenderConfig::builder()
- .id(format!("{}/converter", id))
- .build()
- .unwrap(),
- ReceiverConfig::builder()
- .id(format!("{}/converter", id))
- .build()
- .unwrap(),
- );
- (
- MpcPointAddition::new(Role::Leader, sender),
- MpcPointAddition::new(Role::Follower, receiver),
- )
-}
diff --git a/components/prf/Cargo.toml b/components/prf/Cargo.toml
deleted file mode 100644
index f3e91fbd87..0000000000
--- a/components/prf/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[workspace]
-members = ["hmac-sha256-circuits", "hmac-sha256"]
-resolver = "2"
-
-[workspace.dependencies]
-# tlsn
-mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-
-# async
-async-trait = "0.1"
-futures = "0.3"
-tokio = "1"
-
-# error/log
-thiserror = "1"
-tracing = "0.1"
-
-# testing
-criterion = "0.5"
diff --git a/components/prf/hmac-sha256/benches/prf.rs b/components/prf/hmac-sha256/benches/prf.rs
deleted file mode 100644
index 25cafcfaa9..0000000000
--- a/components/prf/hmac-sha256/benches/prf.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use criterion::{criterion_group, criterion_main, Criterion};
-
-use hmac_sha256::{MpcPrf, Prf, PrfConfig, Role};
-use mpz_garble::{protocol::deap::mock::create_mock_deap_vm, Memory, Vm};
-
-#[allow(clippy::unit_arg)]
-fn criterion_benchmark(c: &mut Criterion) {
- let mut group = c.benchmark_group("prf");
- group.sample_size(10);
- let rt = tokio::runtime::Runtime::new().unwrap();
-
- group.bench_function("prf_setup", |b| b.to_async(&rt).iter(setup));
- group.bench_function("prf", |b| b.to_async(&rt).iter(prf));
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);
-
-async fn setup() {
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("bench").await;
-
- let mut leader = MpcPrf::new(
- PrfConfig::builder().role(Role::Leader).build().unwrap(),
- leader_vm.new_thread("prf/0").await.unwrap(),
- leader_vm.new_thread("prf/1").await.unwrap(),
- );
- let mut follower = MpcPrf::new(
- PrfConfig::builder().role(Role::Follower).build().unwrap(),
- follower_vm.new_thread("prf/0").await.unwrap(),
- follower_vm.new_thread("prf/1").await.unwrap(),
- );
-
- let leader_thread = leader_vm.new_thread("setup").await.unwrap();
- let follower_thread = follower_vm.new_thread("setup").await.unwrap();
-
- let leader_pms = leader_thread.new_public_input::<[u8; 32]>("pms").unwrap();
- let follower_pms = follower_thread.new_public_input::<[u8; 32]>("pms").unwrap();
-
- futures::try_join!(leader.setup(leader_pms), follower.setup(follower_pms)).unwrap();
-}
-
-async fn prf() {
- let (mut leader_vm, mut follower_vm) = create_mock_deap_vm("bench").await;
-
- let mut leader = MpcPrf::new(
- PrfConfig::builder().role(Role::Leader).build().unwrap(),
- leader_vm.new_thread("prf/0").await.unwrap(),
- leader_vm.new_thread("prf/1").await.unwrap(),
- );
- let mut follower = MpcPrf::new(
- PrfConfig::builder().role(Role::Follower).build().unwrap(),
- follower_vm.new_thread("prf/0").await.unwrap(),
- follower_vm.new_thread("prf/1").await.unwrap(),
- );
-
- let pms = [42u8; 32];
-
- let client_random = [0u8; 32];
- let server_random = [1u8; 32];
- let cf_hs_hash = [2u8; 32];
- let sf_hs_hash = [3u8; 32];
-
- let leader_thread = leader_vm.new_thread("setup").await.unwrap();
- let follower_thread = follower_vm.new_thread("setup").await.unwrap();
-
- let leader_pms = leader_thread.new_public_input::<[u8; 32]>("pms").unwrap();
- let follower_pms = follower_thread.new_public_input::<[u8; 32]>("pms").unwrap();
-
- leader_thread.assign(&leader_pms, pms).unwrap();
- follower_thread.assign(&follower_pms, pms).unwrap();
-
- futures::try_join!(leader.setup(leader_pms), follower.setup(follower_pms)).unwrap();
-
- let (_leader_keys, _follower_keys) = futures::try_join!(
- leader.compute_session_keys_private(client_random, server_random),
- follower.compute_session_keys_blind()
- )
- .unwrap();
-
- let _ = futures::try_join!(
- leader.compute_client_finished_vd_private(cf_hs_hash),
- follower.compute_client_finished_vd_blind()
- )
- .unwrap();
-
- let _ = futures::try_join!(
- leader.compute_server_finished_vd_private(sf_hs_hash),
- follower.compute_server_finished_vd_blind()
- )
- .unwrap();
-
- futures::try_join!(leader_vm.finalize(), follower_vm.finalize()).unwrap();
-}
diff --git a/components/prf/hmac-sha256/src/error.rs b/components/prf/hmac-sha256/src/error.rs
deleted file mode 100644
index 356f82b001..0000000000
--- a/components/prf/hmac-sha256/src/error.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::error::Error;
-
-use crate::prf::state::StateError;
-
-/// Errors that can occur during PRF computation.
-#[derive(Debug, thiserror::Error)]
-#[allow(missing_docs)]
-pub enum PrfError {
- #[error("MPC backend error: {0:?}")]
- Mpc(Box),
- #[error("role error: {0:?}")]
- RoleError(String),
- #[error("Invalid state: {0}")]
- InvalidState(String),
-}
-
-impl From for PrfError {
- fn from(err: StateError) -> Self {
- PrfError::InvalidState(err.to_string())
- }
-}
-
-impl From for PrfError {
- fn from(err: mpz_garble::MemoryError) -> Self {
- PrfError::Mpc(Box::new(err))
- }
-}
-
-impl From for PrfError {
- fn from(err: mpz_garble::LoadError) -> Self {
- PrfError::Mpc(Box::new(err))
- }
-}
-
-impl From for PrfError {
- fn from(err: mpz_garble::ExecutionError) -> Self {
- PrfError::Mpc(Box::new(err))
- }
-}
-
-impl From for PrfError {
- fn from(err: mpz_garble::DecodeError) -> Self {
- PrfError::Mpc(Box::new(err))
- }
-}
diff --git a/components/prf/hmac-sha256/src/prf.rs b/components/prf/hmac-sha256/src/prf.rs
deleted file mode 100644
index d501dc19c4..0000000000
--- a/components/prf/hmac-sha256/src/prf.rs
+++ /dev/null
@@ -1,475 +0,0 @@
-use std::{
- fmt::Debug,
- sync::{Arc, OnceLock},
-};
-
-use async_trait::async_trait;
-
-use hmac_sha256_circuits::{build_session_keys, build_verify_data};
-use mpz_circuits::Circuit;
-use mpz_garble::{
- config::Visibility, value::ValueRef, Decode, DecodePrivate, Execute, Load, Memory,
-};
-use utils_aio::non_blocking_backend::{Backend, NonBlockingBackend};
-
-use crate::{Prf, PrfConfig, PrfError, Role, SessionKeys, CF_LABEL, SF_LABEL};
-
-#[cfg(feature = "tracing")]
-use tracing::instrument;
-
-/// Circuit for computing TLS session keys.
-static SESSION_KEYS_CIRC: OnceLock> = OnceLock::new();
-/// Circuit for computing TLS client verify data.
-static CLIENT_VD_CIRC: OnceLock> = OnceLock::new();
-/// Circuit for computing TLS server verify data.
-static SERVER_VD_CIRC: OnceLock> = OnceLock::new();
-
-enum Msg {
- Cf,
- Sf,
-}
-
-#[derive(Debug)]
-pub(crate) struct Randoms {
- pub(crate) client_random: ValueRef,
- pub(crate) server_random: ValueRef,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct HashState {
- pub(crate) ms_outer_hash_state: ValueRef,
- pub(crate) ms_inner_hash_state: ValueRef,
-}
-
-#[derive(Debug)]
-pub(crate) struct VerifyData {
- pub(crate) handshake_hash: ValueRef,
- pub(crate) vd: ValueRef,
-}
-
-/// MPC PRF for computing TLS HMAC-SHA256 PRF.
-pub struct MpcPrf {
- config: PrfConfig,
- state: state::State,
- thread_0: E,
- thread_1: E,
-}
-
-impl Debug for MpcPrf {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- f.debug_struct("MpcPrf")
- .field("config", &self.config)
- .field("state", &self.state)
- .finish()
- }
-}
-
-impl MpcPrf
-where
- E: Load + Memory + Execute + DecodePrivate + Send,
-{
- /// Creates a new instance of the PRF.
- pub fn new(config: PrfConfig, thread_0: E, thread_1: E) -> MpcPrf {
- MpcPrf {
- config,
- state: state::State::Initialized,
- thread_0,
- thread_1,
- }
- }
-
- /// Executes a circuit which computes TLS session keys.
- async fn execute_session_keys(
- &mut self,
- randoms: Option<([u8; 32], [u8; 32])>,
- ) -> Result {
- let state::SessionKeys {
- pms,
- randoms: randoms_refs,
- hash_state,
- keys,
- cf_vd,
- sf_vd,
- } = std::mem::replace(&mut self.state, state::State::Error).try_into_session_keys()?;
-
- let circ = SESSION_KEYS_CIRC
- .get()
- .expect("session keys circuit is set");
-
- if let Some((client_random, server_random)) = randoms {
- self.thread_0
- .assign(&randoms_refs.client_random, client_random)?;
- self.thread_0
- .assign(&randoms_refs.server_random, server_random)?;
- }
-
- self.thread_0
- .execute(
- circ.clone(),
- &[pms, randoms_refs.client_random, randoms_refs.server_random],
- &[
- keys.client_write_key.clone(),
- keys.server_write_key.clone(),
- keys.client_iv.clone(),
- keys.server_iv.clone(),
- hash_state.ms_outer_hash_state.clone(),
- hash_state.ms_inner_hash_state.clone(),
- ],
- )
- .await?;
-
- self.state = state::State::ClientFinished(state::ClientFinished {
- hash_state,
- cf_vd,
- sf_vd,
- });
-
- Ok(keys)
- }
-
- async fn execute_cf_vd(
- &mut self,
- handshake_hash: Option<[u8; 32]>,
- ) -> Result, PrfError> {
- let state::ClientFinished {
- hash_state,
- cf_vd,
- sf_vd,
- } = std::mem::replace(&mut self.state, state::State::Error).try_into_client_finished()?;
-
- let circ = CLIENT_VD_CIRC.get().expect("client vd circuit is set");
-
- if let Some(handshake_hash) = handshake_hash {
- self.thread_0
- .assign(&cf_vd.handshake_hash, handshake_hash)?;
- }
-
- self.thread_0
- .execute(
- circ.clone(),
- &[
- hash_state.ms_outer_hash_state.clone(),
- hash_state.ms_inner_hash_state.clone(),
- cf_vd.handshake_hash,
- ],
- &[cf_vd.vd.clone()],
- )
- .await?;
-
- let vd = if handshake_hash.is_some() {
- let mut outputs = self.thread_0.decode_private(&[cf_vd.vd]).await?;
- let vd: [u8; 12] = outputs.remove(0).try_into().expect("vd is 12 bytes");
-
- Some(vd)
- } else {
- self.thread_0.decode_blind(&[cf_vd.vd]).await?;
-
- None
- };
-
- self.state = state::State::ServerFinished(state::ServerFinished { hash_state, sf_vd });
-
- Ok(vd)
- }
-
- async fn execute_sf_vd(
- &mut self,
- handshake_hash: Option<[u8; 32]>,
- ) -> Result, PrfError> {
- let state::ServerFinished { hash_state, sf_vd } =
- std::mem::replace(&mut self.state, state::State::Error).try_into_server_finished()?;
-
- let circ = SERVER_VD_CIRC.get().expect("server vd circuit is set");
-
- if let Some(handshake_hash) = handshake_hash {
- self.thread_1
- .assign(&sf_vd.handshake_hash, handshake_hash)?;
- }
-
- self.thread_1
- .execute(
- circ.clone(),
- &[
- hash_state.ms_outer_hash_state,
- hash_state.ms_inner_hash_state,
- sf_vd.handshake_hash,
- ],
- &[sf_vd.vd.clone()],
- )
- .await?;
-
- let vd = if handshake_hash.is_some() {
- let mut outputs = self.thread_1.decode_private(&[sf_vd.vd]).await?;
- let vd: [u8; 12] = outputs.remove(0).try_into().expect("vd is 12 bytes");
-
- Some(vd)
- } else {
- self.thread_1.decode_blind(&[sf_vd.vd]).await?;
-
- None
- };
-
- self.state = state::State::Complete;
-
- Ok(vd)
- }
-}
-
-#[async_trait]
-impl Prf for MpcPrf
-where
- E: Memory + Load + Execute + Decode + DecodePrivate + Send,
-{
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn setup(&mut self, pms: ValueRef) -> Result<(), PrfError> {
- std::mem::replace(&mut self.state, state::State::Error).try_into_initialized()?;
-
- let visibility = match self.config.role {
- Role::Leader => Visibility::Private,
- Role::Follower => Visibility::Blind,
- };
-
- // Perform pre-computation for all circuits.
- let (randoms, hash_state, keys) =
- setup_session_keys(&mut self.thread_0, pms.clone(), visibility).await?;
-
- let (cf_vd, sf_vd) = futures::try_join!(
- setup_finished_msg(&mut self.thread_0, Msg::Cf, hash_state.clone(), visibility),
- setup_finished_msg(&mut self.thread_1, Msg::Sf, hash_state.clone(), visibility),
- )?;
-
- self.state = state::State::SessionKeys(state::SessionKeys {
- pms,
- randoms,
- hash_state,
- keys,
- cf_vd,
- sf_vd,
- });
-
- Ok(())
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn compute_session_keys_private(
- &mut self,
- client_random: [u8; 32],
- server_random: [u8; 32],
- ) -> Result {
- if self.config.role != Role::Leader {
- return Err(PrfError::RoleError(
- "only leader can provide inputs".to_string(),
- ));
- }
-
- self.execute_session_keys(Some((client_random, server_random)))
- .await
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn compute_client_finished_vd_private(
- &mut self,
- handshake_hash: [u8; 32],
- ) -> Result<[u8; 12], PrfError> {
- if self.config.role != Role::Leader {
- return Err(PrfError::RoleError(
- "only leader can provide inputs".to_string(),
- ));
- }
-
- self.execute_cf_vd(Some(handshake_hash))
- .await
- .map(|hash| hash.expect("vd is decoded"))
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn compute_server_finished_vd_private(
- &mut self,
- handshake_hash: [u8; 32],
- ) -> Result<[u8; 12], PrfError> {
- if self.config.role != Role::Leader {
- return Err(PrfError::RoleError(
- "only leader can provide inputs".to_string(),
- ));
- }
-
- self.execute_sf_vd(Some(handshake_hash))
- .await
- .map(|hash| hash.expect("vd is decoded"))
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn compute_session_keys_blind(&mut self) -> Result {
- if self.config.role != Role::Follower {
- return Err(PrfError::RoleError(
- "leader must provide inputs".to_string(),
- ));
- }
-
- self.execute_session_keys(None).await
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip_all, err))]
- async fn compute_client_finished_vd_blind(&mut self) -> Result<(), PrfError> {
- if self.config.role != Role::Follower {
- return Err(PrfError::RoleError(
- "leader must provide inputs".to_string(),
- ));
- }
-
- self.execute_cf_vd(None).await.map(|_| ())
- }
-
- #[cfg_attr(feature = "tracing", instrument(level = "debug", skip(self), err))]
- async fn compute_server_finished_vd_blind(&mut self) -> Result<(), PrfError> {
- if self.config.role != Role::Follower {
- return Err(PrfError::RoleError(
- "leader must provide inputs".to_string(),
- ));
- }
-
- self.execute_sf_vd(None).await.map(|_| ())
- }
-}
-
-pub(crate) mod state {
- use super::*;
- use enum_try_as_inner::EnumTryAsInner;
-
- #[derive(Debug, EnumTryAsInner)]
- #[derive_err(Debug)]
- pub(crate) enum State {
- Initialized,
- SessionKeys(SessionKeys),
- ClientFinished(ClientFinished),
- ServerFinished(ServerFinished),
- Complete,
- Error,
- }
-
- #[derive(Debug)]
- pub(crate) struct SessionKeys {
- pub(crate) pms: ValueRef,
- pub(crate) randoms: Randoms,
- pub(crate) hash_state: HashState,
- pub(crate) keys: crate::SessionKeys,
- pub(crate) cf_vd: VerifyData,
- pub(crate) sf_vd: VerifyData,
- }
-
- #[derive(Debug)]
- pub(crate) struct ClientFinished {
- pub(crate) hash_state: HashState,
- pub(crate) cf_vd: VerifyData,
- pub(crate) sf_vd: VerifyData,
- }
-
- #[derive(Debug)]
- pub(crate) struct ServerFinished {
- pub(crate) hash_state: HashState,
- pub(crate) sf_vd: VerifyData,
- }
-}
-
-async fn setup_session_keys(
- thread: &mut T,
- pms: ValueRef,
- visibility: Visibility,
-) -> Result<(Randoms, HashState, SessionKeys), PrfError> {
- let client_random = thread.new_input::<[u8; 32]>("client_finished", visibility)?;
- let server_random = thread.new_input::<[u8; 32]>("server_finished", visibility)?;
-
- let client_write_key = thread.new_output::<[u8; 16]>("client_write_key")?;
- let server_write_key = thread.new_output::<[u8; 16]>("server_write_key")?;
- let client_iv = thread.new_output::<[u8; 4]>("client_write_iv")?;
- let server_iv = thread.new_output::<[u8; 4]>("server_write_iv")?;
-
- let ms_outer_hash_state = thread.new_output::<[u32; 8]>("ms_outer_hash_state")?;
- let ms_inner_hash_state = thread.new_output::<[u32; 8]>("ms_inner_hash_state")?;
-
- if SESSION_KEYS_CIRC.get().is_none() {
- _ = SESSION_KEYS_CIRC.set(Backend::spawn(build_session_keys).await);
- }
-
- let circ = SESSION_KEYS_CIRC
- .get()
- .expect("session keys circuit is set");
-
- thread
- .load(
- circ.clone(),
- &[pms, client_random.clone(), server_random.clone()],
- &[
- client_write_key.clone(),
- server_write_key.clone(),
- client_iv.clone(),
- server_iv.clone(),
- ms_outer_hash_state.clone(),
- ms_inner_hash_state.clone(),
- ],
- )
- .await?;
-
- Ok((
- Randoms {
- client_random,
- server_random,
- },
- HashState {
- ms_outer_hash_state,
- ms_inner_hash_state,
- },
- SessionKeys {
- client_write_key,
- server_write_key,
- client_iv,
- server_iv,
- },
- ))
-}
-
-async fn setup_finished_msg(
- thread: &mut T,
- msg: Msg,
- hash_state: HashState,
- visibility: Visibility,
-) -> Result {
- let name = match msg {
- Msg::Cf => String::from("client_finished"),
- Msg::Sf => String::from("server_finished"),
- };
-
- let handshake_hash =
- thread.new_input::<[u8; 32]>(&format!("{name}/handshake_hash"), visibility)?;
- let vd = thread.new_output::<[u8; 12]>(&format!("{name}/vd"))?;
-
- let circ = match msg {
- Msg::Cf => &CLIENT_VD_CIRC,
- Msg::Sf => &SERVER_VD_CIRC,
- };
-
- let label = match msg {
- Msg::Cf => CF_LABEL,
- Msg::Sf => SF_LABEL,
- };
-
- if circ.get().is_none() {
- _ = circ.set(Backend::spawn(move || build_verify_data(label)).await);
- }
-
- let circ = circ.get().expect("session keys circuit is set");
-
- thread
- .load(
- circ.clone(),
- &[
- hash_state.ms_outer_hash_state,
- hash_state.ms_inner_hash_state,
- handshake_hash.clone(),
- ],
- &[vd.clone()],
- )
- .await?;
-
- Ok(VerifyData { handshake_hash, vd })
-}
diff --git a/components/tls/Cargo.toml b/components/tls/Cargo.toml
deleted file mode 100644
index 4632770094..0000000000
--- a/components/tls/Cargo.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-[workspace]
-members = [
- "tls-client",
- "tls-backend",
- "tls-core",
- "tls-mpc",
- "tls-client-async",
- "tls-server-fixture",
-]
-resolver = "2"
-
-[workspace.dependencies]
-# rand
-rand = "0.8"
-rand_chacha = "0.3"
-
-# crypto
-aes = "0.8"
-aes-gcm = "0.9"
-sha2 = "0.10"
-hmac = "0.12"
-sct = "0.7"
-digest = "0.10"
-webpki = "0.22"
-webpki-roots = "0.26"
-ring = "0.17"
-p256 = "0.13"
-rustls-pemfile = "1"
-rustls = "0.20"
-async-rustls = "0.4"
-
-# async
-async-trait = "0.1"
-futures = "0.3"
-tokio = "1"
-tokio-util = "0.7"
-hyper = "0.14"
-
-# serialization
-bytes = "1"
-serde = "1"
-
-# error/log
-tracing = "0.1"
-tracing-subscriber = "0.3"
-thiserror = "1"
-log = "0.4"
-env_logger = "0.10"
-
-# testing
-rstest = "0.12"
-
-# misc
-derive_builder = "0.12"
-enum-try-as-inner = "0.1"
-web-time = "0.2"
diff --git a/components/tls/tls-client/build.rs b/components/tls/tls-client/build.rs
deleted file mode 100644
index 9c73252a65..0000000000
--- a/components/tls/tls-client/build.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-/// This build script allows us to enable the `read_buf` language feature only
-/// for Rust Nightly.
-///
-/// See the comment in lib.rs to understand why we need this.
-
-#[cfg_attr(feature = "read_buf", rustversion::not(nightly))]
-fn main() {}
-
-#[cfg(feature = "read_buf")]
-#[rustversion::nightly]
-fn main() {
- println!("cargo:rustc-cfg=read_buf");
-}
diff --git a/components/tls/tls-client/tests/client_cert_verifier.rs b/components/tls/tls-client/tests/client_cert_verifier.rs
deleted file mode 100644
index 3f5d19c03f..0000000000
--- a/components/tls/tls-client/tests/client_cert_verifier.rs
+++ /dev/null
@@ -1,292 +0,0 @@
-//! Tests for configuring and using a [`ClientCertVerifier`] for a server.
-
-#![cfg(feature = "dangerous_configuration")]
-
-mod common;
-
-use crate::common::{
- dns_name, do_handshake_until_both_error, do_handshake_until_error, get_client_root_store,
- make_client_config_with_versions, make_client_config_with_versions_with_auth,
- make_pair_for_arc_configs, ErrorFromPeer, KeyType, ALL_KEY_TYPES,
-};
-use rustls::{
- client::WebPkiVerifier,
- internal::msgs::enums::{AlertDescription, ContentType},
- server::{ClientCertVerified, ClientCertVerifier},
- Certificate, ClientConnection, DistinguishedNames, Error, ServerConfig, ServerConnection,
- SignatureScheme,
-};
-use std::sync::Arc;
-
-// Client is authorized!
-fn ver_ok() -> Result {
- Ok(rustls::server::ClientCertVerified::assertion())
-}
-
-// Use when we shouldn't even attempt verification
-fn ver_unreachable() -> Result {
- unreachable!()
-}
-
-// Verifier that returns an error that we can expect
-fn ver_err() -> Result {
- Err(Error::General("test err".to_string()))
-}
-
-fn server_config_with_verifier(
- kt: KeyType,
- client_cert_verifier: MockClientVerifier,
-) -> ServerConfig {
- ServerConfig::builder()
- .with_safe_defaults()
- .with_client_cert_verifier(Arc::new(client_cert_verifier))
- .with_single_cert(kt.get_chain(), kt.get_key())
- .unwrap()
-}
-
-#[test]
-// Happy path, we resolve to a root, it is verified OK, should be able to connect
-fn client_verifier_works() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_ok,
- subjects: Some(get_client_root_store(*kt).subjects()),
- mandatory: Some(true),
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions_with_auth(*kt, &[version]);
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config.clone()), &server_config);
- let err = do_handshake_until_error(&mut client, &mut server);
- assert_eq!(err, Ok(()));
- }
- }
-}
-
-// Server offers no verification schemes
-#[test]
-fn client_verifier_no_schemes() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_ok,
- subjects: Some(get_client_root_store(*kt).subjects()),
- mandatory: Some(true),
- offered_schemes: Some(vec![]),
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions_with_auth(*kt, &[version]);
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config.clone()), &server_config);
- let err = do_handshake_until_error(&mut client, &mut server);
- assert_eq!(
- err,
- Err(ErrorFromPeer::Client(Error::CorruptMessagePayload(
- ContentType::Handshake
- )))
- );
- }
- }
-}
-
-// Common case, we do not find a root store to resolve to
-#[test]
-fn client_verifier_no_root() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_ok,
- subjects: None,
- mandatory: Some(true),
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions_with_auth(*kt, &[version]);
- let mut server = ServerConnection::new(Arc::clone(&server_config)).unwrap();
- let mut client =
- ClientConnection::new(Arc::new(client_config), dns_name("notlocalhost")).unwrap();
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Server(Error::General(
- "client rejected by client_auth_root_subjects".into()
- )),
- ErrorFromPeer::Client(Error::AlertReceived(AlertDescription::AccessDenied))
- ])
- );
- }
- }
-}
-
-// If we cannot resolve a root, we cannot decide if auth is mandatory
-#[test]
-fn client_verifier_no_auth_no_root() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_unreachable,
- subjects: None,
- mandatory: Some(true),
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions(*kt, &[version]);
- let mut server = ServerConnection::new(Arc::clone(&server_config)).unwrap();
- let mut client =
- ClientConnection::new(Arc::new(client_config), dns_name("notlocalhost")).unwrap();
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Server(Error::General(
- "client rejected by client_auth_root_subjects".into()
- )),
- ErrorFromPeer::Client(Error::AlertReceived(AlertDescription::AccessDenied))
- ])
- );
- }
- }
-}
-
-// If we do have a root, we must do auth
-#[test]
-fn client_verifier_no_auth_yes_root() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_unreachable,
- subjects: Some(get_client_root_store(*kt).subjects()),
- mandatory: Some(true),
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions(*kt, &[version]);
- let mut server = ServerConnection::new(Arc::clone(&server_config)).unwrap();
- let mut client =
- ClientConnection::new(Arc::new(client_config), dns_name("localhost")).unwrap();
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Server(Error::NoCertificatesPresented),
- ErrorFromPeer::Client(Error::AlertReceived(
- AlertDescription::CertificateRequired
- ))
- ])
- );
- }
- }
-}
-
-#[test]
-// Triple checks we propagate the rustls::Error through
-fn client_verifier_fails_properly() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_err,
- subjects: Some(get_client_root_store(*kt).subjects()),
- mandatory: Some(true),
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions_with_auth(*kt, &[version]);
- let mut server = ServerConnection::new(Arc::clone(&server_config)).unwrap();
- let mut client =
- ClientConnection::new(Arc::new(client_config), dns_name("localhost")).unwrap();
- let err = do_handshake_until_error(&mut client, &mut server);
- assert_eq!(
- err,
- Err(ErrorFromPeer::Server(Error::General("test err".into())))
- );
- }
- }
-}
-
-#[test]
-// If a verifier returns a None on Mandatory-ness, then we error out
-fn client_verifier_must_determine_client_auth_requirement_to_continue() {
- for kt in ALL_KEY_TYPES.iter() {
- let client_verifier = MockClientVerifier {
- verified: ver_ok,
- subjects: Some(get_client_root_store(*kt).subjects()),
- mandatory: None,
- offered_schemes: None,
- };
-
- let server_config = server_config_with_verifier(*kt, client_verifier);
- let server_config = Arc::new(server_config);
-
- for version in rustls::ALL_VERSIONS {
- let client_config = make_client_config_with_versions_with_auth(*kt, &[version]);
- let mut server = ServerConnection::new(Arc::clone(&server_config)).unwrap();
- let mut client =
- ClientConnection::new(Arc::new(client_config), dns_name("localhost")).unwrap();
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Server(Error::General(
- "client rejected by client_auth_mandatory".into()
- )),
- ErrorFromPeer::Client(Error::AlertReceived(AlertDescription::AccessDenied))
- ])
- );
- }
- }
-}
-
-pub struct MockClientVerifier {
- pub verified: fn() -> Result,
- pub subjects: Option,
- pub mandatory: Option,
- pub offered_schemes: Option>,
-}
-
-impl ClientCertVerifier for MockClientVerifier {
- fn client_auth_mandatory(&self) -> Option {
- self.mandatory
- }
-
- fn client_auth_root_subjects(&self) -> Option {
- self.subjects.as_ref().cloned()
- }
-
- fn verify_client_cert(
- &self,
- _end_entity: &Certificate,
- _intermediates: &[Certificate],
- _now: web_time::SystemTime,
- ) -> Result {
- (self.verified)()
- }
-
- fn supported_verify_schemes(&self) -> Vec {
- if let Some(schemes) = &self.offered_schemes {
- schemes.clone()
- } else {
- WebPkiVerifier::verification_schemes()
- }
- }
-}
diff --git a/components/tls/tls-client/tests/key_log_file_env.rs b/components/tls/tls-client/tests/key_log_file_env.rs
deleted file mode 100644
index 84f253270b..0000000000
--- a/components/tls/tls-client/tests/key_log_file_env.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-//! Tests of [`tls_client::KeyLogFile`] that require us to set environment variables.
-//!
-//! vvvv
-//! Every test you add to this file MUST execute through `serialized()`.
-//! ^^^^
-//!
-//! See https://github.com/rust-lang/rust/issues/90308; despite not being marked
-//! `unsafe`, `env::var::set_var` is an unsafe function. These tests are separated
-//! from the rest of the tests so that their use of `set_ver` is less likely to
-//! affect them; as of the time these tests were moved to this file, Cargo will
-//! compile each test suite file to a separate executable, so these will be run
-//! in a completely separate process. This way, executing every test through
-//! `serialized()` will cause them to be run one at a time.
-//!
-//! Note: If/when we add new constructors to `KeyLogFile` to allow constructing
-//! one from a path directly (without using an environment variable), then those
-//! tests SHOULD NOT go in this file.
-//!
-//! XXX: These tests don't actually test the functionality; they just ensure
-//! the code coverage doesn't complain it isn't covered. TODO: Verify that the
-//! file was created successfully, with the right permissions, etc., and that it
-//! contains something like what we expect.
-
-#![allow(dead_code, unused_imports)]
-
-mod common;
-
-use crate::common::{
- do_handshake, make_client_config_with_versions, make_pair_for_arc_configs, make_server_config,
- receive, send, KeyType,
-};
-use std::{
- env,
- io::Write,
- sync::{Arc, Mutex, Once},
-};
-
-/// Approximates `#[serial]` from the `serial_test` crate.
-///
-/// No attempt is made to recover from a poisoned mutex, which will
-/// happen when `f` panics. In other words, all the tests that use
-/// `serialized` will start failing after one test panics.
-fn serialized(f: impl FnOnce()) {
- // Ensure every test is run serialized
- // TODO: Use `std::sync::Lazy` once that is stable.
- static mut MUTEX: Option> = None;
- static ONCE: Once = Once::new();
- ONCE.call_once(|| unsafe {
- MUTEX = Some(Mutex::new(()));
- });
- let mutex = unsafe { MUTEX.as_mut() };
-
- let _guard = mutex.unwrap().lock().unwrap();
-
- // XXX: NOT thread safe.
- env::set_var("SSLKEYLOGFILE", "./sslkeylogfile.txt");
-
- f()
-}
-
-// #[test]
-// fn exercise_key_log_file_for_client() {
-// serialized(|| {
-// let server_config = Arc::new(make_server_config(KeyType::Rsa));
-// env::set_var("SSLKEYLOGFILE", "./sslkeylogfile.txt");
-
-// for version in tls_client::ALL_VERSIONS {
-// let mut client_config = make_client_config_with_versions(KeyType::Rsa, &[version]);
-// client_config.key_log = Arc::new(tls_client::KeyLogFile::new());
-
-// let (mut client, mut server) =
-// make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
-
-// assert_eq!(5, client.writer().write(b"hello").unwrap());
-
-// do_handshake(&mut client, &mut server);
-// send(&mut client, &mut server);
-// server.process_new_packets().unwrap();
-// }
-// })
-// }
-
-// #[test]
-// fn exercise_key_log_file_for_server() {
-// serialized(|| {
-// let mut server_config = make_server_config(KeyType::Rsa);
-
-// env::set_var("SSLKEYLOGFILE", "./sslkeylogfile.txt");
-// server_config.key_log = Arc::new(rustls::KeyLogFile::new());
-
-// let server_config = Arc::new(server_config);
-
-// for version in tls_client::ALL_VERSIONS {
-// let client_config = make_client_config_with_versions(KeyType::Rsa, &[version]);
-// let (mut client, mut server) =
-// make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
-
-// assert_eq!(5, client.writer().write(b"hello").unwrap());
-
-// do_handshake(&mut client, &mut server);
-// send(&mut client, &mut server);
-// server.process_new_packets().unwrap();
-// }
-// })
-// }
diff --git a/components/tls/tls-client/tests/server_cert_verifier.rs b/components/tls/tls-client/tests/server_cert_verifier.rs
deleted file mode 100644
index 829c0ade0a..0000000000
--- a/components/tls/tls-client/tests/server_cert_verifier.rs
+++ /dev/null
@@ -1,266 +0,0 @@
-//! Tests for configuring and using a [`ServerCertVerifier`] for a client.
-
-#![cfg(feature = "dangerous_configuration")]
-
-mod common;
-use crate::common::{
- do_handshake, do_handshake_until_both_error, make_client_config_with_versions,
- make_pair_for_arc_configs, make_server_config, ErrorFromPeer, ALL_KEY_TYPES,
-};
-use rustls::{
- client::{HandshakeSignatureValid, ServerCertVerified, ServerCertVerifier, WebPkiVerifier},
- internal::msgs::{enums::AlertDescription, handshake::DigitallySignedStruct},
- Certificate, Error, SignatureScheme,
-};
-use std::sync::Arc;
-
-#[test]
-fn client_can_override_certificate_verification() {
- for kt in ALL_KEY_TYPES.iter() {
- let verifier = Arc::new(MockServerVerifier::accepts_anything());
-
- let server_config = Arc::new(make_server_config(*kt));
-
- for version in rustls::ALL_VERSIONS {
- let mut client_config = make_client_config_with_versions(*kt, &[version]);
- client_config
- .dangerous()
- .set_certificate_verifier(verifier.clone());
-
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
- do_handshake(&mut client, &mut server);
- }
- }
-}
-
-#[test]
-fn client_can_override_certificate_verification_and_reject_certificate() {
- for kt in ALL_KEY_TYPES.iter() {
- let verifier = Arc::new(MockServerVerifier::rejects_certificate(
- Error::CorruptMessage,
- ));
-
- let server_config = Arc::new(make_server_config(*kt));
-
- for version in rustls::ALL_VERSIONS {
- let mut client_config = make_client_config_with_versions(*kt, &[version]);
- client_config
- .dangerous()
- .set_certificate_verifier(verifier.clone());
-
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Client(Error::CorruptMessage),
- ErrorFromPeer::Server(Error::AlertReceived(AlertDescription::BadCertificate))
- ])
- );
- }
- }
-}
-
-#[test]
-fn client_can_override_certificate_verification_and_reject_tls12_signatures() {
- for kt in ALL_KEY_TYPES.iter() {
- let mut client_config = make_client_config_with_versions(*kt, &[&rustls::version::TLS12]);
- let verifier = Arc::new(MockServerVerifier::rejects_tls12_signatures(
- Error::CorruptMessage,
- ));
-
- client_config.dangerous().set_certificate_verifier(verifier);
-
- let server_config = Arc::new(make_server_config(*kt));
-
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Client(Error::CorruptMessage),
- ErrorFromPeer::Server(Error::AlertReceived(AlertDescription::BadCertificate))
- ])
- );
- }
-}
-
-#[test]
-fn client_can_override_certificate_verification_and_reject_tls13_signatures() {
- for kt in ALL_KEY_TYPES.iter() {
- let mut client_config = make_client_config_with_versions(*kt, &[&rustls::version::TLS13]);
- let verifier = Arc::new(MockServerVerifier::rejects_tls13_signatures(
- Error::CorruptMessage,
- ));
-
- client_config.dangerous().set_certificate_verifier(verifier);
-
- let server_config = Arc::new(make_server_config(*kt));
-
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Client(Error::CorruptMessage),
- ErrorFromPeer::Server(Error::AlertReceived(AlertDescription::BadCertificate))
- ])
- );
- }
-}
-
-#[test]
-fn client_can_override_certificate_verification_and_offer_no_signature_schemes() {
- for kt in ALL_KEY_TYPES.iter() {
- let verifier = Arc::new(MockServerVerifier::offers_no_signature_schemes());
-
- let server_config = Arc::new(make_server_config(*kt));
-
- for version in rustls::ALL_VERSIONS {
- let mut client_config = make_client_config_with_versions(*kt, &[version]);
- client_config
- .dangerous()
- .set_certificate_verifier(verifier.clone());
-
- let (mut client, mut server) =
- make_pair_for_arc_configs(&Arc::new(client_config), &server_config);
- let errs = do_handshake_until_both_error(&mut client, &mut server);
- assert_eq!(
- errs,
- Err(vec![
- ErrorFromPeer::Server(Error::PeerIncompatibleError(
- "no overlapping sigschemes".into()
- )),
- ErrorFromPeer::Client(Error::AlertReceived(AlertDescription::HandshakeFailure)),
- ])
- );
- }
- }
-}
-
-pub struct MockServerVerifier {
- cert_rejection_error: Option,
- tls12_signature_error: Option,
- tls13_signature_error: Option,
- wants_scts: bool,
- signature_schemes: Vec,
-}
-
-impl ServerCertVerifier for MockServerVerifier {
- fn verify_server_cert(
- &self,
- end_entity: &rustls::Certificate,
- intermediates: &[rustls::Certificate],
- server_name: &rustls::ServerName,
- scts: &mut dyn Iterator- ,
- oscp_response: &[u8],
- now: web_time::SystemTime,
- ) -> Result {
- let scts: Vec> = scts.map(|x| x.to_owned()).collect();
- println!(
- "verify_server_cert({:?}, {:?}, {:?}, {:?}, {:?}, {:?})",
- end_entity, intermediates, server_name, scts, oscp_response, now
- );
- if let Some(error) = &self.cert_rejection_error {
- Err(error.clone())
- } else {
- Ok(ServerCertVerified::assertion())
- }
- }
-
- fn verify_tls12_signature(
- &self,
- message: &[u8],
- cert: &Certificate,
- dss: &DigitallySignedStruct,
- ) -> Result {
- println!(
- "verify_tls12_signature({:?}, {:?}, {:?})",
- message, cert, dss
- );
- if let Some(error) = &self.tls12_signature_error {
- Err(error.clone())
- } else {
- Ok(HandshakeSignatureValid::assertion())
- }
- }
-
- fn verify_tls13_signature(
- &self,
- message: &[u8],
- cert: &Certificate,
- dss: &DigitallySignedStruct,
- ) -> Result {
- println!(
- "verify_tls13_signature({:?}, {:?}, {:?})",
- message, cert, dss
- );
- if let Some(error) = &self.tls13_signature_error {
- Err(error.clone())
- } else {
- Ok(HandshakeSignatureValid::assertion())
- }
- }
-
- fn supported_verify_schemes(&self) -> Vec {
- self.signature_schemes.clone()
- }
-
- fn request_scts(&self) -> bool {
- println!("request_scts? {:?}", self.wants_scts);
- self.wants_scts
- }
-}
-
-impl MockServerVerifier {
- pub fn accepts_anything() -> Self {
- MockServerVerifier {
- cert_rejection_error: None,
- ..Default::default()
- }
- }
-
- pub fn rejects_certificate(err: Error) -> Self {
- MockServerVerifier {
- cert_rejection_error: Some(err),
- ..Default::default()
- }
- }
-
- pub fn rejects_tls12_signatures(err: Error) -> Self {
- MockServerVerifier {
- tls12_signature_error: Some(err),
- ..Default::default()
- }
- }
-
- pub fn rejects_tls13_signatures(err: Error) -> Self {
- MockServerVerifier {
- tls13_signature_error: Some(err),
- ..Default::default()
- }
- }
-
- pub fn offers_no_signature_schemes() -> Self {
- MockServerVerifier {
- signature_schemes: vec![],
- ..Default::default()
- }
- }
-}
-
-impl Default for MockServerVerifier {
- fn default() -> Self {
- MockServerVerifier {
- cert_rejection_error: None,
- tls12_signature_error: None,
- tls13_signature_error: None,
- wants_scts: false,
- signature_schemes: WebPkiVerifier::verification_schemes(),
- }
- }
-}
diff --git a/components/tls/tls-mpc/Cargo.toml b/components/tls/tls-mpc/Cargo.toml
deleted file mode 100644
index f1233773b1..0000000000
--- a/components/tls/tls-mpc/Cargo.toml
+++ /dev/null
@@ -1,68 +0,0 @@
-[package]
-name = "tlsn-tls-mpc"
-authors = ["TLSNotary Team"]
-description = "Implementation of the backend trait for 2PC"
-keywords = ["tls", "mpc", "2pc"]
-categories = ["cryptography"]
-license = "MIT OR Apache-2.0"
-version = "0.1.0-alpha.3"
-edition = "2021"
-
-[lib]
-name = "tls_mpc"
-
-[features]
-default = ["tracing"]
-tracing = [
- "dep:tracing",
- "tlsn-block-cipher/tracing",
- "tlsn-stream-cipher/tracing",
- "tlsn-universal-hash/tracing",
- "tlsn-aead/tracing",
- "tlsn-key-exchange/tracing",
- "tlsn-point-addition/tracing",
- "tlsn-hmac-sha256/tracing",
- "tlsn-tls-client-async/tracing",
- "uid-mux/tracing",
-]
-
-[dependencies]
-tlsn-tls-core = { path = "../tls-core", features = ["serde"] }
-tlsn-tls-backend = { path = "../tls-backend" }
-
-mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-
-tlsn-block-cipher = { path = "../../cipher/block-cipher" }
-tlsn-stream-cipher = { path = "../../cipher/stream-cipher" }
-tlsn-universal-hash = { path = "../../universal-hash" }
-tlsn-aead = { path = "../../aead" }
-tlsn-key-exchange = { path = "../../key-exchange" }
-tlsn-point-addition = { path = "../../point-addition" }
-tlsn-hmac-sha256 = { path = "../../prf/hmac-sha256" }
-
-tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-
-p256.workspace = true
-rand.workspace = true
-futures.workspace = true
-async-trait.workspace = true
-serde.workspace = true
-derive_builder.workspace = true
-enum-try-as-inner.workspace = true
-thiserror.workspace = true
-tracing = { workspace = true, optional = true }
-ludi = { git = "https://github.com/sinui0/ludi", rev = "b590de5" }
-
-[dev-dependencies]
-tlsn-tls-client = { path = "../tls-client" }
-tlsn-tls-client-async = { path = "../tls-client-async" }
-tls-server-fixture = { path = "../tls-server-fixture" }
-mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "ecb8c54" }
-uid-mux = { path = "../../uid-mux" }
-
-tracing-subscriber.workspace = true
-
-tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
-tokio-util = { workspace = true, features = ["compat"] }
diff --git a/components/tls/tls-mpc/src/config.rs b/components/tls/tls-mpc/src/config.rs
deleted file mode 100644
index d2b16dcaf2..0000000000
--- a/components/tls/tls-mpc/src/config.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use derive_builder::Builder;
-
-static DEFAULT_OPAQUE_TX_TRANSCRIPT_ID: &str = "opaque_tx";
-static DEFAULT_OPAQUE_RX_TRANSCRIPT_ID: &str = "opaque_rx";
-static DEFAULT_TX_TRANSCRIPT_ID: &str = "tx";
-static DEFAULT_RX_TRANSCRIPT_ID: &str = "rx";
-
-/// Configuration options which are common to both the leader and the follower
-#[derive(Debug, Clone, Builder)]
-pub struct MpcTlsCommonConfig {
- /// The id of the tls session.
- #[builder(setter(into))]
- id: String,
- /// The number of threads to use
- #[builder(default = "8")]
- num_threads: usize,
- /// Tx transcript ID
- #[builder(setter(into), default = "DEFAULT_TX_TRANSCRIPT_ID.to_string()")]
- tx_transcript_id: String,
- /// Rx transcript ID
- #[builder(setter(into), default = "DEFAULT_RX_TRANSCRIPT_ID.to_string()")]
- rx_transcript_id: String,
- /// Opaque Tx transcript ID
- #[builder(setter(into), default = "DEFAULT_OPAQUE_TX_TRANSCRIPT_ID.to_string()")]
- opaque_tx_transcript_id: String,
- /// Opaque Rx transcript ID
- #[builder(setter(into), default = "DEFAULT_OPAQUE_RX_TRANSCRIPT_ID.to_string()")]
- opaque_rx_transcript_id: String,
- /// Maximum size of the transcript in bytes.
- /// 16 KiB by default.
- #[builder(default = "1 << 14")]
- max_transcript_size: usize,
- /// Whether the leader commits to the handshake data.
- #[builder(default = "true")]
- handshake_commit: bool,
-}
-
-impl MpcTlsCommonConfig {
- /// Creates a new builder for `MpcTlsCommonConfig`.
- pub fn builder() -> MpcTlsCommonConfigBuilder {
- MpcTlsCommonConfigBuilder::default()
- }
-
- /// Returns the id of the tls session.
- pub fn id(&self) -> &str {
- &self.id
- }
-
- /// Returns the number of threads to use.
- pub fn num_threads(&self) -> usize {
- self.num_threads
- }
-
- /// Returns the tx transcript id.
- pub fn tx_transcript_id(&self) -> &str {
- &self.tx_transcript_id
- }
-
- /// Returns the rx transcript id.
- pub fn rx_transcript_id(&self) -> &str {
- &self.rx_transcript_id
- }
-
- /// Returns the opaque tx transcript id.
- pub fn opaque_tx_transcript_id(&self) -> &str {
- &self.opaque_tx_transcript_id
- }
-
- /// Returns the opaque rx transcript id.
- pub fn opaque_rx_transcript_id(&self) -> &str {
- &self.opaque_rx_transcript_id
- }
-
- /// Returns the maximum size of the transcript in bytes.
- pub fn max_transcript_size(&self) -> usize {
- self.max_transcript_size
- }
-
- /// Whether the leader commits to the handshake data.
- pub fn handshake_commit(&self) -> bool {
- self.handshake_commit
- }
-}
-
-/// Configuration for the leader
-#[allow(missing_docs)]
-#[derive(Debug, Clone, Builder)]
-pub struct MpcTlsLeaderConfig {
- common: MpcTlsCommonConfig,
-}
-
-impl MpcTlsLeaderConfig {
- /// Creates a new builder for `MpcTlsLeaderConfig`.
- pub fn builder() -> MpcTlsLeaderConfigBuilder {
- MpcTlsLeaderConfigBuilder::default()
- }
-
- /// Returns the common config.
- pub fn common(&self) -> &MpcTlsCommonConfig {
- &self.common
- }
-}
-
-/// Configuration for the follower
-#[allow(missing_docs)]
-#[derive(Debug, Clone, Builder)]
-pub struct MpcTlsFollowerConfig {
- common: MpcTlsCommonConfig,
-}
-
-impl MpcTlsFollowerConfig {
- /// Creates a new builder for `MpcTlsFollowerConfig`.
- pub fn builder() -> MpcTlsFollowerConfigBuilder {
- MpcTlsFollowerConfigBuilder::default()
- }
-
- /// Returns the common config.
- pub fn common(&self) -> &MpcTlsCommonConfig {
- &self.common
- }
-}
diff --git a/components/tls/tls-mpc/src/setup.rs b/components/tls/tls-mpc/src/setup.rs
deleted file mode 100644
index 22eb2917fc..0000000000
--- a/components/tls/tls-mpc/src/setup.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-use hmac_sha256 as prf;
-use key_exchange as ke;
-use mpz_garble::{Decode, DecodePrivate, Execute, Load, Prove, Verify, Vm};
-use mpz_share_conversion as ff;
-use point_addition as pa;
-use tlsn_stream_cipher as stream_cipher;
-use tlsn_universal_hash as universal_hash;
-
-use aead::Aead;
-use hmac_sha256::Prf;
-use ke::KeyExchange;
-
-use utils_aio::mux::MuxChannel;
-
-use crate::{config::MpcTlsCommonConfig, MpcTlsError, TlsRole};
-
-/// Helper function for setting up components
-#[allow(clippy::type_complexity)]
-#[cfg_attr(
- feature = "tracing",
- tracing::instrument(level = "info", skip_all, err)
-)]
-pub async fn setup_components<
- M: MuxChannel + MuxChannel + Clone,
- VM: Vm + Send,
- PS: ff::ShareConversion + Send + Sync + 'static + std::fmt::Debug,
- PR: ff::ShareConversion + Send + Sync + 'static + std::fmt::Debug,
- GF: ff::ShareConversion + Send + Sync + Clone + 'static + std::fmt::Debug,
->(
- config: &MpcTlsCommonConfig,
- role: TlsRole,
- mux: &mut M,
- vm: &mut VM,
- p256_send: PS,
- p256_recv: PR,
- gf: GF,
-) -> Result<
- (
- Box,
- Box,
- Box,
- Box,
- ),
- MpcTlsError,
->
-where
- ::Thread: Execute + Load + Decode + DecodePrivate + Prove + Verify + Send + Sync,
-{
- // Set up channels
- let (mut mux_0, mut mux_1) = (mux.clone(), mux.clone());
- let (ke_channel, encrypter_channel, decrypter_channel) = futures::try_join!(
- mux_0.get_channel("ke"),
- mux_1.get_channel("encrypter"),
- mux.get_channel("decrypter")
- )
- .map_err(|_| std::io::Error::new(std::io::ErrorKind::ConnectionRefused, "mux error"))?;
-
- let (ke_role, pa_role, aead_role) = match role {
- TlsRole::Leader => (
- ke::Role::Leader,
- pa::Role::Leader,
- aead::aes_gcm::Role::Leader,
- ),
- TlsRole::Follower => (
- ke::Role::Follower,
- pa::Role::Follower,
- aead::aes_gcm::Role::Follower,
- ),
- };
-
- // Key exchange
- let ke = ke::KeyExchangeCore::new(
- ke_channel,
- pa::MpcPointAddition::new(pa_role, p256_send),
- pa::MpcPointAddition::new(pa_role, p256_recv),
- vm.new_thread("ke").await?,
- ke::KeyExchangeConfig::builder()
- .id("ke")
- .role(ke_role)
- .build()
- .unwrap(),
- );
-
- // PRF
- let prf_role = match role {
- TlsRole::Leader => prf::Role::Leader,
- TlsRole::Follower => prf::Role::Follower,
- };
- let prf = prf::MpcPrf::new(
- prf::PrfConfig::builder().role(prf_role).build().unwrap(),
- vm.new_thread("prf/0").await?,
- vm.new_thread("prf/1").await?,
- );
-
- // Encrypter
- let block_cipher = block_cipher::MpcBlockCipher::::new(
- block_cipher::BlockCipherConfig::builder()
- .id("encrypter/block_cipher")
- .build()
- .unwrap(),
- vm.new_thread("encrypter/block_cipher").await?,
- );
-
- let stream_cipher = stream_cipher::MpcStreamCipher::::new(
- stream_cipher::StreamCipherConfig::builder()
- .id("encrypter/stream_cipher")
- .transcript_id("tx")
- .build()
- .unwrap(),
- vm.new_thread_pool("encrypter/stream_cipher", config.num_threads())
- .await?,
- );
-
- let ghash = universal_hash::ghash::Ghash::new(
- universal_hash::ghash::GhashConfig::builder()
- .id("encrypter/ghash")
- .initial_block_count(64)
- .build()
- .unwrap(),
- gf.clone(),
- );
-
- let mut encrypter = aead::aes_gcm::MpcAesGcm::new(
- aead::aes_gcm::AesGcmConfig::builder()
- .id("encrypter/aes_gcm")
- .role(aead_role)
- .build()
- .unwrap(),
- encrypter_channel,
- Box::new(block_cipher),
- Box::new(stream_cipher),
- Box::new(ghash),
- );
-
- encrypter.set_transcript_id(config.opaque_tx_transcript_id());
-
- // Decrypter
- let block_cipher = block_cipher::MpcBlockCipher::::new(
- block_cipher::BlockCipherConfig::builder()
- .id("decrypter/block_cipher")
- .build()
- .unwrap(),
- vm.new_thread("decrypter/block_cipher").await?,
- );
-
- let stream_cipher = stream_cipher::MpcStreamCipher::::new(
- stream_cipher::StreamCipherConfig::builder()
- .id("decrypter/stream_cipher")
- .transcript_id("rx")
- .build()
- .unwrap(),
- vm.new_thread_pool("decrypter/stream_cipher", config.num_threads())
- .await?,
- );
-
- let ghash = universal_hash::ghash::Ghash::new(
- universal_hash::ghash::GhashConfig::builder()
- .id("decrypter/ghash")
- .initial_block_count(64)
- .build()
- .unwrap(),
- gf,
- );
-
- let mut decrypter = aead::aes_gcm::MpcAesGcm::new(
- aead::aes_gcm::AesGcmConfig::builder()
- .id("decrypter/aes_gcm")
- .role(aead_role)
- .build()
- .unwrap(),
- decrypter_channel,
- Box::new(block_cipher),
- Box::new(stream_cipher),
- Box::new(ghash),
- );
-
- decrypter.set_transcript_id(config.opaque_rx_transcript_id());
-
- Ok((
- Box::new(ke),
- Box::new(prf),
- Box::new(encrypter),
- Box::new(decrypter),
- ))
-}
diff --git a/components/tls/tls-mpc/tests/test.rs b/components/tls/tls-mpc/tests/test.rs
deleted file mode 100644
index e015f72fea..0000000000
--- a/components/tls/tls-mpc/tests/test.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use std::{sync::Arc, time::Duration};
-
-use futures::{AsyncReadExt, AsyncWriteExt, StreamExt};
-use mpz_garble::{config::Role as GarbleRole, protocol::deap::DEAPVm};
-use mpz_ot::{
- actor::kos::{ReceiverActor, SenderActor},
- chou_orlandi::{
- Receiver as BaseReceiver, ReceiverConfig as BaseReceiverConfig, Sender as BaseSender,
- SenderConfig as BaseSenderConfig,
- },
- kos::{Receiver, ReceiverConfig, Sender, SenderConfig},
-};
-use mpz_share_conversion as ff;
-use mpz_share_conversion::{ShareConversionReveal, ShareConversionVerify};
-use tls_client::Certificate;
-use tls_client_async::bind_client;
-use tls_mpc::{
- setup_components, MpcTlsCommonConfig, MpcTlsFollower, MpcTlsFollowerConfig, MpcTlsLeader,
- MpcTlsLeaderConfig, TlsRole,
-};
-use tls_server_fixture::{bind_test_server_hyper, CA_CERT_DER, SERVER_DOMAIN};
-use tokio_util::compat::TokioAsyncReadCompatExt;
-use uid_mux::{yamux, UidYamux};
-use utils_aio::{codec::BincodeMux, mux::MuxChannel};
-
-#[tokio::test]
-#[ignore]
-async fn test() {
- tracing_subscriber::fmt::init();
-
- let (leader_socket, follower_socket) = tokio::io::duplex(1 << 25);
-
- let mut leader_mux = UidYamux::new(
- yamux::Config::default(),
- leader_socket.compat(),
- yamux::Mode::Client,
- );
- let mut follower_mux = UidYamux::new(
- yamux::Config::default(),
- follower_socket.compat(),
- yamux::Mode::Server,
- );
-
- let leader_mux_control = leader_mux.control();
- let follower_mux_control = follower_mux.control();
-
- tokio::spawn(async move { leader_mux.run().await.unwrap() });
- tokio::spawn(async move { follower_mux.run().await.unwrap() });
-
- let mut leader_mux = BincodeMux::new(leader_mux_control);
- let mut follower_mux = BincodeMux::new(follower_mux_control);
-
- let leader_ot_sender_config = SenderConfig::default();
- let follower_ot_recvr_config = ReceiverConfig::default();
-
- let follower_ot_sender_config = SenderConfig::builder().sender_commit().build().unwrap();
- let leader_ot_recvr_config = ReceiverConfig::builder().sender_commit().build().unwrap();
-
- let (leader_ot_sender_sink, leader_ot_sender_stream) =
- leader_mux.get_channel("ot/0").await.unwrap().split();
-
- let (follower_ot_recvr_sink, follower_ot_recvr_stream) =
- follower_mux.get_channel("ot/0").await.unwrap().split();
-
- let (leader_ot_receiver_sink, leader_ot_receiver_stream) =
- leader_mux.get_channel("ot/1").await.unwrap().split();
-
- let (follower_ot_sender_sink, follower_ot_sender_stream) =
- follower_mux.get_channel("ot/1").await.unwrap().split();
-
- let mut leader_ot_sender_actor = SenderActor::new(
- Sender::new(
- leader_ot_sender_config,
- BaseReceiver::new(BaseReceiverConfig::default()),
- ),
- leader_ot_sender_sink,
- leader_ot_sender_stream,
- );
-
- let mut follower_ot_recvr_actor = ReceiverActor::new(
- Receiver::new(
- follower_ot_recvr_config,
- BaseSender::new(BaseSenderConfig::default()),
- ),
- follower_ot_recvr_sink,
- follower_ot_recvr_stream,
- );
-
- let mut leader_ot_recvr_actor = ReceiverActor::new(
- Receiver::new(
- leader_ot_recvr_config,
- BaseSender::new(
- BaseSenderConfig::builder()
- .receiver_commit()
- .build()
- .unwrap(),
- ),
- ),
- leader_ot_receiver_sink,
- leader_ot_receiver_stream,
- );
-
- let mut follower_ot_sender_actor = SenderActor::new(
- Sender::new(
- follower_ot_sender_config,
- BaseReceiver::new(
- BaseReceiverConfig::builder()
- .receiver_commit()
- .build()
- .unwrap(),
- ),
- ),
- follower_ot_sender_sink,
- follower_ot_sender_stream,
- );
-
- let leader_ot_send = leader_ot_sender_actor.sender();
- let follower_ot_recv = follower_ot_recvr_actor.receiver();
-
- let leader_ot_recv = leader_ot_recvr_actor.receiver();
- let follower_ot_send = follower_ot_sender_actor.sender();
-
- tokio::spawn(async move {
- leader_ot_sender_actor.setup(20000).await.unwrap();
- leader_ot_sender_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- follower_ot_recvr_actor.setup(20000).await.unwrap();
- follower_ot_recvr_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- leader_ot_recvr_actor.setup(20000).await.unwrap();
- leader_ot_recvr_actor.run().await.unwrap();
- });
-
- tokio::spawn(async move {
- follower_ot_sender_actor.setup(20000).await.unwrap();
- follower_ot_sender_actor.run().await.unwrap();
- follower_ot_sender_actor.reveal().await.unwrap();
- });
-
- let mut leader_vm = DEAPVm::new(
- "vm",
- GarbleRole::Leader,
- [0u8; 32],
- leader_mux.get_channel("vm").await.unwrap(),
- Box::new(leader_mux.clone()),
- leader_ot_send.clone(),
- leader_ot_recv.clone(),
- );
-
- let mut follower_vm = DEAPVm::new(
- "vm",
- GarbleRole::Follower,
- [1u8; 32],
- follower_mux.get_channel("vm").await.unwrap(),
- Box::new(follower_mux.clone()),
- follower_ot_send.clone(),
- follower_ot_recv.clone(),
- );
-
- let leader_p256_send = ff::ConverterSender::::new(
- ff::SenderConfig::builder().id("p256/0").build().unwrap(),
- leader_ot_send.clone(),
- leader_mux.get_channel("p256/0").await.unwrap(),
- );
-
- let leader_p256_recv = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder().id("p256/1").build().unwrap(),
- leader_ot_recv.clone(),
- leader_mux.get_channel("p256/1").await.unwrap(),
- );
-
- let follower_p256_send = ff::ConverterSender::::new(
- ff::SenderConfig::builder().id("p256/1").build().unwrap(),
- follower_ot_send.clone(),
- follower_mux.get_channel("p256/1").await.unwrap(),
- );
-
- let follower_p256_recv = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder().id("p256/0").build().unwrap(),
- follower_ot_recv.clone(),
- follower_mux.get_channel("p256/0").await.unwrap(),
- );
-
- let mut leader_gf2 = ff::ConverterSender::::new(
- ff::SenderConfig::builder()
- .id("gf2")
- .record()
- .build()
- .unwrap(),
- leader_ot_send.clone(),
- leader_mux.get_channel("gf2").await.unwrap(),
- );
-
- let mut follower_gf2 = ff::ConverterReceiver::::new(
- ff::ReceiverConfig::builder()
- .id("gf2")
- .record()
- .build()
- .unwrap(),
- follower_ot_recv.clone(),
- follower_mux.get_channel("gf2").await.unwrap(),
- );
-
- let common_config = MpcTlsCommonConfig::builder().id("test").build().unwrap();
-
- let (leader_ke, leader_prf, leader_encrypter, leader_decrypter) = setup_components(
- &common_config,
- TlsRole::Leader,
- &mut leader_mux,
- &mut leader_vm,
- leader_p256_send,
- leader_p256_recv,
- leader_gf2.handle().unwrap(),
- )
- .await
- .unwrap();
-
- let mut leader = MpcTlsLeader::new(
- MpcTlsLeaderConfig::builder()
- .common(common_config.clone())
- .build()
- .unwrap(),
- leader_mux.get_channel("test").await.unwrap(),
- leader_ke,
- leader_prf,
- leader_encrypter,
- leader_decrypter,
- );
-
- let (follower_ke, follower_prf, follower_encrypter, follower_decrypter) = setup_components(
- &common_config,
- TlsRole::Follower,
- &mut follower_mux,
- &mut follower_vm,
- follower_p256_send,
- follower_p256_recv,
- follower_gf2.handle().unwrap(),
- )
- .await
- .unwrap();
-
- let mut follower = MpcTlsFollower::new(
- MpcTlsFollowerConfig::builder()
- .common(common_config)
- .build()
- .unwrap(),
- follower_mux.get_channel("test").await.unwrap(),
- follower_ke,
- follower_prf,
- follower_encrypter,
- follower_decrypter,
- );
-
- let follower_task = tokio::spawn(async move {
- follower.setup().await.unwrap();
-
- let (_, fut) = follower.run();
- fut.await.unwrap()
- });
-
- leader.setup().await.unwrap();
-
- let (leader_ctrl, leader_fut) = leader.run();
- let leader_task = tokio::spawn(leader_fut);
-
- let mut root_store = tls_client::RootCertStore::empty();
- root_store.add(&Certificate(CA_CERT_DER.to_vec())).unwrap();
- let config = tls_client::ClientConfig::builder()
- .with_safe_defaults()
- .with_root_certificates(root_store)
- .with_no_client_auth();
-
- let server_name = SERVER_DOMAIN.try_into().unwrap();
-
- let client = tls_client::ClientConnection::new(
- Arc::new(config),
- Box::new(leader_ctrl.clone()),
- server_name,
- )
- .unwrap();
-
- let (client_socket, server_socket) = tokio::io::duplex(1 << 16);
-
- tokio::spawn(bind_test_server_hyper(server_socket.compat()));
-
- let (mut conn, conn_fut) = bind_client(client_socket.compat(), client);
-
- let conn_task = tokio::spawn(conn_fut);
-
- let msg = concat!(
- "POST /echo HTTP/1.1\r\n",
- "Host: test-server.io\r\n",
- "Connection: keep-alive\r\n",
- "Accept-Encoding: identity\r\n",
- "Content-Length: 5\r\n",
- "\r\n",
- "hello",
- "\r\n"
- );
-
- conn.write_all(msg.as_bytes()).await.unwrap();
-
- let mut buf = vec![0u8; 48];
- conn.read_exact(&mut buf).await.unwrap();
-
- println!("{}", String::from_utf8_lossy(&buf));
-
- leader_ctrl.defer_decryption().await.unwrap();
-
- let msg = concat!(
- "POST /echo HTTP/1.1\r\n",
- "Host: test-server.io\r\n",
- "Connection: close\r\n",
- "Accept-Encoding: identity\r\n",
- "Content-Length: 5\r\n",
- "\r\n",
- "hello",
- "\r\n"
- );
-
- conn.write_all(msg.as_bytes()).await.unwrap();
-
- // Wait for the server to reply.
- tokio::time::sleep(Duration::from_millis(100)).await;
-
- leader_ctrl.commit().await.unwrap();
-
- let mut buf = vec![0u8; 1024];
- conn.read_to_end(&mut buf).await.unwrap();
-
- leader_ctrl.close_connection().await.unwrap();
- conn.close().await.unwrap();
-
- follower_ot_send.shutdown().await.unwrap();
-
- tokio::try_join!(leader_vm.finalize(), follower_vm.finalize()).unwrap();
- tokio::try_join!(leader_gf2.reveal(), follower_gf2.verify()).unwrap();
-
- conn_task.await.unwrap().unwrap();
- _ = leader_task.await.unwrap();
- _ = follower_task.await.unwrap();
-}
diff --git a/components/tls/tls-server-fixture/src/domain.crt b/components/tls/tls-server-fixture/src/domain.crt
deleted file mode 100644
index f946fbdc7c..0000000000
--- a/components/tls/tls-server-fixture/src/domain.crt
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDmzCCAoOgAwIBAgIUXYmS5GJNi70RMwqR1zzSjI6gjnIwDQYJKoZIhvcNAQEL
-BQAwSjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAoM
-CXRsc25vdGFyeTESMBAGA1UEAwwJdGxzbm90YXJ5MB4XDTIzMDYwNzAxMzcyOFoX
-DTI0MDYwNjAxMzcyOFowWzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh
-dGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwL
-dGVzdC1zZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClrwyM
-b9JVV56IqAAE7QoAfnyYMRxL/93NV2II35Hq1DrBeXGvQ9EjD0qKMKCNIJFLQUaO
-dIQ853+OGez9Q73836bPOqM7hSRdn34bB+4phKnxM2QegEL+0oR6YhXS+9iavAWj
-obfgVmmZhtLMXAIRuZrMLVPRNm+MIi4BcEu6Ckgdxhvkvp7Gzb74NXffgdilqTJG
-bKdvCuF7IgFZXTi/8ACAZDKuXt8t9w0VUZRC9X4YTNslesW8MaPbmRwlVR8+qDMA
-f2UdoUS5t9NGnniM/zsVK+RvbrFD0yXoJ3Pr+NdpFwLFPuhQCX2l0r2edb5Xsw6d
-unCm2vZIrajFmzLTAgMBAAGjaDBmMB8GA1UdIwQYMBaAFCzjJ91fETcwwaoAM0mB
-Z8r8srGlMAkGA1UdEwQCMAAwGQYDVR0RBBIwEIIOdGVzdC1zZXJ2ZXIuaW8wHQYD
-VR0OBBYEFJMXVtfmDSqllg3BuymCj4OgENVnMA0GCSqGSIb3DQEBCwUAA4IBAQBd
-W2Y58hHXei5K1wXRKaSZV8uyI5a4F4h+75vNNDGcbU204YRAtwmTYLXZnUCtxhL5
-wDnH00z8Z8s+ZHfDdH/64lxM0VmVKNxIdF6KUMIyvrdK9aL2wRMLSWCZTMBGibs0
-npY6fGgXdAeZnG8iP6ede3tF7vNpr+no+lrsx7ZCYhUg/XvaGsR2wIoMpMhVyDv2
-jkxc+Xnt/Prr89mQQUQVg2zkwcPrgEM+NwpDMqH3BFVsx6Qu1FO6sAIREewSM6t9
-kgfkzmH97Z5HEjGV2CWjsNBEAPaafAnE8qqvHQkFUmps12LnsEGbZbM/8kxifjNX
-V6wbaLYrV6WDttQINST8
------END CERTIFICATE-----
diff --git a/components/tls/tls-server-fixture/src/domain.csr b/components/tls/tls-server-fixture/src/domain.csr
deleted file mode 100644
index a4201d2587..0000000000
--- a/components/tls/tls-server-fixture/src/domain.csr
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICoDCCAYgCAQAwWzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUx
-ITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwLdGVz
-dC1zZXJ2ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClrwyMb9JV
-V56IqAAE7QoAfnyYMRxL/93NV2II35Hq1DrBeXGvQ9EjD0qKMKCNIJFLQUaOdIQ8
-53+OGez9Q73836bPOqM7hSRdn34bB+4phKnxM2QegEL+0oR6YhXS+9iavAWjobfg
-VmmZhtLMXAIRuZrMLVPRNm+MIi4BcEu6Ckgdxhvkvp7Gzb74NXffgdilqTJGbKdv
-CuF7IgFZXTi/8ACAZDKuXt8t9w0VUZRC9X4YTNslesW8MaPbmRwlVR8+qDMAf2Ud
-oUS5t9NGnniM/zsVK+RvbrFD0yXoJ3Pr+NdpFwLFPuhQCX2l0r2edb5Xsw6dunCm
-2vZIrajFmzLTAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAUY8AusY1fDOy9Ary
-rbkaX+pSUd4HSoElYEvn5ikrguqsTny5+Dvd+4aVGLHSO0/Y/cA1oRq8YqFEC/2C
-2PxQkiZY8BdGKTWCT26f/3S197K/lOzxGmXbfZDZVHstzzobMIHFd0NEGBamLH4w
-iSnuNRHre48cVIlCx3S2CVskNikJGBiZVfQeNVhkd5zqEkAdYViEycoQ5RyCu3po
-HGlUQx3Z2TY4wNv1iKMPj8701C+c1uIosHMrjDPpIqHjS+nbaKPkXVwTF2lbOOcO
-111t3fk0EeCdnGq8g6rS9mEL/kBZZNZI0/Pwl3SIBqoxvBv6U+ennqZhnPVJSK07
-//ovUA==
------END CERTIFICATE REQUEST-----
diff --git a/components/tls/tls-server-fixture/src/domain.der b/components/tls/tls-server-fixture/src/domain.der
deleted file mode 100644
index 0a9191c164..0000000000
Binary files a/components/tls/tls-server-fixture/src/domain.der and /dev/null differ
diff --git a/components/tls/tls-server-fixture/src/domain.ext b/components/tls/tls-server-fixture/src/domain.ext
deleted file mode 100644
index d1483b93da..0000000000
--- a/components/tls/tls-server-fixture/src/domain.ext
+++ /dev/null
@@ -1,5 +0,0 @@
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-subjectAltName = @alt_names
-[alt_names]
-DNS.1 = test-server.io
\ No newline at end of file
diff --git a/components/tls/tls-server-fixture/src/domain.key b/components/tls/tls-server-fixture/src/domain.key
deleted file mode 100644
index 0ca070d38c..0000000000
--- a/components/tls/tls-server-fixture/src/domain.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQInlBxGC6Q/nwCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECPW0f2DL+mvdBIIEyOCxtYAeFPSA
-IHXX/UtF0Z0FtFP+d1/osMI0wxJrxz0KM9fN8z7XEkzXIR8ZjMCsduIl/zirl+bB
-L9UGAHBNIn3yYpwh9UXhFBC4t8GM5xy89E6GMD7DU5X0xA/B1RvGFlHY+EkyTYr6
-crhY8uxTEoVPaxgbeyZfJaTP4bcZyAVbgIN0TqOX7fk+zIKmCHauRETwJho8ZZ+d
-tvucnpA4WqNyLhgWW+ScApzgVEsbBXV80tEDOXEw7TVtaS1VqlKP2pFVVHuCWQWk
-GnZT57LY4vzBkmpEnmpNj10IVPg5D9Ro+XNsXv9ji67NU42AOopWngOLhqMEyVS2
-DJL9X5DQYQJKSx7cKVkpNkBMLZC6V7iPhG1WHr+OUgYdNSf6l/59tLLQTpN0u/19
-VsgaS84CqAv4eFOVwfr9QTwPg7BNKbvdzn41IvXA05OT3xs0P2FhbjafFaJrivu+
-0krVb1T7RyiwqJSr8EujufHptIzkax/HE5+g++v6laiHlZXealGmGsYKNkO4Tyn9
-3QU38U41A4LyBrnlWn8mEZxY/SM7nQhYdfZ2CDCwqpBmvozxuY4p6fwcyPXmMmxv
-bwzDlIRkk1VxobRKYqoWhCXKCRm9c/WZoymbWghLhEhbwgRAfM6sTAtNKbAooY15
-RGGCZE/QIqroWdMyH9hWQ01KOSA+CWWgsAUr+l6w678Jcx8bOSlbJkjpHVY4Kg0G
-kngficAHb4nVNmGXNoDqg/EgDi57J8jNEKxLK3SIs5xwcFqTQl5qF6vJUR64yYS1
-aJe6+AedSvubrSzqnuI7SgX44WoHpOduhu99AAMgHOSAOgg5Nxr29Jyo/h6qKsx8
-u+EDrIcQPsgpITNALmI6yT7uZJYnkFfvuZdiTOqAURVUVLUsnAuCzaUzbBdM2Vbb
-rJlOkHJqrX9NxhIl8CSzdGiwdBc1gwi5eL84NY3MTSOD4+HN0u17a9O/EK2OhVNR
-Jyt+r0WgE2lmaLKNaRvruwuU9oVG0cfWxRilOxFKnDpk9SMe4ZvUUIGe8wjx2BNs
-u87EvPK71+gGLkWxo6qGH6xk/26dO/yjclFHDxjLe63WBTBrUrMucKjMbyxuKYrC
-JgNyHskeK7cqOixg4cDMCIfNoHg8nnawF2fAYY+NEKJq29YcAWO1P8PuqpINdgke
-Sac+ogpp56ZtFlmgQ6PYOM/24b3dFQwdt46HzK7iluVR7Ihq0uiBO7UDilz9qUPX
-sdPSmOYoFST6kgx9Occk6MeJKMBH+f8nVnTauwhBs3s2AZEgHd07MreUF+G1njbI
-ukCvL8MHYhwqCCd6EZaH7U7oNGA8roIRPkvpSXeuNhDsabxQIzQNyOy9v3fKNtyt
-EAR1bnrKwXX/32dC/JFcJOfzMuhCclw/88miNtzDz/tXym7EUU4UbX5ARoDNHuaJ
-0DHfEMCTSa2umiqMClTvfOgn9OWI140y6HPqWXmJJReiKkGkDJiBcRiBCGj0uxwz
-qrclNr5iDk+USY09qR2gWt30xaBclgzAL9b7YEMulfcrlrOGxrVUlDSezs2YZQRH
-156WWeCrruY+MjFZ4w0jhqkRW0osO9TwbyAZTlVYqrn9RChmfnW1Mn6p526ZkDer
-nSQuQlLmTNOHGRRFvKg/6Q==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/components/tls/tls-server-fixture/src/domain_key.der b/components/tls/tls-server-fixture/src/domain_key.der
deleted file mode 100644
index 984284521b..0000000000
Binary files a/components/tls/tls-server-fixture/src/domain_key.der and /dev/null differ
diff --git a/components/tls/tls-server-fixture/src/rootCA.crt b/components/tls/tls-server-fixture/src/rootCA.crt
deleted file mode 100644
index 728847ce25..0000000000
--- a/components/tls/tls-server-fixture/src/rootCA.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgIUYL1NTquyWYgFShuzP3SXUW1LRLswDQYJKoZIhvcNAQEL
-BQAwSjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAoM
-CXRsc25vdGFyeTESMBAGA1UEAwwJdGxzbm90YXJ5MB4XDTIzMDYwNzAxMzQyN1oX
-DTI4MDYwNTAxMzQyN1owSjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3Rh
-dGUxEjAQBgNVBAoMCXRsc25vdGFyeTESMBAGA1UEAwwJdGxzbm90YXJ5MIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyhPglwjjaUxTvlQZK3IOVdiormCz
-eHCvyZscBcolbhL8CbrtJYkozfMLwaBSccqBLpMbvulOeKBBB3ll9iffeWkQIcnh
-m4ozf7DdG7EhDnp0lBS40UmDV4zHKbqlUzBBt737RGaDSDzf0w2b8tVOA0ZkBXw7
-aGlbj1ikV45GFlyH5b+wCvcboUaJkt4CllqF8uIo4Csjp3EqLMnGW6556HNukLoi
-YlqW89VM+7C0yaL43ROjPr0lXPBpCrV9jnsVSaBJ2u3Ae35KgaqFxcMrXzpMArjS
-jEXSW6Gi7XdI7bWMpfnLv3eyRkuEzkhCu1PPTA1EBa4eEikAqilU7ukKzQIDAQAB
-o1MwUTAdBgNVHQ4EFgQULOMn3V8RNzDBqgAzSYFnyvyysaUwHwYDVR0jBBgwFoAU
-LOMn3V8RNzDBqgAzSYFnyvyysaUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
-AQsFAAOCAQEArIKYiJ6eLqNcy1UCg4vboRWByVG4nN5NOPoBNRT1xTzEPsjEoZpw
-EdE8roKD4jG6Pf73yiMsLGhSUA7HBET6NTS5g7wGgGL0QPQIeLHLf1oLWb17Zqmm
-i316NBzwPEXx8snK/WcBzPimbcKRDAYJG5UahGJyaIE5tcXORq7tK4YCycM1qTq0
-dx5RjO+ZJ1160nstXRUhRumilPW1FzxOt+wnaJza07zwLF9NphnAh6XGCsisz/KW
-8scL+DNu6W0+irixhGl3Ly9idNQLmDUEWoO6sp3MFW7He5iJgzFlIY1oo7uQFkHR
-GzrhAlDfCcoCHFvHc5MuqFpvgSsWEoC2AQ==
------END CERTIFICATE-----
diff --git a/components/tls/tls-server-fixture/src/rootCA.der b/components/tls/tls-server-fixture/src/rootCA.der
deleted file mode 100644
index d974cd41ff..0000000000
Binary files a/components/tls/tls-server-fixture/src/rootCA.der and /dev/null differ
diff --git a/components/tls/tls-server-fixture/src/rootCA.key b/components/tls/tls-server-fixture/src/rootCA.key
deleted file mode 100644
index dbd954eb03..0000000000
--- a/components/tls/tls-server-fixture/src/rootCA.key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIwMUhKGCZU0kCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECJxXqH54fWnLBIIEyI9L1uoU2blz
-siT/FPwMzDTgGJCYtre8yIuA81OTURH8V3PM4r8SguPk5xv75WcXu71/+I5hK0s6
-ia1BZHHSQosnu8XrGNTyIaybg1JzrXtunlFUoH64Tg5tXc2G53lbXb7LMGs7YAhh
-SG6bmbSerVVOj5Iu1X3+Vdjlsp26BdcOGZ83xZVyRWRWUDjHfrQ0xmMBdB2pe0nD
-7cqpSD6WGFXHaRoV+zL/ErjelkqU7V9GSDajZxQxniENEPddpucc7Pz29rqE/2Qf
-XX/HD/9hz95RvssYX7b3dczoqheRxIsx72Fn5B/QzEGW/PPaNGi8iQZr8rsoE3S1
-S+nbBKCRiMTwLYu3Z5EjWeTHBtA8tKGPW6HF/9Ga1eEnKTX5+7SgyxbfkeDK1SJN
-M77V4qN6R9HvbvduSjO9utDr/zCvHu68Ju9dYCNOiKdLS417pVNtB47EnUiN7kDF
-Zrd+lL/8crqNWokocrw2qxLuGMsBqHdvtl6F5O57w9rKZl72gfQTg0dsh5YPN7K9
-xckGaZg0n8nUDAop6bSzXc+0JCwzXfGtKsdq4VjBgy/QtqLX24SgloHJHrl1qyGj
-eSnKRvDcazD4XEDEsn9HBIaHHHm8lIrh8IhgsE3UvifgfOf4DO9uasKEdXahZaEu
-9WH1mxnY67X+z9IaslMgkzoVnZARq1Swin+SxdY6rWJHucCLO8pCh4R9w6J/olXM
-+bs3ivrjygJ2TOYgPV8CJ8IU65Z4C/Wv/Rt4p1QwxK/swkUjINqryh6rg2BGfHE8
-yLUioVimx4c/kziZEq3z8+eq6vs2cB28q3ze39REHAtk3ezsvIirtY/FG10zrWgx
-cWHJYUKjYug1RkPWwYr3/vuTh68IrEmGi4TMcojxSUpq1vdc2lk9zu9vXTEsKF00
-NQP5txscxQZwdb5Q01pylcTHOeiEjbQ0hRQ+oelwRniKXAuAp5D7H4LnUcw07wfp
-nA1GEqMh7M7/dM3E7eXmzS2izDnwE9E0Va0Qu4fYpu+VPwahgP71bVheYRb1Rr1a
-ODnUcReuNqJhZ7q/BTRZ4fK7vrVfuJjecMGNBdFRYH1etQgcZPJzJWnZaMP+S+iO
-Jqk/1aMAR5E6ejO5KwExmO9JFQplfbJmrvtGqq1AkkOr+EefR5CK7Tr2jNdEE2xg
-b5Z1BmqniJ2I/o9L9AxFFKE9PjXeLLS6XHS3N5VPjLzACJhchQZWI1RbEt6qAW6i
-LwizIDJLN57mxaxtuQsEg+hD1tNiRIaF3dsCpBq7MTc64/iWphCydYF8adRSzoVy
-07GwAmZ9JX/fd6WCWYAo97N0S7/adBqAi/XXA1wqkW/ZpRF63tXNcLJXwLcoeclr
-DKpMb0NtjCT5QNJNVGHTUv4RdGEWbN2u6Oq6rfOfYnXvjrzmpAVVkRJ8BlQsTkzN
-5T+BV4txwS5a1EH2ERfY4KuQWcSKIP2lKjNvqKCtwbHOSoQ6wmtLJKzw9mLD8JzQ
-9wROywbA4CDW4dbSPuHUTmSpfBrt36mfV8+loJ8m3+eqcQNIh44drO3P8wwaIAEe
-1YT7Yt75YD2EjtXvw2umxvQP/PWk2t+EI+Fo9/t/U2zPHgFuxevCMzNsRktz108M
-rIuTToR3EfYojhEvyMyf7g==
------END ENCRYPTED PRIVATE KEY-----
diff --git a/components/uid-mux/Cargo.toml b/components/uid-mux/Cargo.toml
deleted file mode 100644
index f1e37a06f9..0000000000
--- a/components/uid-mux/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-name = "uid-mux"
-version = "0.1.0-alpha.3"
-authors = ["TLSNotary Team"]
-description = "Multiplex connections asynchronously."
-keywords = ["multiplex", "channel", "futures", "async"]
-categories = ["network-programming", "asynchronous"]
-license = "MIT OR Apache-2.0"
-edition = "2021"
-
-[features]
-tracing = ["dep:tracing"]
-
-[dependencies]
-tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "8d8ffe1" }
-
-async-trait = "0.1"
-futures = "0.3"
-yamux = "0.11"
-tracing = { version = "0.1", optional = true }
-
-[dev-dependencies]
-tokio-util = { version = "0.7", features = ["compat"] }
-tokio = { version = "1", features = [
- "macros",
- "rt",
- "rt-multi-thread",
- "time",
-] }
diff --git a/components/uid-mux/src/lib.rs b/components/uid-mux/src/lib.rs
deleted file mode 100644
index 1c1b50f736..0000000000
--- a/components/uid-mux/src/lib.rs
+++ /dev/null
@@ -1,366 +0,0 @@
-//! This library provides tools to multiplex a connection and uses [yamux] under the hood.
-//!
-//! To use this library, instantiate a [UidYamux] by providing an underlying socket (anything which
-//! implements [AsyncRead] and [AsyncWrite]). After running [run](UidYamux::run) in the background
-//! you can create controls with [control](UidYamux::control), which can be easily passed around.
-//! They allow to open new streams ([get_stream](UidYamuxControl::get_stream)) by providing unique
-//! stream ids.
-
-#![deny(missing_docs, unreachable_pub, unused_must_use)]
-#![deny(clippy::all)]
-#![forbid(unsafe_code)]
-
-use std::{
- collections::{HashMap, HashSet},
- sync::{Arc, Mutex},
-};
-
-use async_trait::async_trait;
-
-use futures::{
- channel::oneshot, stream::FuturesUnordered, AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt,
- StreamExt,
-};
-use utils_aio::mux::{MuxStream, MuxerError};
-
-pub use yamux;
-
-#[derive(Debug, Default)]
-struct MuxState {
- stream_ids: HashSet,
- waiting_callers: HashMap>>,
- waiting_streams: HashMap,
-}
-
-/// A wrapper around [yamux] to facilitate multiplexing with unique stream ids.
-pub struct UidYamux {
- mode: yamux::Mode,
- conn: Option