WIP: add dev container

this does not yet work

.ci/gen-workflow-files.nu

@@ -1,6 +1,6 @@
 #!/usr/bin/env nu
 
-use std log
+use log *
 
 # cd to git root
 cd (git rev-parse --show-toplevel)
@@ -116,7 +116,6 @@ for system in ($targets | columns) {
       } }
       | filter {|it| $it.needed}
       | each {|it| job-id $system $it.name}
-      | sort
     )
 
     mut new_job = {
@@ -198,4 +197,4 @@ $cachix_workflow | to yaml | save --force .github/workflows/nix.yaml
 $release_workflow | to yaml | save --force .github/workflows/release.yaml
 
 log info "prettify generated yaml"
-prettier -w .github/workflows/
+prettier -w .github/workflows/

.ci/run-regression.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-iterations="$1"
-sleep_time="$2"
-
-PWD="$(pwd)"
-EXEC="$PWD/target/release/rosenpass"
-LOGS="$PWD/output/logs"
-
-mkdir -p "$LOGS"
-
-run_command() {
-  local file=$1
-  local log_file="$2"
-  ("$EXEC" exchange-config "$file" 2>&1 | tee -a "$log_file") &
-  echo $!
-}
-
-pids=()
-
-(cd output/dut && run_command "configs/dut-$iterations.toml" "$LOGS/dut.log")
-for (( x=0; x<iterations; x++ )); do
-  (cd output/ate && run_command "configs/ate-$x.toml" "$LOGS/ate-$x.log") & pids+=($!)
-done
-
-sleep "$sleep_time"
-
-lsof -i :9999 | awk 'NR!=1 {print $2}' | xargs kill
-
-for (( x=0; x<iterations; x++ )); do
-    port=$((x + 50000))
-    lsof -i :$port | awk 'NR!=1 {print $2}' | xargs kill
-done

.devcontainer/Dockerfile

@@ -1 +0,0 @@
-FROM ghcr.io/xtruder/nix-devcontainer:v1

.devcontainer/devcontainer.json

@@ -1,33 +0,0 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
-// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/docker-existing-dockerfile
-{
-  "name": "devcontainer-project",
-  "dockerFile": "Dockerfile",
-  "context": "${localWorkspaceFolder}",
-  "build": {
-    "args": {
-      "USER_UID": "${localEnv:USER_UID}",
-      "USER_GID": "${localEnv:USER_GID}"
-    }
-  },
-
-  // run arguments passed to docker
-  "runArgs": ["--security-opt", "label=disable"],
-
-  // disable command overriding and updating remote user ID
-  "overrideCommand": false,
-  "userEnvProbe": "loginShell",
-  "updateRemoteUserUID": false,
-
-  // build development environment on creation, make sure you already have shell.nix
-  "onCreateCommand": "nix develop",
-
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [],
-
-  "customizations": {
-    "vscode": {
-      "extensions": ["rust-lang.rust-analyzer", "tamasfe.even-better-toml"]
-    }
-  }
-}

.github/codecov.yml

@@ -1,14 +0,0 @@
-codecov:
-  branch: main
-coverage:
-  status:
-    project:
-      default:
-        # basic
-        target: auto #default
-        threshold: 5
-        base: auto
-        if_ci_failed: error #success, failure, error, ignore
-        informational: false
-        only_pulls: true
-    patch: off

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/changelog.yml

@@ -1,34 +0,0 @@
-name: Changelog Update
-
-on:
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  generate-changelog:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-
-      - name: Set up Rust
-        uses: actions/setup-rust@v1
-        with:
-          rust-version: stable
-
-      - name: Install git-cliff
-        run: cargo install git-cliff
-
-      - name: Generate Changelog
-        run: |
-          git-cliff --config cliff.toml > CHANGELOG.md
-          git add CHANGELOG.md
-
-      - name: Commit and Push Changes
-        run: |
-          git config --global user.email "action@github.com"
-          git config --global user.name "GitHub Action"
-          git commit -m "chore: update changelog" || echo "No changes to commit"
-          git push origin HEAD:${{ github.head_ref }}
-

.github/workflows/dependent-issues.yml

@@ -1,63 +0,0 @@
-name: Dependent Issues
-
-on:
-  issues:
-    types:
-      - opened
-      - edited
-      - closed
-      - reopened
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - closed
-      - reopened
-      # Makes sure we always add status check for PRs. Useful only if
-      # this action is required to pass before merging. Otherwise, it
-      # can be removed.
-      - synchronize
-
-  # Schedule a daily check. Useful if you reference cross-repository
-  # issues or pull requests. Otherwise, it can be removed.
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  check:
-    permissions:
-      issues: write
-      pull-requests: write
-      statuses: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: z0al/dependent-issues@v1
-        env:
-          # (Required) The token to use to make API calls to GitHub.
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # (Optional) The token to use to make API calls to GitHub for remote repos.
-          GITHUB_READ_TOKEN: ${{ secrets.GITHUB_READ_TOKEN }}
-
-        with:
-          # (Optional) The label to use to mark dependent issues
-          label: dependent
-
-          # (Optional) Enable checking for dependencies in issues.
-          # Enable by setting the value to "on". Default "off"
-          check_issues: off
-
-          # (Optional) Ignore dependabot PRs.
-          # Enable by setting the value to "on". Default "off"
-          ignore_dependabot: off
-
-          # (Optional) A comma-separated list of keywords. Default
-          # "depends on, blocked by"
-          keywords: depends on, blocked by
-
-          # (Optional) A custom comment body. It supports `{{ dependencies }}` token.
-          comment: >
-            This PR/issue depends on:
-
-            {{ dependencies }}
-
-            By **[Dependent Issues](https://github.com/z0al/dependent-issues)** (🤖). Happy coding!

.github/workflows/doc-upload.yml

@@ -46,4 +46,4 @@ jobs:
           author_email: actions@github.com
           message: Update docs
           cwd: rosenpass-website/static/docs
-          github_token: ${{ secrets.PRIVACC }}
+          github_token: ${{ secrets.PRIVACC }

.github/workflows/nix.yaml

@@ -95,7 +95,6 @@ jobs:
       - macos-13
     needs:
       - x86_64-darwin---rosenpass
-      - x86_64-darwin---rp
       - x86_64-darwin---rosenpass-oci-image
     steps:
       - uses: actions/checkout@v3
@@ -124,22 +123,6 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-darwin.rosenpass --print-build-logs
-  x86_64-darwin---rp:
-    name: Build x86_64-darwin.rp
-    runs-on:
-      - macos-13
-    needs: []
-    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.x86_64-darwin.rp --print-build-logs
   x86_64-darwin---rosenpass-oci-image:
     name: Build x86_64-darwin.rosenpass-oci-image
     runs-on:
@@ -227,9 +210,8 @@ jobs:
     runs-on:
       - ubuntu-latest
     needs:
-      - x86_64-linux---rosenpass-static
       - x86_64-linux---rosenpass-static-oci-image
-      - x86_64-linux---rp-static
+      - x86_64-linux---rosenpass-static
     steps:
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v22
@@ -241,30 +223,6 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.release-package --print-build-logs
-  aarch64-linux---release-package:
-    name: Build aarch64-linux.release-package
-    runs-on:
-      - ubuntu-latest
-    needs:
-      - aarch64-linux---rosenpass-oci-image
-      - aarch64-linux---rosenpass
-      - aarch64-linux---rp
-    steps:
-      - run: |
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update -q -y && sudo apt-get install -q -y qemu-system-aarch64 qemu-efi binfmt-support qemu-user-static
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          extra_nix_config: |
-            system = aarch64-linux
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.aarch64-linux.release-package --print-build-logs
   x86_64-linux---rosenpass:
     name: Build x86_64-linux.rosenpass
     runs-on:
@@ -281,48 +239,6 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.rosenpass --print-build-logs
-  aarch64-linux---rosenpass:
-    name: Build aarch64-linux.rosenpass
-    runs-on:
-      - ubuntu-latest
-    needs: []
-    steps:
-      - run: |
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update -q -y && sudo apt-get install -q -y qemu-system-aarch64 qemu-efi binfmt-support qemu-user-static
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          extra_nix_config: |
-            system = aarch64-linux
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.aarch64-linux.rosenpass --print-build-logs
-  aarch64-linux---rp:
-    name: Build aarch64-linux.rp
-    runs-on:
-      - ubuntu-latest
-    needs: []
-    steps:
-      - run: |
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update -q -y && sudo apt-get install -q -y qemu-system-aarch64 qemu-efi binfmt-support qemu-user-static
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          extra_nix_config: |
-            system = aarch64-linux
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.aarch64-linux.rp --print-build-logs
   x86_64-linux---rosenpass-oci-image:
     name: Build x86_64-linux.rosenpass-oci-image
     runs-on:
@@ -340,28 +256,6 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.rosenpass-oci-image --print-build-logs
-  aarch64-linux---rosenpass-oci-image:
-    name: Build aarch64-linux.rosenpass-oci-image
-    runs-on:
-      - ubuntu-latest
-    needs:
-      - aarch64-linux---rosenpass
-    steps:
-      - run: |
-          DEBIAN_FRONTEND=noninteractive
-          sudo apt-get update -q -y && sudo apt-get install -q -y qemu-system-aarch64 qemu-efi binfmt-support qemu-user-static
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-          extra_nix_config: |
-            system = aarch64-linux
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.aarch64-linux.rosenpass-oci-image --print-build-logs
   x86_64-linux---rosenpass-static:
     name: Build x86_64-linux.rosenpass-static
     runs-on:
@@ -378,22 +272,6 @@ jobs:
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build
         run: nix build .#packages.x86_64-linux.rosenpass-static --print-build-logs
-  x86_64-linux---rp-static:
-    name: Build x86_64-linux.rp-static
-    runs-on:
-      - ubuntu-latest
-    needs: []
-    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v22
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v12
-        with:
-          name: rosenpass
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - name: Build
-        run: nix build .#packages.x86_64-linux.rp-static --print-build-logs
   x86_64-linux---rosenpass-static-oci-image:
     name: Build x86_64-linux.rosenpass-static-oci-image
     runs-on:

.github/workflows/qc.yaml

@@ -25,44 +25,6 @@ jobs:
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
 
-  rustfmt:
-    name: Rust Format
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run Rust Formatting Script
-        run: bash format_rust_code.sh --mode check
-
-  cargo-bench:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-        # liboqs requires quite a lot of stack memory, thus we adjust
-        # the default stack size picked for new threads (which is used
-        # by `cargo test`) to be _big enough_. Setting it to 8 MiB
-      - run: RUST_MIN_STACK=8388608 cargo bench --workspace --exclude rosenpass-fuzzing
-
-  mandoc:
-    name: mandoc
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install mandoc
-        run: sudo apt-get install -y mandoc
-      - uses: actions/checkout@v3
-      - name: Check rosenpass.1
-        run: doc/check.sh doc/rosenpass.1
-      - name: Check rp.1
-        run: doc/check.sh doc/rp.1
-
   cargo-audit:
     runs-on: ubuntu-latest
     steps:
@@ -85,6 +47,8 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - run: rustup component add clippy
+      - name: Install libsodium
+        run: sudo apt-get install -y libsodium-dev
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -104,18 +68,15 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - run: rustup component add clippy
+      - name: Install libsodium
+        run: sudo apt-get install -y libsodium-dev
       # `--no-deps` used as a workaround for a rust compiler bug. See:
       # - https://github.com/rosenpass/rosenpass/issues/62
       # - https://github.com/rust-lang/rust/issues/108378
       - run: RUSTDOCFLAGS="-D warnings" cargo doc --no-deps --document-private-items
 
   cargo-test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-13]
-        # - ubuntu is x86-64
-        # - macos-13 is also x86-64 architecture
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
@@ -127,10 +88,12 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install libsodium
+        run: sudo apt-get install -y libsodium-dev
         # liboqs requires quite a lot of stack memory, thus we adjust
         # the default stack size picked for new threads (which is used
         # by `cargo test`) to be _big enough_. Setting it to 8 MiB
-      - run: RUST_MIN_STACK=8388608 cargo test --workspace --all-features
+      - run: RUST_MIN_STACK=8388608 cargo test
 
   cargo-test-nix-devshell-x86_64-linux:
     runs-on:
@@ -153,7 +116,7 @@ jobs:
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-      - run: nix develop --command cargo test --workspace --all-features
+      - run: nix develop --command cargo test
 
   cargo-fuzz:
     runs-on: ubuntu-latest
@@ -168,6 +131,8 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Install libsodium
+        run: sudo apt-get install -y libsodium-dev
       - name: Install nightly toolchain
         run: |
           rustup toolchain install nightly
@@ -181,30 +146,5 @@ jobs:
           cargo fuzz run fuzz_handle_msg -- -max_total_time=5
           ulimit -s 8192000 && RUST_MIN_STACK=33554432000 && cargo fuzz run fuzz_kyber_encaps -- -max_total_time=5
           cargo fuzz run fuzz_mceliece_encaps -- -max_total_time=5
-          cargo fuzz run fuzz_box_secret_alloc_malloc -- -max_total_time=5
-          cargo fuzz run fuzz_box_secret_alloc_memfdsec -- -max_total_time=5
-          cargo fuzz run fuzz_box_secret_alloc_memfdsec_mallocfb -- -max_total_time=5
-          cargo fuzz run fuzz_vec_secret_alloc_malloc -- -max_total_time=5
-          cargo fuzz run fuzz_vec_secret_alloc_memfdsec -- -max_total_time=5
-          cargo fuzz run fuzz_vec_secret_alloc_memfdsec_mallocfb -- -max_total_time=5
-
-  codecov:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: rustup component add llvm-tools-preview
-      - run: |
-          cargo install cargo-llvm-cov || true
-          cargo llvm-cov \
-            --workspace\
-            --all-features \
-            --lcov \
-            --output-path coverage.lcov
-      # If using tarapulin
-      #- run: cargo install cargo-tarpaulin
-      #- run: cargo tarpaulin --out Xml
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
-        with:
-          files: ./coverage.lcov
-          verbose: true
+          cargo fuzz run fuzz_box_sodium_alloc -- -max_total_time=5
+          cargo fuzz run fuzz_vec_sodium_alloc -- -max_total_time=5

.github/workflows/regressions.yml

@@ -1,21 +0,0 @@
-name: QC
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-permissions:
-  checks: write
-  contents: read
-
-jobs:
-  multi-peer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - run: cargo build --bin rosenpass --release
-      - run: python misc/generate_configs.py
-      - run: chmod +x .ci/run-regression.sh
-      - run: .ci/run-regression.sh 100 20
-      - run: |
-          [ $(ls -1 output/ate/out | wc -l) -eq 100 ]

.gitignore

@@ -20,8 +20,3 @@ _markdown_*
 **/result
 **/result-*
 .direnv
-
-# Visual studio code
-.vscode
-
-/output

.mailmap

@@ -1 +0,0 @@
-Clara Engler <cve@cve.cx> <me@emilengler.com>

CONTRIBUTING.md

@@ -1,38 +0,0 @@
-**Making a new Release of Rosenpass — Cooking Recipe**
-
-If you have to change a file, do what it takes to get the change as commit on the main branch, then **start from step 0**.
-If any other issue occurs
-
-0. Make sure you are in the root directory of the project
-   - `cd "$(git rev-parse --show-toplevel)"`
-1. Make sure you locally checked out the head of the main branch
-   - `git stash --include-untracked && git checkout main && git pull`
-2. Make sure all tests pass
-   - `cargo test`
-3. Make sure the current version in `rosenpass/Cargo.toml` matches that in the [last release on GitHub](https://github.com/rosenpass/rosenpass/releases)
-   - Only normal releases count, release candidates and draft releases can be ignored
-4. Pick the kind of release that you want to make (`major`, `minor`, `patch`, `rc`, ...)
-   - See `cargo release --help` for more information on the available release types
-   - Pick `rc` if in doubt
-5. Try to release a new version
-   - `cargo release rc --package rosenpass`
-   - An issue was reported? Go fix it, start again with step 0!
-6. Actually make the release
-   - `cargo release rc --package rosenpass --execute`
-   - Tentatively wait for any interactions, such as entering ssh keys etc.
-   - You may be asked for your ssh key multiple times!
-
-**Frequently Asked Questions (FAQ)**
-
-- You have untracked files, which `cargo release` complains about?
-  - `git stash --include-untracked`
-- You cannot push to crates.io because you are not logged in?
-  - Follow the steps displayed in [`cargo login`](https://doc.rust-lang.org/cargo/commands/cargo-login.html)
-- How is the release page added to [GitHub Releases](https://github.com/rosenpass/rosenpass/releases) itself?
-  - Our CI Pipeline will create the release, once `cargo release` pushed the new version tag to the repo. The new release should pop up almost immediately in [GitHub Releases](https://github.com/rosenpass/rosenpass/releases) after the [Actions/Release](https://github.com/rosenpass/rosenpass/actions/workflows/release.yaml) pipeline started.
-- No new release pops up in the `Release` sidebar element on the [main page](https://github.com/rosenpass/rosenpass)
-  - Did you push a `rc` release? This view only shows non-draft release, but `rc` releases are considered as draft. See [Releases](https://github.com/rosenpass/rosenpass/releases) page to see all (including draft!) releases.
-- The release page was created on GitHub, but there are no assets/artifacts other than the source code tar ball/zip?
-  - The artifacts are generated and pushed automatically to the release, but this takes some time (a couple of minutes). You can check the respective CI pipeline: [Actions/Release](https://github.com/rosenpass/rosenpass/actions/workflows/release.yaml), which should start immediately after `cargo release` pushed the new release tag to the repo. The release artifacts only are added later to the release, once all jobs in bespoke pipeline finished.
-- How are the release artifacts generated, and what are they?
-  - The release artifacts are built using one Nix derivation per platform, `nix build .#release-package`. It contains both statically linked versions of `rosenpass` itself and OCI container images.

Cargo.toml

@@ -7,15 +7,17 @@ members = [
     "ciphers",
     "util",
     "constant-time",
+    "sodium",
     "oqs",
     "to",
     "fuzz",
     "secret-memory",
-    "rp",
-    "wireguard-broker",
+    "lenses",
 ]
 
-default-members = ["rosenpass", "rp", "wireguard-broker"]
+default-members = [
+    "rosenpass"
+]
 
 [workspace.metadata.release]
 # ensure that adding `--package` as argument to `cargo release` still creates version tags in the form of `vx.y.z`
@@ -25,64 +27,34 @@ tag-prefix = ""
 rosenpass = { path = "rosenpass" }
 rosenpass-util = { path = "util" }
 rosenpass-constant-time = { path = "constant-time" }
+rosenpass-sodium = { path = "sodium" }
 rosenpass-cipher-traits = { path = "cipher-traits" }
 rosenpass-ciphers = { path = "ciphers" }
 rosenpass-to = { path = "to" }
 rosenpass-secret-memory = { path = "secret-memory" }
 rosenpass-oqs = { path = "oqs" }
-rosenpass-wireguard-broker = { path = "wireguard-broker" }
+rosenpass-lenses = { path = "lenses" }
+criterion = "0.4.0"
+test_bin = "0.4.0"
+libfuzzer-sys = "0.4"
+stacker = "0.1.15"
 doc-comment = "0.3.3"
-base64ct = {version = "1.6.0", default-features=false}
-zeroize = "1.8.1"
-memoffset = "0.9.1"
-thiserror = "1.0.63"
-paste = "1.0.15"
-env_logger = "0.10.2"
+base64 = "0.21.5"
+zeroize = "1.7.0"
+memoffset = "0.9.0"
+lazy_static = "1.4.0"
+thiserror = "1.0.50"
+paste = "1.0.14"
+env_logger = "0.10.1"
 toml = "0.7.8"
 static_assertions = "1.1.0"
-allocator-api2 = "0.2.14"
-memsec = { git="https://github.com/rosenpass/memsec.git" ,rev="aceb9baee8aec6844125bd6612f92e9a281373df", features = [ "alloc_ext", ] }
+allocator-api2 = "0.2.16"
 rand = "0.8.5"
-typenum = "1.17.0"
-log = { version = "0.4.22" }
-clap = { version = "4.5.16", features = ["derive"] }
-serde = { version = "1.0.208", features = ["derive"] }
+log = { version = "0.4.20" }
+clap = { version = "4.4.10", features = ["derive"] }
+serde = { version = "1.0.193", features = ["derive"] }
 arbitrary = { version = "1.3.2", features = ["derive"] }
-anyhow = { version = "1.0.86", features = ["backtrace", "std"] }
-mio = { version = "1.0.2", features = ["net", "os-poll"] }
-oqs-sys = { version = "0.9.1", default-features = false, features = [
-  'classic_mceliece',
-  'kyber',
-] }
-blake2 = "0.10.6"
-chacha20poly1305 = { version = "0.10.1", default-features = false, features = [
-  "std",
-  "heapless",
-] }
-zerocopy = { version = "0.7.35", features = ["derive"] }
-home = "0.5.9"
-derive_builder = "0.20.0"
-tokio = { version = "1.39", features = ["macros", "rt-multi-thread"] }
-postcard= {version = "1.0.10", features = ["alloc"]}
-libcrux = { version = "0.0.2-pre.2" }
-hex-literal = { version = "0.4.1" }
-hex = { version = "0.4.3" }
-heck = { version = "0.5.0"  }
-libc = { version = "0.2" }
-uds = { git = "https://github.com/rosenpass/uds" }
-
-#Dev dependencies
-serial_test = "3.1.1"
-tempfile = "3"
-stacker = "0.1.16"
-libfuzzer-sys = "0.4"
-test_bin = "0.4.0"
-criterion = "0.4.0"
-allocator-api2-tests = "0.2.15"
-procspawn = {version = "1.0.1", features= ["test-support"]}
-
-
-#Broker dependencies (might need cleanup or changes)
-wireguard-uapi = { version = "3.0.0", features = ["xplatform"] }
-command-fds = "0.2.3"
-rustix = { version = "0.38.27", features = ["net", "fs"] }
+anyhow = { version = "1.0.75", features = ["backtrace", "std"] }
+mio = { version = "0.8.9", features = ["net", "os-poll"] }
+libsodium-sys-stable= { version = "1.20.4", features = ["use-pkg-config"] }
+oqs-sys = { version = "0.8", default-features = false, features = ['classic_mceliece', 'kyber']  }

analysis/03_identity_hiding_initiator.entry.mpv

@@ -1,25 +0,0 @@
-#define INITIATOR_TEST 1
-
-#include "rosenpass/03_identity_hiding.mpv"
-
-// nounif a:Atom, s:seed, a2:Atom;
-// 	ConsumeSeed(a, s, a2) / 6300[conclusion].
-
-nounif v:seed_prec;   attacker(prepare_seed(trusted_seed( v )))/6217[hypothesis].
-nounif v:seed;        attacker(prepare_seed( v ))/6216[hypothesis].
-nounif v:seed;        attacker(rng_kem_sk( v ))/6215[hypothesis].
-nounif v:seed;        attacker(rng_key( v ))/6214[hypothesis].
-nounif v:key_prec;    attacker(prepare_key(trusted_key( v )))/6213[hypothesis].
-nounif v:kem_sk_prec; attacker(prepare_kem_sk(trusted_kem_sk( v )))/6212[hypothesis].
-nounif v:key;         attacker(prepare_key( v ))/6211[hypothesis].
-nounif v:kem_sk;      attacker(prepare_kem_sk( v ))/6210[hypothesis].
-nounif Spk:kem_sk_tmpl;
-  attacker(Creveal_kem_pk(Spk))/6110[conclusion].
-nounif sid:SessionId, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Seski:seed_tmpl, Ssptr:seed_tmpl;
-  attacker(Cinitiator( *sid, *Ssskm, *Spsk, *Sspkt, *Seski, *Ssptr ))/6109[conclusion].
-nounif sid:SessionId, biscuit_no:Atom, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Septi:seed_tmpl, Sspti:seed_tmpl, ih:InitHello_t;
-  attacker(Cinit_hello( *sid, *biscuit_no, *Ssskm, *Spsk, *Sspkt, *Septi, *Sspti, *ih ))/6108[conclusion].
-nounif rh:RespHello_t;
-  attacker(Cresp_hello( *rh ))/6107[conclusion].
-nounif Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, ic:InitConf_t;
-  attacker(Cinit_conf( *Ssskm, *Spsk, *Sspkt, *ic ))/6106[conclusion].

analysis/03_identity_hiding_responder.entry.mpv

@@ -1,96 +0,0 @@
-#define RESPONDER_TEST 1
-
-#include "rosenpass/03_identity_hiding.mpv"
-
-// select k:kem_pk,ih: InitHello_t;         attacker(prf(prf(prf(prf(key0, PROTOCOL), MAC), kem_pk2b(k) ), IH2b(ih))) phase 1/6300[hypothesis].
-
-// select epki:kem_pk, sctr:bits, pidiC:bits, auth:bits, epki2:kem_pk, sctr2:bits, pidiC2:bits, auth2:bits;
-// 	mess(D, prf(prf(prf(prf(key0,PROTOCOL),MAC),kem_pk2b(kem_pub(trusted_kem_sk(responder1)))),
-// 			IH2b(InitHello(secure_sidi, *epki, *sctr, *pidiC, *auth)))
-// 		) [hypothesis, conclusion].
-
-// select epki:kem_pk, sctr:bits, pidiC:bits, auth:bits, epki2:kem_pk, sctr2:bits, pidiC2:bits, auth2:bits;
-// attacker(choice[prf(prf(prf(prf(key0,PROTOCOL),MAC),kem_pk2b(kem_pub(trusted_kem_sk(responder1)))),
-// 		IH2b(InitHello(secure_sidi, *epki, *sctr, *pidiC, *auth))),
-
-// 		prf(prf(prf(prf(key0,PROTOCOL),MAC),kem_pk2b(kem_pub(trusted_kem_sk(responder2)))),
-// 				IH2b(InitHello(secure_sidi, *epki2, *sctr2, *pidiC2, *auth2)))]
-// 	) [hypothesis, conclusion].
-
-// select 
-// attacker(prf(prf(key0,PROTOCOL),MAC)) [hypothesis, conclusion].
-
-// select 
-// attacker(prf(key0,PROTOCOL)) [conclusion].
-
-// select  
-// attacker(key0) [conclusion].
-
-// select  
-// attacker(PROTOCOL) [conclusion].
-
-// select 
-// attacker(kem_pub(trusted_kem_sk(responder1))) /9999 [hypothesis, conclusion].
-
-// select 
-// attacker(kem_pub(trusted_kem_sk(responder2))) /9999 [hypothesis, conclusion].
-
-// nounif ih:InitHello_t;
-// 	attacker(ih) / 9999 [hypothesis].
-
-// nounif rh:RespHello_t;
-// 	attacker(rh) / 9999 [hypothesis].
-
-// nounif ic:InitConf_t;
-// 	attacker(ic) / 9999 [hypothesis].
-
-// nounif k:key;
-// attacker(ck_hs_enc( *k )) [hypothesis, conclusion].
-
-// nounif k:key;
-// attacker(ck_hs_enc( *k )) phase 1   [hypothesis, conclusion].
-
-// nounif k:key, b:bits;
-// attacker(ck_mix( *k , *b ))   [hypothesis, conclusion].
-
-// nounif k:key, b:bits;
-// attacker(ck_mix( *k , *b ))phase 1   [hypothesis, conclusion].
-
-// // select k:kem_pk, epki2:kem_pk, sctr2:bits, pidiC2:bits, auth2:bits, epki:kem_pk, sctr:bits, pidiC:bits, auth:bits;
-// // attacker(choice[Envelope(prf(prf(prf(prf(key0,PROTOCOL),MAC),kem_pub(trusted_kem_sk(responder1))),
-// // 	InitHello(secure_sidi, *epki2, *sctr2, *pidiC2, *auth2)
-// // 	), InitHello(secure_sidi, *epki2, *sctr2, *pidiC2, *auth2))
-// // 	Envelope(prf(prf(prf(prf(key0,PROTOCOL),MAC),kem_pub(trusted_kem_sk(responder2))),
-// // 		InitHello(secure_sidi, *epki, *sctr, *pidiC, *auth)),
-// // 		InitHello(secure_sidi, *epki, *sctr, *pidiC, *auth))
-// // 	]) / 9999[hypothesis, conclusion].
-
-// nounif k:key, b1:bits, b2:bits;
-// 	attacker(xaead_enc( *k, *b1, *b2)) / 9999[hypothesis,conclusion].
-
-// nounif pk:kem_pk, k:key; 
-// 	attacker(kem_enc( *pk , *k )) / 9999[hypothesis,conclusion].
-
-// nounif sid:SessionId, biscuit_no:Atom, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Septi:seed_tmpl, Sspti:seed_tmpl, ih:InitHello_t;
-//   attacker(Cinit_hello( *sid, *biscuit_no, *Ssskm, *Spsk, *Sspkt, *Septi, *Sspti, *ih ))/9999[hypothesis, conclusion].
-// nounif Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, ic:InitConf_t;
-//   attacker(Cinit_conf( *Ssskm, *Spsk, *Sspkt, *ic ))/9999[hypothesis, conclusion].
-// nounif sid:SessionId, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Seski:seed_tmpl, Ssptr:seed_tmpl;
-//   attacker(Cinitiator( *sid, *Ssskm, *Spsk, *Sspkt, *Seski, *Ssptr )) /9999 [hypothesis, conclusion].
-
-// nounif sid:SessionId, biscuit_no:Atom, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Septi:seed_tmpl, Sspti:seed_tmpl, ih:InitHello_t;
-//   mess(C, Cinit_hello( *sid, *biscuit_no, *Ssskm, *Spsk, *Sspkt, *Septi, *Sspti, *ih ))/9999[hypothesis, conclusion].
-// nounif Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, ic:InitConf_t;
-//   mess(C, Cinit_conf( *Ssskm, *Spsk, *Sspkt, *ic ))/9999[hypothesis, conclusion].
-// nounif sid:SessionId, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Seski:seed_tmpl, Ssptr:seed_tmpl;
-//   mess(C, Cinitiator( *sid, *Ssskm, *Spsk, *Sspkt, *Seski, *Ssptr )) /9999 [hypothesis, conclusion].
-// nounif rh:RespHello_t;
-//   attacker(Cresp_hello( *rh ))[conclusion].
-// nounif v:seed_prec;   attacker(prepare_seed(trusted_seed( v )))/6217[hypothesis].
-// nounif v:seed;        attacker(prepare_seed( v ))/6216[hypothesis].
-// nounif v:seed;        attacker(rng_kem_sk( v ))/6215[hypothesis].
-// nounif v:seed;        attacker(rng_key( v ))/6214[hypothesis].
-// nounif v:key_prec;    attacker(prepare_key(trusted_key( v )))/6213[hypothesis].
-// nounif v:kem_sk_prec; attacker(prepare_kem_sk(trusted_kem_sk( v )))/6212[hypothesis].
-// nounif v:key;         attacker(prepare_key( v ))/6211[hypothesis].
-// nounif v:kem_sk;      attacker(prepare_kem_sk( v ))/6210[hypothesis].

analysis/03_identity_hiding_test.entry.mpv

@@ -1,29 +0,0 @@
-#define INITIATOR_TEST 1
-#define CUSTOM_MAIN 1
-
-#include "rosenpass/03_identity_hiding.mpv"
-
-let Oinitiator_bad_actor_inner(sk_tmp:kem_sk_prec) =
-
-  in(C, Cinitiator(sidi, Ssskm, Spsk, Sspkt, Seski, Ssptr));
-
-  #if RANDOMIZED_CALL_IDS
-    new call:Atom;
-  #else
-    call <- Cinitiator(sidi, Ssskm, Spsk, Sspkt, Seski, Ssptr);
-  #endif
-
-  in(C, last_cookie:key);
-  tmpl <- make_trusted_kem_sk(sk_tmp);
-  out(C, setup_kem_sk(tmpl));
-  Oinitiator_inner(sidi, Ssskm, Spsk, tmpl, Seski, Ssptr, last_cookie, C, call).
-
-let Oinitiator_bad_actor() =
-  Oinitiator_bad_actor_inner(responder1) | Oinitiator_bad_actor_inner(responder2) | Oinitiator_bad_actor_inner(initiator1) | Oinitiator_bad_actor_inner(initiator2).
-
-
-let identity_hiding_main2() = 
-  0 | Oinitiator_bad_actor() | rosenpass_main2() | participants_communication() | phase 1; secretCommunication().
-
-
-let main = identity_hiding_main2.

analysis/04_dos_protection.entry.mpv

@@ -1,136 +0,0 @@
-#define CHAINING_KEY_EVENTS 1
-#define MESSAGE_TRANSMISSION_EVENTS 0
-#define SESSION_START_EVENTS 0
-#define RANDOMIZED_CALL_IDS 0
-#define COOKIE_EVENTS 1
-#define KEM_EVENTS 1
-
-#include "config.mpv"
-#include "prelude/basic.mpv"
-#include "crypto/key.mpv"
-#include "crypto/kem.mpv"
-#include "rosenpass/handshake_state.mpv"
-
-/* The cookie data structure is implemented based on the WireGuard protocol.
- * The ip and port is based purely on the public key and the implementation of the private cookie key is intended to mirror the biscuit key.
- * The code tests the response to a possible DOS attack by setting up alternative branches for the protocol
- * processes: Oinit_conf, Oinit_hello and resp_hello to simulate what happens when the responder or initiator is overloaded.
- * When under heavy load a valid cookie is required. When such a cookie is not present a cookie message is sent as a response.
- * Queries then test to make sure that expensive KEM operations are only conducted after a cookie has been successfully validated.
- */
-
-type CookieMsg_t.
-fun CookieMsg(
-  SessionId,  // sender
-  bits,     // nonce
-  bits      // cookie
-) : CookieMsg_t [data].
-
-#define COOKIE_EVENTS(eventLbl) \
-  COOKIE_EV(event MCAT(eventLbl, _UnderLoadEV) (SessionId, SessionId, Atom).)   \
-  COOKIE_EV(event MCAT(eventLbl, _CookieValidated) (SessionId, SessionId, Atom).)   \
-  COOKIE_EV(event MCAT(eventLbl, _CookieSent) (SessionId, SessionId, Atom, CookieMsg_t).)
-
-fun cookie_key(kem_sk) : key [private].
-fun ip_and_port(kem_pk):bits.
-letfun create_mac2_key(sskm:kem_sk, spkt:kem_pk) = prf(cookie_key(sskm), ip_and_port(spkt)).
-letfun create_cookie(sskm:kem_sk, spkm:kem_pk, spkt:kem_pk, nonce:bits, msg:bits) = xaead_enc(lprf2(COOKIE, kem_pk2b(spkm), nonce),
-    k2b(create_mac2_key(sskm, spkm)), msg).
-
-#define COOKIE_PROCESS(eventLbl, innerFunc) \
-  new nonce:bits; \
-  in(C, Ccookie(mac1, mac2)); \
-  COOKIE_EV(event MCAT(eventLbl, _UnderLoadEV) (sidi, sidr, call);)  \
-  msgB <- Envelope(mac1, msg); \
-  mac2_key <- create_mac2_key(sskm, spkt); \
-  if k2b(create_mac2(mac2_key, msgB)) = mac2 then  \
-    COOKIE_EV(event MCAT(eventLbl, _CookieValidated) (sidi, sidr, call);)  \
-    innerFunc \
-  else \
-    cookie <- create_cookie(sskm, spkm, spkt, nonce, msg); \
-    cookie_msg <- CookieMsg(sidi, nonce, cookie); \
-    COOKIE_EV(event MCAT(eventLbl, _CookieSent) (sidi, sidr, call, cookie_msg);)  \
-    out(C, cookie_msg). \
-
-#include "rosenpass/oracles.mpv"
-
-#include "rosenpass/responder.macro"
-COOKIE_EVENTS(Oinit_conf)
-let Oinit_conf_underLoad() =
-  in(C, Cinit_conf(Ssskm, Spsk, Sspkt, ic));
-  in(C, last_cookie:bits);
-
-  msg <- IC2b(ic);
-  let InitConf(sidi, sidr, biscuit, auth) = ic in 
-
-  new call:Atom;
-
-  SETUP_HANDSHAKE_STATE()
-
-  COOKIE_PROCESS(Oinit_conf, Oinit_conf_inner(Ssskm, Spsk, Sspkt, ic, call))
-
-#include "rosenpass/responder.macro"
-COOKIE_EVENTS(Oinit_hello)
-let Oinit_hello_underLoad() =
-
-  in(C, Cinit_hello(sidr, biscuit_no, Ssskm, Spsk, Sspkt, Septi, Sspti, ih));
-  in(C, Oinit_hello_last_cookie:key);
-  new call:Atom;
-
-  msg <- IH2b(ih);
-  let InitHello(sidi, epki, sctr, pidic, auth) = ih in
-  SETUP_HANDSHAKE_STATE()
-
-  COOKIE_PROCESS(Oinit_hello, Oinit_hello_inner(sidr, biscuit_no, Ssskm, Spsk, Sspkt, Septi, Sspti, ih, Oinit_hello_last_cookie, C, call))
-
-let rosenpass_dos_main() = 0
-  | !Oreveal_kem_pk
-  | REP(INITIATOR_BOUND, Oinitiator)
-  | REP(RESPONDER_BOUND, Oinit_hello)
-  | REP(RESPONDER_BOUND, Oinit_conf)
-  | REP(RESPONDER_BOUND, Oinit_hello_underLoad)
-  | REP(RESPONDER_BOUND, Oinit_conf_underLoad).
-
-let main = rosenpass_dos_main.
-
-select cookie:CookieMsg_t;         attacker(cookie)/6220[hypothesis].
-nounif v:key;         attacker(prepare_key( v ))/6217[hypothesis].
-nounif v:seed;        attacker(prepare_seed( v ))/6216[hypothesis].
-nounif v:seed;        attacker(prepare_seed( v ))/6216[hypothesis].
-nounif v:seed;        attacker(rng_kem_sk( v ))/6215[hypothesis].
-nounif v:seed;        attacker(rng_key( v ))/6214[hypothesis].
-nounif v:kem_sk;      attacker(prepare_kem_sk( v ))/6210[hypothesis].
-
-// nounif Spk:kem_sk_tmpl;
-//   attacker(Creveal_kem_pk(Spk))/6110[conclusion].
-// nounif sid:SessionId, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Seski:seed_tmpl, Ssptr:seed_tmpl;
-//   attacker(Cinitiator( *sid, *Ssskm, *Spsk, *Sspkt, *Seski, *Ssptr ))/6109[conclusion].
-// nounif sid:SessionId, biscuit_no:Atom, Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, Septi:seed_tmpl, Sspti:seed_tmpl, ih:InitHello_t;
-//   attacker(Cinit_hello( *sid, *biscuit_no, *Ssskm, *Spsk, *Sspkt, *Septi, *Sspti, *ih ))/6108[conclusion].
-nounif rh:RespHello_t;
-  attacker(Cresp_hello( *rh ))/6107[conclusion].
-nounif Ssskm:kem_sk_tmpl, Spsk:key_tmpl, Sspkt:kem_sk_tmpl, ic:InitConf_t;
-  attacker(Cinit_conf( *Ssskm, *Spsk, *Sspkt, *ic ))/6106[conclusion].
-
-@reachable "DOS protection: cookie sent"
-query sidi:SessionId, sidr:SessionId, call:Atom, cookieMsg:CookieMsg_t;
-  event (Oinit_hello_CookieSent(sidi, sidr, call, cookieMsg)).
-
-@lemma "DOS protection: Oinit_hello kem use when under load implies validated cookie"
-lemma sidi:SessionId, sidr:SessionId, call:Atom;
-event(Oinit_hello_UnderLoadEV(sidi, sidr, call))
-  && event(Oinit_hello_KemUse(sidi, sidr, call))
-  ==> event(Oinit_hello_CookieValidated(sidi, sidr, call)).
-
-@lemma "DOS protection: Oinit_conf kem use when under load implies validated cookie"
-lemma sidi:SessionId, sidr:SessionId, call:Atom;
-event(Oinit_conf_UnderLoadEV(sidi, sidr, call))
-  && event(Oinit_conf_KemUse(sidi, sidr, call))
-  ==> event(Oinit_conf_CookieValidated(sidi, sidr, call)).
-
-@lemma "DOS protection: Oresp_hello kem use when under load implies validated cookie"
-lemma sidi:SessionId, sidr:SessionId, call:Atom;
-event(Oresp_hello_UnderLoadEV(sidi, sidr, call))
-  && event(Oresp_hello_KemUse(sidi, sidr, call))
-  ==> event(Oresp_hello_CookieValidated(sidi, sidr, call)).
-

analysis/rosenpass/03_identity_hiding.mpv

@@ -1,155 +0,0 @@
-/*
-  This identity hiding process tests whether the rosenpass protocol is able to protect the identity of an initiator or responder.
-  The participants in the test are trusted initiators, trusted responders and compromised initiators and responders.
-  The test consists of two phases. In the first phase all of the participants can communicate with each other using the rosenpass protocol.
-  An attacker observes the first phase and is able to intercept and modify messages and choose participants to communicate with each other
-
-  In the second phase if the anonymity of an initiator is being tested then one of two trusted initiators is chosen.
-  The chosen initiator communicates directly with a trusted responder.
-  If an attacker can determine which initiator was chosen then the anonymity of the initiator has been compromised.
-  Otherwise the protocol has successfully protected the initiators’ identity.
-
-  If the anonymity of a responder is being tested then one of two trusted responders is chosen instead.
-  Then an initiator communicates directly with the chosen responder.
-  If an attacker can determine which responder was chosen then the anonymity of the responder is compromised.
-  Otherwise the protocol successfully protects the identity of a responder.
-
-  The Proverif code treats the public key as synonymous with identity.
-  In the above test when a responder or initiator is chosen what is actually chosen is the public/private key pair to use for communication.
-  Traditionally when a responder or initiator is chosen they would be chosen randomly.
-  The way Proverif makes a "choice" is by simulating multiple processes, one process per choice
-  Then the processes are compared and if an association between a public key and a process can be made the test fails.
-  As the choice is at least as bad as choosing the worst possible option the credibility of the test is maintained.
-  The drawback is that Proverif is only able to tell if the identity can be brute forced but misses any probabilistic associations.
-  As usual Proverif also assumes perfect encryption and in particular assumes encryption cannot be linked to identity.
-
-  One of the tradeoffs made here is that the choice function in Proverif is slow but this is in favour of being able to write more precise tests.
-  Another issue is the choice function does not work with queries so a test needs to be run for each set of assumptions.
-  In this case the test uses secure rng and a fresh secure biscuit key.
-*/
-
-#include "config.mpv"
-
-#define CHAINING_KEY_EVENTS 1
-#define MESSAGE_TRANSMISSION_EVENTS 1
-#define SESSION_START_EVENTS 0
-#define RANDOMIZED_CALL_IDS 0
-#undef FULL_MODEL
-#undef SIMPLE_MODEL
-#define SIMPLE_MODEL 1
-
-#include "prelude/basic.mpv"
-#include "crypto/key.mpv"
-#include "rosenpass/oracles.mpv"
-#include "crypto/kem.mpv"
-
-#define NEW_TRUSTED_SEED(name)            \
-  new MCAT(name, _secret_seed):seed_prec; \
-  name <- make_trusted_seed(MCAT(name, _secret_seed)); \
-
-free D:channel [private].
-free secure_biscuit_no:Atom [private].
-free secure_sidi,secure_sidr:SessionId [private].
-free secure_psk:key [private].
-free initiator1, initiator2:kem_sk_prec.
-free responder1, responder2:kem_sk_prec.
-
-let secure_init_hello(initiator: kem_sk_tmpl, sidi : SessionId, psk: key_tmpl, responder: kem_sk_tmpl) =
-
-  new epkit:kem_pk;    // epki
-  new sctrt:bits;      // sctr 
-  new pidiCt:bits;      // pidiC
-  new autht:bits;       // auth
-
-  NEW_TRUSTED_SEED(seski_trusted_seed)
-  NEW_TRUSTED_SEED(ssptr_trusted_seed)
-  new last_cookie:key;
-  new call:Atom;
-
-  Oinitiator_inner(sidi, initiator, psk, responder, seski_trusted_seed, ssptr_trusted_seed, last_cookie, D, call).
-
-let secure_resp_hello(initiator: kem_sk_tmpl, responder: kem_sk_tmpl, sidi:SessionId, sidr:SessionId, biscuit_no:Atom, psk:key_tmpl) =
-
-  in(D, InitHello(=secure_sidi, epki, sctr, pidiC, auth));
-
-  ih <- InitHello(sidi, epki, sctr, pidiC, auth);
-  NEW_TRUSTED_SEED(septi_trusted_seed)
-  NEW_TRUSTED_SEED(sspti_trusted_seed)
-  new last_cookie:key;
-  new call:Atom;
-
-  Oinit_hello_inner(sidr, biscuit_no, responder, psk, initiator, septi_trusted_seed, sspti_trusted_seed, ih, last_cookie, D, call).
-
-let secure_init_conf(initiator: kem_sk_tmpl, responder: kem_sk_tmpl, psk:key_tmpl, sidi:SessionId, sidr:SessionId) =
-  in(D,  InitConf(=sidi, =sidr, biscuit, auth3));
-  ic <- InitConf(sidi,sidr,biscuit, auth3);
-  NEW_TRUSTED_SEED(seski_trusted_seed)
-  NEW_TRUSTED_SEED(ssptr_trusted_seed)
-  new last_cookie:key;
-  call <- Cinit_conf(initiator, psk, responder, ic);
-
-  Oinit_conf_inner(initiator, psk, responder, ic, call).
-
-let secure_communication(initiator: kem_sk_tmpl, responder:kem_sk_tmpl, key:key) =
-  key_tmpl <- prepare_key(key);
-  (!secure_init_hello(initiator, secure_sidi, key_tmpl, responder))
-  | !secure_resp_hello(initiator, responder, secure_sidi, secure_sidr, secure_biscuit_no, key_tmpl)
-  | !(secure_init_conf(initiator, responder, key_tmpl, secure_sidi, secure_sidr)).
-
-let participant_communication_initiator(participant:kem_sk_tmpl) =
-  in(C, responder:kem_sk_tmpl);
-  in(C, k:key);
-  secure_communication(participant, responder, k).
-
-let participant_communication_responder(participant:kem_sk_tmpl) =
-  in(C, initiator:kem_sk_tmpl);
-  in(C, k:key);
-  secure_communication(initiator, participant, k).
-
-let participants_communication() =
-  initiator1_tmpl <- make_trusted_kem_sk(initiator1);
-  initiator2_tmpl <- make_trusted_kem_sk(initiator2);
-  responder1_tmpl <- make_trusted_kem_sk(responder1);
-  responder2_tmpl <- make_trusted_kem_sk(responder2);
-
-  !participant_communication_initiator(initiator1_tmpl) | !participant_communication_responder(initiator1_tmpl)
-  | !participant_communication_initiator(initiator2_tmpl) | !participant_communication_responder(initiator2_tmpl)
-  | !participant_communication_initiator(responder1_tmpl) | !participant_communication_responder(responder1_tmpl)
-  | !participant_communication_initiator(responder2_tmpl) | !participant_communication_responder(responder2_tmpl).
-
-let pipeChannel(D:channel, C:channel) =
-  in(D, b:bits);
-  out(C, b).
-
-let secretCommunication() =
-
-#ifdef INITIATOR_TEST
-  initiator_seed <- choice[make_trusted_kem_sk(initiator1), make_trusted_kem_sk(initiator2)];
-#else
-  initiator_seed <- make_trusted_kem_sk(initiator1);
-#endif
-#ifdef RESPONDER_TEST
-  responder_seed <- choice[make_trusted_kem_sk(responder1), make_trusted_kem_sk(responder2)];
-#else
-  responder_seed <- make_trusted_kem_sk(responder1);
-#endif
-
-  secure_communication(initiator_seed, responder_seed, secure_psk) | !pipeChannel(D, C).
-
-let reveal_pks() =
-  out(C, setup_kem_pk(make_trusted_kem_sk(responder1)));
-  out(C, setup_kem_pk(make_trusted_kem_sk(responder2)));
-  out(C, setup_kem_pk(make_trusted_kem_sk(initiator1)));
-  out(C, setup_kem_pk(make_trusted_kem_sk(initiator2))).
-
-let rosenpass_main2() = 
-  REP(INITIATOR_BOUND, Oinitiator)
-  | REP(RESPONDER_BOUND, Oinit_hello)
-  | REP(RESPONDER_BOUND, Oinit_conf).
-
-let identity_hiding_main() = 
-  0 | reveal_pks() | rosenpass_main2() | participants_communication() | phase 1; secretCommunication().
-
-#ifndef CUSTOM_MAIN
-let main = identity_hiding_main.
-#endif 

analysis/rosenpass/cookie.mpv

@@ -1,36 +0,0 @@
-
-fun cookie_key(kem_sk) : key [private].
-fun ip_and_port(kem_pk):bits.
-letfun create_mac2_key(sskm:kem_sk, spkt:kem_pk) = prf(cookie_key(sskm), ip_and_port(spkt)).
-
-letfun create_cookie(sskm:kem_sk, spkm:kem_pk, spkt:kem_pk, nonce:bits, msg:bits) = xaead_enc(lprf2(COOKIE, kem_pk2b(spkm), nonce),
-    k2b(create_mac2_key(sskm, spkm)), msg).
-
-type CookieMsg_t.
-fun CookieMsg(
-  SessionId,	// sender
-  bits, 		// nonce
-  bits			// cookie
-) : CookieMsg_t [data].
-
-
-#define COOKIE_PROCESS(eventLbl, innerFunc)       \
-  in(C, Ccookie(mac1, mac2));	\
-  COOKIE_EV(event MCAT(eventLbl, _UnderLoadEV) (spkm, spkt, last_cookie);)	\
-  msgB <- Envelope(mac1, RH2b(rh));	\
-  mac2_key <- create_mac2_key(sskm, spkt)	\
-  let RespHello(sidi, sidr, ecti, scti, biscuit, auth) = rh in \
-  if Envelope(mac2_key, msgB) = mac2 then	\
-    COOKIE_EV(event MCAT(eventLbl, _CookieValidated) (spkm, last_cookie);)	\
-    innerFunc	\
-  else	\
-    new nonce:bits;	\
-    cookie <- create_cookie(sskm, spkm, spkt, nonce, msg)	\
-    cookie_msg <- CookieMsg(sidi, nonce, cookie);	\
-    COOKIE_EV(event MCAT(eventLbl, _CookieSent) (spkm, cookie, cookie_k, cookie_msg);)	\
-    out(C, cookie_msg).	
-
-#define COOKIE_EVENTS(eventLbl) \
-	COOKIE_EV(event MCAT(eventLbl, _UnderLoadEV) (kem_pk, kem_pk, bits).)		\
-	COOKIE_EV(event MCAT(eventLbl, _CookieValidated) (kem_pk, bits, key, CookieMsg_t).)		\
-	COOKIE_EV(event MCAT(eventLbl, _CookieSent) (kem_pk, bits).)		

cipher-traits/readme.md

@@ -1,4 +1,4 @@
-# Rosenpass internal cryptographic traits
+# Rosenpass internal libsodium bindings
 
 Rosenpass internal library providing traits for cryptographic primitives.
 

cipher-traits/src/kem.rs

@@ -10,6 +10,8 @@
 //! The [KEM] Trait describes the basic API offered by a Key Encapsulation
 //! Mechanism. Two implementations for it are provided, [StaticKEM] and [EphemeralKEM].
 
+use std::result::Result;
+
 /// Key Encapsulation Mechanism
 ///
 /// The KEM interface defines three operations: Key generation, key encapsulation and key

ciphers/Cargo.toml

@@ -9,18 +9,12 @@ homepage = "https://rosenpass.eu/"
 repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
-[features]
-experiment_libcrux = ["dep:libcrux"]
-
 [dependencies]
 anyhow = { workspace = true }
+rosenpass-sodium = { workspace = true }
 rosenpass-to = { workspace = true }
 rosenpass-constant-time = { workspace = true }
 rosenpass-secret-memory = { workspace = true }
 rosenpass-oqs = { workspace = true }
-rosenpass-util = { workspace = true }
 static_assertions = { workspace = true }
 zeroize = { workspace = true }
-chacha20poly1305 = { workspace = true }
-blake2 = { workspace = true }
-libcrux = { workspace = true, optional = true } 

ciphers/src/lib.rs

@@ -9,17 +9,14 @@ const_assert!(KEY_LEN == hash_domain::KEY_LEN);
 
 /// Authenticated encryption with associated data
 pub mod aead {
-    #[cfg(not(feature = "experiment_libcrux"))]
-    pub use crate::subtle::chacha20poly1305_ietf::{decrypt, encrypt, KEY_LEN, NONCE_LEN, TAG_LEN};
-    #[cfg(feature = "experiment_libcrux")]
-    pub use crate::subtle::chacha20poly1305_ietf_libcrux::{
+    pub use rosenpass_sodium::aead::chacha20poly1305_ietf::{
         decrypt, encrypt, KEY_LEN, NONCE_LEN, TAG_LEN,
     };
 }
 
 /// Authenticated encryption with associated data with a constant nonce
 pub mod xaead {
-    pub use crate::subtle::xchacha20poly1305_ietf::{
+    pub use rosenpass_sodium::aead::xchacha20poly1305_ietf::{
         decrypt, encrypt, KEY_LEN, NONCE_LEN, TAG_LEN,
     };
 }

ciphers/src/subtle/blake2b.rs

@@ -1,42 +0,0 @@
-use zeroize::Zeroizing;
-
-use blake2::digest::crypto_common::generic_array::GenericArray;
-use blake2::digest::crypto_common::typenum::U32;
-use blake2::digest::crypto_common::KeySizeUser;
-use blake2::digest::{FixedOutput, Mac, OutputSizeUser};
-use blake2::Blake2bMac;
-
-use rosenpass_to::{ops::copy_slice, with_destination, To};
-use rosenpass_util::typenum2const;
-
-type Impl = Blake2bMac<U32>;
-
-type KeyLen = <Impl as KeySizeUser>::KeySize;
-type OutLen = <Impl as OutputSizeUser>::OutputSize;
-
-const KEY_LEN: usize = typenum2const! { KeyLen };
-const OUT_LEN: usize = typenum2const! { OutLen };
-
-pub const KEY_MIN: usize = KEY_LEN;
-pub const KEY_MAX: usize = KEY_LEN;
-pub const OUT_MIN: usize = OUT_LEN;
-pub const OUT_MAX: usize = OUT_LEN;
-
-#[inline]
-pub fn hash<'a>(key: &'a [u8], data: &'a [u8]) -> impl To<[u8], anyhow::Result<()>> + 'a {
-    with_destination(|out: &mut [u8]| {
-        let mut h = Impl::new_from_slice(key)?;
-        h.update(data);
-
-        // Jesus christ, blake2 crate, your usage of GenericArray might be nice and fancy
-        // but it introduces a ton of complexity. This cost me half an hour just to figure
-        // out the right way to use the imports while allowing for zeroization.
-        // An API based on slices might actually be simpler.
-        let mut tmp = Zeroizing::new([0u8; OUT_LEN]);
-        let tmp = GenericArray::from_mut_slice(tmp.as_mut());
-        h.finalize_into(tmp);
-        copy_slice(tmp.as_ref()).to(out);
-
-        Ok(())
-    })
-}

ciphers/src/subtle/chacha20poly1305_ietf.rs

@@ -1,43 +0,0 @@
-use rosenpass_to::ops::copy_slice;
-use rosenpass_to::To;
-use rosenpass_util::typenum2const;
-
-use chacha20poly1305::aead::generic_array::GenericArray;
-use chacha20poly1305::ChaCha20Poly1305 as AeadImpl;
-use chacha20poly1305::{AeadCore, AeadInPlace, KeyInit, KeySizeUser};
-
-pub const KEY_LEN: usize = typenum2const! { <AeadImpl as KeySizeUser>::KeySize };
-pub const TAG_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::TagSize };
-pub const NONCE_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::NonceSize };
-
-#[inline]
-pub fn encrypt(
-    ciphertext: &mut [u8],
-    key: &[u8],
-    nonce: &[u8],
-    ad: &[u8],
-    plaintext: &[u8],
-) -> anyhow::Result<()> {
-    let nonce = GenericArray::from_slice(nonce);
-    let (ct, mac) = ciphertext.split_at_mut(ciphertext.len() - TAG_LEN);
-    copy_slice(plaintext).to(ct);
-    let mac_value = AeadImpl::new_from_slice(key)?.encrypt_in_place_detached(nonce, ad, ct)?;
-    copy_slice(&mac_value[..]).to(mac);
-    Ok(())
-}
-
-#[inline]
-pub fn decrypt(
-    plaintext: &mut [u8],
-    key: &[u8],
-    nonce: &[u8],
-    ad: &[u8],
-    ciphertext: &[u8],
-) -> anyhow::Result<()> {
-    let nonce = GenericArray::from_slice(nonce);
-    let (ct, mac) = ciphertext.split_at(ciphertext.len() - TAG_LEN);
-    let tag = GenericArray::from_slice(mac);
-    copy_slice(ct).to(plaintext);
-    AeadImpl::new_from_slice(key)?.decrypt_in_place_detached(nonce, ad, plaintext, tag)?;
-    Ok(())
-}

ciphers/src/subtle/chacha20poly1305_ietf_libcrux.rs

@@ -1,60 +0,0 @@
-use rosenpass_to::ops::copy_slice;
-use rosenpass_to::To;
-
-use zeroize::Zeroize;
-
-pub const KEY_LEN: usize = 32; // Grrrr! Libcrux, please provide me these constants.
-pub const TAG_LEN: usize = 16;
-pub const NONCE_LEN: usize = 12;
-
-#[inline]
-pub fn encrypt(
-    ciphertext: &mut [u8],
-    key: &[u8],
-    nonce: &[u8],
-    ad: &[u8],
-    plaintext: &[u8],
-) -> anyhow::Result<()> {
-    let (ciphertext, mac) = ciphertext.split_at_mut(ciphertext.len() - TAG_LEN);
-
-    use libcrux::aead as C;
-    let crux_key = C::Key::Chacha20Poly1305(C::Chacha20Key(key.try_into().unwrap()));
-    let crux_iv = C::Iv(nonce.try_into().unwrap());
-
-    copy_slice(plaintext).to(ciphertext);
-    let crux_tag = libcrux::aead::encrypt(&crux_key, ciphertext, crux_iv, ad).unwrap();
-    copy_slice(crux_tag.as_ref()).to(mac);
-
-    match crux_key {
-        C::Key::Chacha20Poly1305(mut k) => k.0.zeroize(),
-        _ => panic!(),
-    }
-
-    Ok(())
-}
-
-#[inline]
-pub fn decrypt(
-    plaintext: &mut [u8],
-    key: &[u8],
-    nonce: &[u8],
-    ad: &[u8],
-    ciphertext: &[u8],
-) -> anyhow::Result<()> {
-    let (ciphertext, mac) = ciphertext.split_at(ciphertext.len() - TAG_LEN);
-
-    use libcrux::aead as C;
-    let crux_key = C::Key::Chacha20Poly1305(C::Chacha20Key(key.try_into().unwrap()));
-    let crux_iv = C::Iv(nonce.try_into().unwrap());
-    let crux_tag = C::Tag::from_slice(mac).unwrap();
-
-    copy_slice(ciphertext).to(plaintext);
-    libcrux::aead::decrypt(&crux_key, plaintext, crux_iv, ad, &crux_tag).unwrap();
-
-    match crux_key {
-        C::Key::Chacha20Poly1305(mut k) => k.0.zeroize(),
-        _ => panic!(),
-    }
-
-    Ok(())
-}

ciphers/src/subtle/incorrect_hmac_blake2b.rs

@@ -1,10 +1,8 @@
 use anyhow::ensure;
-use zeroize::Zeroizing;
-
 use rosenpass_constant_time::xor;
+use rosenpass_sodium::hash::blake2b;
 use rosenpass_to::{ops::copy_slice, with_destination, To};
-
-use crate::subtle::blake2b;
+use zeroize::Zeroizing;
 
 pub const KEY_LEN: usize = 32;
 pub const KEY_MIN: usize = KEY_LEN;

ciphers/src/subtle/mod.rs

@@ -1,7 +1 @@
-pub mod blake2b;
-#[cfg(not(feature = "experiment_libcrux"))]
-pub mod chacha20poly1305_ietf;
-#[cfg(feature = "experiment_libcrux")]
-pub mod chacha20poly1305_ietf_libcrux;
 pub mod incorrect_hmac_blake2b;
-pub mod xchacha20poly1305_ietf;

ciphers/src/subtle/xchacha20poly1305_ietf.rs

@@ -1,45 +0,0 @@
-use rosenpass_to::ops::copy_slice;
-use rosenpass_to::To;
-use rosenpass_util::typenum2const;
-
-use chacha20poly1305::aead::generic_array::GenericArray;
-use chacha20poly1305::XChaCha20Poly1305 as AeadImpl;
-use chacha20poly1305::{AeadCore, AeadInPlace, KeyInit, KeySizeUser};
-
-pub const KEY_LEN: usize = typenum2const! { <AeadImpl as KeySizeUser>::KeySize };
-pub const TAG_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::TagSize };
-pub const NONCE_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::NonceSize };
-
-#[inline]
-pub fn encrypt(
-    ciphertext: &mut [u8],
-    key: &[u8],
-    nonce: &[u8],
-    ad: &[u8],
-    plaintext: &[u8],
-) -> anyhow::Result<()> {
-    let nonce = GenericArray::from_slice(nonce);
-    let (n, ct_mac) = ciphertext.split_at_mut(NONCE_LEN);
-    let (ct, mac) = ct_mac.split_at_mut(ct_mac.len() - TAG_LEN);
-    copy_slice(nonce).to(n);
-    copy_slice(plaintext).to(ct);
-    let mac_value = AeadImpl::new_from_slice(key)?.encrypt_in_place_detached(nonce, ad, ct)?;
-    copy_slice(&mac_value[..]).to(mac);
-    Ok(())
-}
-
-#[inline]
-pub fn decrypt(
-    plaintext: &mut [u8],
-    key: &[u8],
-    ad: &[u8],
-    ciphertext: &[u8],
-) -> anyhow::Result<()> {
-    let (n, ct_mac) = ciphertext.split_at(NONCE_LEN);
-    let (ct, mac) = ct_mac.split_at(ct_mac.len() - TAG_LEN);
-    let nonce = GenericArray::from_slice(n);
-    let tag = GenericArray::from_slice(mac);
-    copy_slice(ct).to(plaintext);
-    AeadImpl::new_from_slice(key)?.decrypt_in_place_detached(nonce, ad, plaintext, tag)?;
-    Ok(())
-}

cliff.toml

@@ -1,99 +0,0 @@
-
-
-# https://git-cliff.org/docs/configuration
-
-[changelog]
-# template for the changelog header
-header = """
----
-title: ""
-linkTitle: "Changelog"
-weight: 5
-menu: false
-type: docs
----
-
-<script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-Fy6S3B9q64WdZWQUiU+q4/2Lc9npb8tCaSX9FK7E8HnRr0Jz8D6OP9dO5Vg3Q9ct" crossorigin="anonymous"></script>
-
-"""
-# template for the changelog body
-# https://keats.github.io/tera/docs/#introduction
-body = """
-{% if version %}\
-<div class="changelog-container card card-body">
-    <div class="h3 changelog-release">• {{ version | trim_start_matches(pat="v") }} <span class="text-muted">{{ timestamp | date(format="%Y-%m-%d") }}<span> &nbsp;-&nbsp; <a href="{{ commit_id}}" class="">{{ commit_id | truncate(length=7, end="") }}</a></div>\
-{% else %}\
-<div class="changelog-container card card-body">
-    <div class="h3 changelog-release">• unreleased / untagged</div>
-{% endif %}\
-
-{% for group, commits in commits | group_by(attribute="group") %}
-  <p>
-    <button class="btn btn-primary changelog" type="button" data-toggle="collapse" data-target="#{{ group | reverse| truncate(length=5, end="") }}{{ timestamp }}" aria-expanded="false" aria-controls="{{ group | reverse | truncate(length=5, end="") }}{{ timestamp }}">
-      <div class="h4"> {{ group | upper_first }} <i class="fa-solid fa-sort-down"></i></div>
-    </button>
-  </p>
-    <div class="collapse changelog" id="{{ group | reverse | truncate(length=5, end="") }}{{ timestamp }}">
-      <div class="card card-body">
-        {% for commit in commits %}
-            <div class="changelog-commit row">
-            <div class="col-4 col-sm-3 col-lg-2 commit-id"> - <a href="https://github.com/rosenpass/rosenpass/commit/{{ commit.id }}">{{ commit.id | truncate(length=7, end="") }}</a></div><div class="col-8 col-md-8 commit-message"> {{ commit.message | upper_first }}</div>
-            </div>
-        {% endfor %}\
-        </div>
-      </div>
-{% endfor %}\n
-</div>
-"""
-# template for the changelog footer
-footer = """
-<!-- generated by git-cliff -->
-"""
-# remove the leading and trailing whitespace from the templates
-trim = true
-
-[git]
-# parse the commits based on https://www.conventionalcommits.org
-conventional_commits = true
-# filter out the commits that are not conventional
-filter_unconventional = true
-# process each line of a commit as an individual commit
-split_commits = false
-# regex for parsing and grouping commits
-commit_parsers = [
-  { message = "Release rosenpass version", group = "<!-- 0 -->📝 Release" },
-  { message = "^feat", group = "<!-- 0 -->🚀 Features" },
-  { message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
-  { message = "^doc|Documentation|Doc", group = "<!-- 3 -->📚 Documentation" },
-  { message = "^perf", group = "<!-- 4 -->⚡ Performance" },
-  { message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
-  { message = "^style", group = "<!-- 5 -->🎨 Styling" },
-  { message = "^test", group = "<!-- 6 -->🧪 Testing" },
-  { field = "author.name", pattern = "dependabot", skip = true },
-  { message = "^chore\\(release\\): prepare for", skip = true },
-  { message = "^chore\\(deps.*\\)", skip = true },
-  { message = "^chore\\(pr\\)", skip = true },
-  { message = "^chore\\(pull\\)", skip = true },
-  { message = "^chore: update changelog", skip = true },  # New rule to skip changelog commits
-  { body = ".*security", group = "<!-- 7 -->🛡️ Security" },
-  { message = "^revert", group = "<!-- 8 -->◀️ Revert" },
-  # Catch-all for uncategorized commits
-  { message = ".*", group = "<!-- 9 -->📦 Miscellaneous Tasks" },
-]
-
-# protect breaking changes from being skipped due to matching a skipping commit_parser
-protect_breaking_commits = false
-# filter out the commits that are not matched by commit parsers
-filter_commits = false
-# regex for matching git tags
-tag_pattern = "v[0-9].*"
-# regex for skipping tags
-skip_tags = "v0.1.0-beta.1"
-# regex for ignoring tags
-ignore_tags = ""
-# sort the tags topologically
-topo_order = false
-# sort the commits inside sections by oldest/newest order
-sort_commits = "newest"
-

constant-time/Cargo.toml

@@ -11,12 +11,5 @@ readme = "readme.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-constant_time_tests = []
-
 [dependencies]
 rosenpass-to = { workspace = true }
-memsec = { workspace = true }
-
-[dev-dependencies]
-rand = "0.8.5"

constant-time/src/compare.rs

@@ -1,39 +0,0 @@
-use core::ptr;
-
-/// Little endian memcmp version of quinier/memsec
-/// https://github.com/quininer/memsec/blob/bbc647967ff6d20d6dccf1c85f5d9037fcadd3b0/src/lib.rs#L30
-#[inline(never)]
-pub unsafe fn memcmp_le(b1: *const u8, b2: *const u8, len: usize) -> i32 {
-    let mut res = 0;
-    for i in 0..len {
-        let diff =
-            i32::from(ptr::read_volatile(b1.add(i))) - i32::from(ptr::read_volatile(b2.add(i)));
-        res = (res & (((diff - 1) & !diff) >> 8)) | diff;
-    }
-    ((res - 1) >> 8) + (res >> 8) + 1
-}
-
-/// compares two slices of memory content and returns an integer indicating the relationship between
-/// the slices
-///
-/// ## Returns
-/// - <0 if the first byte that does not match both slices has a lower value in `a` than in `b`
-/// - 0 if the contents are equal
-/// - >0 if the first byte that does not match both slices has a higher value in `a` than in `b`
-///
-/// ## Leaks
-/// If the two slices have differents lengths, the function will return immediately. This
-/// effectively leaks the information whether the slices have equal length or not. This is widely
-/// considered safe.
-///
-/// The execution time of the function grows approx. linear with the length of the input. This is
-/// considered safe.
-///
-/// ## Tests
-/// For discussion on how to ensure the constant-time execution of this function, see
-/// <https://github.com/rosenpass/rosenpass/issues/232>
-#[inline]
-pub fn compare(a: &[u8], b: &[u8]) -> i32 {
-    assert!(a.len() == b.len());
-    unsafe { memcmp_le(a.as_ptr(), b.as_ptr(), a.len()) }
-}

constant-time/src/increment.rs

@@ -1,48 +0,0 @@
-use core::hint::black_box;
-
-/// Interpret the given slice as a little-endian unsigned integer
-/// and increment that integer.
-///
-/// # Leaks
-/// TODO: mention here if this function leaks any information, see
-/// <https://github.com/rosenpass/rosenpass/issues/232>
-///
-/// ## Tests
-/// For discussion on how to ensure the constant-time execution of this function, see
-/// <https://github.com/rosenpass/rosenpass/issues/232>
-///
-/// # Examples
-///
-/// ```
-/// use rosenpass_constant_time::increment as inc;
-/// use rosenpass_to::To;
-///
-/// fn testcase(v: &[u8], correct: &[u8]) {
-///   let mut v = v.to_owned();
-///   inc(&mut v);
-///   assert_eq!(&v, correct);
-/// }
-///
-/// testcase(b"", b"");
-/// testcase(b"\x00", b"\x01");
-/// testcase(b"\x01", b"\x02");
-/// testcase(b"\xfe", b"\xff");
-/// testcase(b"\xff", b"\x00");
-/// testcase(b"\x00\x00", b"\x01\x00");
-/// testcase(b"\x01\x00", b"\x02\x00");
-/// testcase(b"\xfe\x00", b"\xff\x00");
-/// testcase(b"\xff\x00", b"\x00\x01");
-/// testcase(b"\x00\x00\x00\x00\x00\x00", b"\x01\x00\x00\x00\x00\x00");
-/// testcase(b"\x00\xa3\x00\x77\x00\x00", b"\x01\xa3\x00\x77\x00\x00");
-/// testcase(b"\xff\xa3\x00\x77\x00\x00", b"\x00\xa4\x00\x77\x00\x00");
-/// testcase(b"\xff\xff\xff\x77\x00\x00", b"\x00\x00\x00\x78\x00\x00");
-/// ```
-#[inline]
-pub fn increment(v: &mut [u8]) {
-    let mut carry = 1u8;
-    for val in v.iter_mut() {
-        let (v, c) = black_box(*val).overflowing_add(black_box(carry));
-        *black_box(val) = v;
-        *black_box(&mut carry) = black_box(black_box(c) as u8);
-    }
-}

constant-time/src/lib.rs

@@ -1,17 +1,26 @@
-//! constant-time implementations of some primitives
-//!
-//! Rosenpass internal library providing basic constant-time operations.
-//!
-//! ## TODO
-//! Figure out methodology to ensure that code is actually constant time, see
-//! <https://github.com/rosenpass/rosenpass/issues/232>
+use rosenpass_to::{with_destination, To};
 
-mod compare;
-mod increment;
-mod memcmp;
-mod xor;
-
-pub use compare::compare;
-pub use increment::increment;
-pub use memcmp::memcmp;
-pub use xor::xor;
+/// Xors the source into the destination
+///
+/// # Examples
+///
+/// ```
+/// use rosenpass_constant_time::xor;
+/// use rosenpass_to::To;
+/// assert_eq!(
+///     xor(b"world").to_this(|| b"hello".to_vec()),
+///     b"\x1f\n\x1e\x00\x0b");
+/// ```
+///
+/// # Panics
+///
+/// If source and destination are of different sizes.
+#[inline]
+pub fn xor<'a>(src: &'a [u8]) -> impl To<[u8], ()> + 'a {
+    with_destination(|dst: &mut [u8]| {
+        assert!(src.len() == dst.len());
+        for (dv, sv) in dst.iter_mut().zip(src.iter()) {
+            *dv ^= *sv;
+        }
+    })
+}

constant-time/src/memcmp.rs

@@ -1,107 +0,0 @@
-/// compares two sclices of memory content and returns whether they are equal
-///
-/// ## Leaks
-/// If the two slices have differents lengths, the function will return immediately. This
-/// effectively leaks the information whether the slices have equal length or not. This is widely
-/// considered safe.
-///
-/// The execution time of the function grows approx. linear with the length of the input. This is
-/// considered safe.
-#[inline]
-pub fn memcmp(a: &[u8], b: &[u8]) -> bool {
-    a.len() == b.len() && unsafe { memsec::memeq(a.as_ptr(), b.as_ptr(), a.len()) }
-}
-
-/// [tests::memcmp_runs_in_constant_time] runs a stasticial test that the equality of the two
-/// input parameters does not correlate with the run time.
-///
-/// For discussion on how to (further) ensure the constant-time execution of this function,
-/// see <https://github.com/rosenpass/rosenpass/issues/232>
-#[cfg(all(test, feature = "constant_time_tests"))]
-mod tests {
-    use super::*;
-    use rand::seq::SliceRandom;
-    use rand::thread_rng;
-    use std::time::Instant;
-
-    #[test]
-    /// tests whether [memcmp] actually runs in constant time
-    ///
-    /// This test function will run an equal amount of comparisons on two different sets of parameters:
-    /// - completely equal slices
-    /// - completely unequal slices.
-    /// All comparisons are executed in a randomized order. The test will fail if one of the
-    /// two sets is checked for equality significantly faster than the other set
-    /// (absolute correlation coefficient ≥ 0.01)
-    fn memcmp_runs_in_constant_time() {
-        // prepare data to compare
-        let n: usize = 1E6 as usize; // number of comparisons to run
-        let len = 1024; // length of each slice passed as parameters to the tested comparison function
-        let a1 = "a".repeat(len);
-        let a2 = a1.clone();
-        let b = "b".repeat(len);
-
-        let a1 = a1.as_bytes();
-        let a2 = a2.as_bytes();
-        let b = b.as_bytes();
-
-        // vector representing all timing tests
-        //
-        // Each element is a tuple of:
-        // 0: whether the test compared two equal slices
-        // 1: the duration needed for the comparison to run
-        let mut tests = (0..n)
-            .map(|i| (i < n / 2, std::time::Duration::ZERO))
-            .collect::<Vec<_>>();
-        tests.shuffle(&mut thread_rng());
-
-        // run comparisons / call function to test
-        for test in tests.iter_mut() {
-            let now = Instant::now();
-            if test.0 {
-                memcmp(a1, a2);
-            } else {
-                memcmp(a1, b);
-            }
-            test.1 = now.elapsed();
-            // println!("eq: {}, elapsed: {:.2?}", test.0, test.1);
-        }
-
-        // sort by execution time and calculate Pearson correlation coefficient
-        tests.sort_by_key(|v| v.1);
-        let tests = tests
-            .iter()
-            .map(|t| (if t.0 { 1_f64 } else { 0_f64 }, t.1.as_nanos() as f64))
-            .collect::<Vec<_>>();
-        // averages
-        let (avg_x, avg_y): (f64, f64) = (
-            tests.iter().map(|t| t.0).sum::<f64>() / n as f64,
-            tests.iter().map(|t| t.1).sum::<f64>() / n as f64,
-        );
-        assert!((avg_x - 0.5).abs() < 1E-12);
-        // standard deviations
-        let sd_x = 0.5;
-        let sd_y = (1_f64 / n as f64
-            * tests
-                .iter()
-                .map(|t| {
-                    let difference = t.1 - avg_y;
-                    difference * difference
-                })
-                .sum::<f64>())
-        .sqrt();
-        // covariance
-        let cv = 1_f64 / n as f64
-            * tests
-                .iter()
-                .map(|t| (t.0 - avg_x) * (t.1 - avg_y))
-                .sum::<f64>();
-        // Pearson correlation
-        let correlation = cv / (sd_x * sd_y);
-        println!("correlation: {:.6?}", correlation);
-        assert!(
-            correlation.abs() < 0.01,
-            "execution time correlates with result"
-        )
-    }
-}

constant-time/src/xor.rs

@@ -1,34 +0,0 @@
-use core::hint::black_box;
-use rosenpass_to::{with_destination, To};
-
-/// Xors the source into the destination
-///
-/// # Panics
-/// If source and destination are of different sizes.
-///
-/// # Leaks
-/// TODO: mention here if this function leaks any information, see
-/// <https://github.com/rosenpass/rosenpass/issues/232>
-///
-/// ## Tests
-/// For discussion on how to ensure the constant-time execution of this function, see
-/// <https://github.com/rosenpass/rosenpass/issues/232>
-///
-/// # Examples
-///
-/// ```
-/// use rosenpass_constant_time::xor;
-/// use rosenpass_to::To;
-/// assert_eq!(
-///     xor(b"world").to_this(|| b"hello".to_vec()),
-///     b"\x1f\n\x1e\x00\x0b");
-/// ```
-#[inline]
-pub fn xor(src: &[u8]) -> impl To<[u8], ()> + '_ {
-    with_destination(|dst: &mut [u8]| {
-        assert!(black_box(src.len()) == black_box(dst.len()));
-        for (dv, sv) in dst.iter_mut().zip(src.iter()) {
-            *black_box(dv) ^= black_box(*sv);
-        }
-    })
-}

doc/check.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# We have to filter this STYLE error out, because it is very platform specific
-OUTPUT=$(mandoc -Tlint "$1" | grep --invert-match "STYLE: referenced manual not found")
-
-if [ -z "$OUTPUT" ]
-then
-	exit 0
-else
-	echo "$1 is malformatted, check mandoc -Tlint $1"
-	echo "$OUTPUT"
-	exit 1
-fi

doc/rosenpass.1

@@ -23,7 +23,7 @@ If you are not specifically tasked with developing post-quantum secure systems,
 you probably do not need this tool.
 .Ss COMMANDS
 .Bl -tag -width Ds
-.It Ar gen-keys --secret-key <file-path> --public-key <file-path>
+.It Ar keygen private-key <file-path> public-key <file-path>
 Generate a keypair to use in the exchange command later.
 Send the public-key file to your communication partner and keep the private-key
 file secret!
@@ -108,7 +108,7 @@ Rosenpass was created by Karolin Varner, Benjamin Lipp, Wanja Zaeske,
 Marei Peischl, Stephan Ajuvo, and Lisa Schmidt.
 .Pp
 This manual page was written by
-.An Clara Engler
+.An Emil Engler
 .Sh BUGS
 The bugs are tracked at
 .Lk https://github.com/rosenpass/rosenpass/issues .

doc/rp.1

@@ -113,7 +113,7 @@ Rosenpass was created by Karolin Varner, Benjamin Lipp, Wanja Zaeske,
 Marei Peischl, Stephan Ajuvo, and Lisa Schmidt.
 .Pp
 This manual page was written by
-.An Clara Engler
+.An Emil Engler
 .Sh BUGS
 The bugs are tracked at
 .Lk https://github.com/rosenpass/rosenpass/issues .

flake.lock

@@ -2,15 +2,17 @@
   "nodes": {
     "fenix": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1712298178,
-        "narHash": "sha256-590fpCPXYAkaAeBz/V91GX4/KGzPObdYtqsTWzT6AhI=",
+        "lastModified": 1699770036,
+        "narHash": "sha256-bZmI7ytPAYLpyFNgj5xirDkKuAniOkj1xHdv5aIJ5GM=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "569b5b5781395da08e7064e825953c548c26af76",
+        "rev": "81ab0b4f7ae9ebb57daa0edf119c4891806e4d3a",
         "type": "github"
       },
       "original": {
@@ -24,11 +26,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
         "type": "github"
       },
       "original": {
@@ -39,7 +41,9 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1698420672,
@@ -57,18 +61,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712168706,
-        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
+        "lastModified": 1698846319,
+        "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
+        "rev": "34bdaaf1f0b7fb6d9091472edc968ff10a8c2857",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "root": {
@@ -82,11 +84,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1712156296,
-        "narHash": "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us=",
+        "lastModified": 1699715108,
+        "narHash": "sha256-yPozsobJU55gj+szgo4Lpcg1lHvGQYAT6Y4MrC80mWE=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "8e581ac348e223488622f4d3003cb2bd412bf27e",
+        "rev": "5fcf5289e726785d20d3aa4d13d90a43ed248e83",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,6 +1,5 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
 
     # for quicker rust builds
@@ -36,6 +35,24 @@
             # normal nixpkgs
             pkgs = import nixpkgs {
               inherit system;
+
+              # TODO remove overlay once a fix for
+              # https://github.com/NixOS/nixpkgs/issues/216904 got merged
+              overlays = [
+                (
+                  final: prev: {
+                    iproute2 = prev.iproute2.overrideAttrs (old:
+                      let
+                        isStatic = prev.stdenv.hostPlatform.isStatic;
+                      in
+                      {
+                        makeFlags = old.makeFlags ++ prev.lib.optional isStatic [
+                          "TC_CONFIG_NO_XT=y"
+                        ];
+                      });
+                  }
+                )
+              ];
             };
 
             # parsed Cargo.toml
@@ -72,9 +89,17 @@
               result = pkgs.lib.sources.cleanSourceWith { inherit src filter; };
             };
 
+            # builds a bin path for all dependencies for the `rp` shellscript
+            rpBinPath = p: with p; lib.makeBinPath [
+              coreutils
+              findutils
+              gawk
+              wireguard-tools
+            ];
+
             # a function to generate a nix derivation for rosenpass against any
             # given set of nixpkgs
-            rosenpassDerivation = p:
+            rpDerivation = p:
               let
                 # whether we want to build a statically linked binary
                 isStatic = p.targetPlatform.isStatic;
@@ -120,10 +145,12 @@
                     p.stdenv.cc
                     cmake # for oqs build in the oqs-sys crate
                     mandoc # for the built-in manual
+                    makeWrapper # for the rp shellscript
+                    pkg-config # let libsodium-sys-stable find libsodium
                     removeReferencesTo
                     rustPlatform.bindgenHook # for C-bindings in the crypto libs
                   ];
-                  buildInputs = with p; [ bash ];
+                  buildInputs = with p; [ bash libsodium ];
 
                   override = x: {
                     preBuild =
@@ -150,111 +177,11 @@
                     preBuild = (lib.optionalString isStatic ''
                       NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lc"
                     '');
-                  };
 
-                  # We want to build for a specific target...
-                  CARGO_BUILD_TARGET = target;
-
-                  # ... which might require a non-default linker:
-                  "CARGO_TARGET_${shout target}_LINKER" =
-                    let
-                      inherit (p.stdenv) cc;
-                    in
-                    "${cc}/bin/${cc.targetPrefix}cc";
-
-                  meta = with pkgs.lib;
-                    {
-                      inherit (cargoToml.package) description homepage;
-                      license = with licenses; [ mit asl20 ];
-                      maintainers = [ maintainers.wucke13 ];
-                      platforms = platforms.all;
-                    };
-                } // (lib.mkIf isStatic {
-                # otherwise pkg-config tries to link non-existent dynamic libs
-                # documented here: https://docs.rs/pkg-config/latest/pkg_config/
-                PKG_CONFIG_ALL_STATIC = true;
-
-                # tell rust to build everything statically linked
-                CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
-              });
-            # a function to generate a nix derivation for the rp helper against any
-            # given set of nixpkgs
-            rpDerivation = p:
-              let
-                # whether we want to build a statically linked binary
-                isStatic = p.targetPlatform.isStatic;
-
-                # the rust target of `p`
-                target = p.rust.toRustTargetSpec p.targetPlatform;
-
-                # convert a string to shout case
-                shout = string: builtins.replaceStrings [ "-" ] [ "_" ] (pkgs.lib.toUpper string);
-
-                # suitable Rust toolchain
-                toolchain = with inputs.fenix.packages.${system}; combine [
-                  stable.cargo
-                  stable.rustc
-                  targets.${target}.stable.rust-std
-                ];
-
-                # naersk with a custom toolchain
-                naersk = pkgs.callPackage inputs.naersk {
-                  cargo = toolchain;
-                  rustc = toolchain;
-                };
-
-                # used to trick the build.rs into believing that CMake was ran **again**
-                fakecmake = pkgs.writeScriptBin "cmake" ''
-                  #! ${pkgs.stdenv.shell} -e
-                  true
-                '';
-              in
-              naersk.buildPackage
-                {
-                  # metadata and source
-                  name = cargoToml.package.name;
-                  version = cargoToml.package.version;
-                  inherit src;
-
-                  cargoBuildOptions = x: x ++ [ "-p" "rp" ];
-                  cargoTestOptions = x: x ++ [ "-p" "rp" ];
-
-                  doCheck = true;
-
-                  nativeBuildInputs = with pkgs; [
-                    p.stdenv.cc
-                    cmake # for oqs build in the oqs-sys crate
-                    mandoc # for the built-in manual
-                    removeReferencesTo
-                    rustPlatform.bindgenHook # for C-bindings in the crypto libs
-                  ];
-                  buildInputs = with p; [ bash ];
-
-                  override = x: {
-                    preBuild =
-                      # nix defaults to building for aarch64 _without_ the armv8-a crypto
-                      # extensions, but liboqs depens on these
-                      (lib.optionalString (system == "aarch64-linux") ''
-                        NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -march=armv8-a+crypto"
-                      ''
-                      );
-
-                    # fortify is only compatible with dynamic linking
-                    hardeningDisable = lib.optional isStatic "fortify";
-                  };
-
-                  overrideMain = x: {
-                    # CMake detects that it was served a _foreign_ target dir, and CMake
-                    # would be executed again upon the second build step of naersk.
-                    # By adding our specially optimized CMake version, we reduce the cost
-                    # of recompilation by 99 % while, while avoiding any CMake errors.
-                    nativeBuildInputs = [ (lib.hiPrio fakecmake) ] ++ x.nativeBuildInputs;
-
-                    # make sure that libc is linked, under musl this is not the case per
-                    # default
-                    preBuild = (lib.optionalString isStatic ''
-                      NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lc"
-                    '');
+                    preInstall = ''
+                      install -D ${./rp} $out/bin/rp
+                      wrapProgram $out/bin/rp --prefix PATH : "${ rpBinPath p }"
+                    '';
                   };
 
                   # We want to build for a specific target...
@@ -296,8 +223,7 @@
           rec {
             packages = rec {
               default = rosenpass;
-              rosenpass = rosenpassDerivation pkgs;
-              rp = rpDerivation pkgs;
+              rosenpass = rpDerivation pkgs;
               rosenpass-oci-image = rosenpassOCI "rosenpass";
 
               # derivation for the release
@@ -308,10 +234,6 @@
                     if pkgs.hostPlatform.isLinux then
                       packages.rosenpass-static
                     else packages.rosenpass;
-                  rp =
-                    if pkgs.hostPlatform.isLinux then
-                      packages.rp-static
-                    else packages.rp;
                   oci-image =
                     if pkgs.hostPlatform.isLinux then
                       packages.rosenpass-static-oci-image
@@ -320,15 +242,14 @@
                 pkgs.runCommandNoCC "lace-result" { }
                   ''
                     mkdir {bin,$out}
-                    tar -cvf $out/rosenpass-${system}-${version}.tar \
-                      -C ${package} bin/rosenpass \
-                      -C ${rp} bin/rp
+                    cp ${./.}/rp bin/
+                    tar -cvf $out/rosenpass-${system}-${version}.tar bin/rp \
+                      -C ${package} bin/rosenpass
                     cp ${oci-image} \
                       $out/rosenpass-oci-image-${system}-${version}.tar.gz
                   '';
             } // (if pkgs.stdenv.isLinux then rec {
-              rosenpass-static = rosenpassDerivation pkgs.pkgsStatic;
-              rp-static = rpDerivation pkgs.pkgsStatic;
+              rosenpass-static = rpDerivation pkgs.pkgsStatic;
               rosenpass-static-oci-image = rosenpassOCI "rosenpass-static";
             } else { });
           }
@@ -343,6 +264,7 @@
             inherit system;
           };
           packages = self.packages.${system};
+          devShells = self.devShells.${system};
         in
         {
           #
@@ -370,6 +292,7 @@
               ];
               buildPhase = ''
                 export HOME=$(mktemp -d)
+                export OSFONTDIR="$(kpsewhich --var-value TEXMF)/fonts/{opentype/public/nunito,truetype/google/noto}"
                 latexmk -r tex/CI.rc
               '';
               installPhase = ''
@@ -403,6 +326,28 @@
             '';
           };
 
+          #
+          ### A DevContainer attempt
+          #
+          packages.dev-container = pkgs.dockerTools.buildImage rec {
+            name = "rosenpass-dev-container";
+            tag = "latest";
+            copyToRoot = pkgs.buildEnv {
+              name = "image-root";
+              paths = with pkgs; [
+                bash
+                coreutils
+                curl
+                gnutar
+                gzip
+                openssh
+                stdenv.cc
+              ]; #++ lib.lists.filter (p: builtins.hasAttr "version" p)
+                #devShells.default.nativeBuildInputs;
+              pathsToLink = [ "/bin" "/lib" ];
+            };
+            config.Cmd = [ "/bin/bash" ];
+          };
 
           #
           ### Devshells ###
@@ -411,12 +356,11 @@
             inherit (packages.proof-proverif) CRYPTOVERIF_LIB;
             inputsFrom = [ packages.default ];
             nativeBuildInputs = with pkgs; [
-              inputs.fenix.packages.${system}.complete.toolchain
               cmake # override the fakecmake from the main step above
               cargo-release
               clippy
               nodePackages.prettier
-              nushell # for the .ci/gen-workflow-files.nu script
+              rustfmt
               packages.proverif-patched
             ];
           };

format_rust_code.sh

@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-
-# Parse command line options
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --mode)
-            mode="$2"
-            shift 2
-            ;;
-        *)
-            echo "Unknown option: $1"
-            exit 1
-            ;;
-    esac
-done
-
-# Check if mode is specified
-if [ -z "$mode" ]; then
-    echo "Please specify the mode using --mode option. Valid modes are 'check' and 'fix'."
-    exit 1
-fi
-
-# Find all Markdown files in the current directory and its subdirectories
-mapfile -t md_files < <(find . -type f -name "*.md")
-
-count=0
-# Iterate through each Markdown file
-for file in "${md_files[@]}"; do
-    # Use awk to extract Rust code blocks enclosed within triple backticks
-    rust_code_blocks=$(awk '/```rust/{flag=1; next}/```/{flag=0} flag' "$file")
-
-    # Count the number of Rust code blocks
-    num_fences=$(awk '/```rust/{f=1} f{if(/```/){f=0; count++}} END{print count}' "$file")
-
-    if [ -n "$rust_code_blocks" ]; then
-        echo "Processing Rust code in $file"
-        # Iterate through each Rust code block
-        for ((i=1; i <= num_fences ; i++)); do
-            # Extract individual Rust code block using awk
-            current_rust_block=$(awk -v i="$i" '/```rust/{f=1; if (++count == i) next} f&&/```/{f=0;next} f' "$file")
-            # Variable to check if we have added the main function
-            add_main=0  
-            # Check if the Rust code block is already inside a function
-            if ! echo "$current_rust_block" | grep -q "fn main()"; then
-                # If not, wrap it in a main function
-                current_rust_block=$'fn main() {\n'"$current_rust_block"$'\n}'
-                add_main=1
-            fi
-            if [ "$mode" == "check" ]; then
-                # Apply changes to the Rust code block
-                formatted_rust_code=$(echo "$current_rust_block" | rustfmt)
-                # Use rustfmt to format the Rust code block, remove first and last lines, and remove the first 4 spaces if added  main function
-                if [ "$add_main" == 1 ]; then
-                    formatted_rust_code=$(echo "$formatted_rust_code" | sed '1d;$d' | sed 's/^    //')
-                    current_rust_block=$(echo "$current_rust_block" | sed '1d;')
-                    current_rust_block=$(echo "$current_rust_block" | sed '$d')
-                fi
-                if [ "$formatted_rust_code" == "$current_rust_block" ]; then
-                    echo "No changes needed in Rust code block $i in $file"
-                else
-                    echo -e "\nChanges needed in Rust code block $i in $file:\n"
-                    echo "$formatted_rust_code"
-                    count=+1
-                fi
-
-            elif [ "$mode" == "fix" ]; then
-                # Replace current_rust_block with formatted_rust_code in the file
-                formatted_rust_code=$(echo "$current_rust_block" | rustfmt)
-                # Use rustfmt to format the Rust code block, remove first and last lines, and remove the first 4 spaces if added  main function
-                if [ "$add_main" == 1 ]; then
-                    formatted_rust_code=$(echo "$formatted_rust_code" | sed '1d;$d' | sed 's/^    //')
-                    current_rust_block=$(echo "$current_rust_block" | sed '1d;')
-                    current_rust_block=$(echo "$current_rust_block" | sed '$d')
-                fi
-                # Check if the formatted code is the same as the current Rust code block
-                if [ "$formatted_rust_code" == "$current_rust_block" ]; then
-                    echo "No changes needed in Rust code block $i in $file"
-                else
-                    echo "Formatting Rust code block $i in $file"
-                    # Replace current_rust_block with formatted_rust_code in the file
-                    # Use awk to find the line number of the pattern
-
-                    start_line=$(grep -n "^\`\`\`rust" "$file" | sed -n "${i}p" | cut -d: -f1)
-                    end_line=$(grep -n "^\`\`\`" "$file" | awk -F: -v start_line="$start_line" '$1 > start_line {print $1; exit;}')
-
-                    if [ -n "$start_line" ] && [ -n "$end_line" ]; then
-                        # Print lines before the Rust code block
-                        head -n "$((start_line - 1))" "$file"
-
-                        # Print the formatted Rust code block
-                        echo "\`\`\`rust"
-                        echo "$formatted_rust_code"
-                        echo "\`\`\`"
-
-                        # Print lines after the Rust code block
-                        tail -n +"$((end_line + 1))" "$file"
-                    else
-                        # Rust code block not found or end line not found
-                        cat "$file"
-                    fi > tmpfile && mv tmpfile "$file"
-
-                fi
-            else  
-                echo "Unknown mode: $mode. Valid modes are 'check' and 'fix'."
-                exit 1
-            fi
-        done
-    fi
-done
-
-# CI failure if changes are needed
-if [ $count -gt 0 ]; then
-    echo "CI failed: Changes needed in Rust code blocks."
-    exit 1
-fi

fuzz/Cargo.toml

@@ -4,9 +4,6 @@ version = "0.0.1"
 publish = false
 edition = "2021"
 
-[features]
-experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"]
-
 [package.metadata]
 cargo-fuzz = true
 
@@ -15,6 +12,7 @@ arbitrary = { workspace = true }
 libfuzzer-sys = { workspace = true }
 stacker = { workspace = true }
 rosenpass-secret-memory = { workspace = true }
+rosenpass-sodium = { workspace = true }
 rosenpass-ciphers = { workspace = true }
 rosenpass-cipher-traits = { workspace = true }
 rosenpass-to = { workspace = true }
@@ -51,37 +49,13 @@ test = false
 doc = false
 
 [[bin]]
-name = "fuzz_box_secret_alloc_malloc"
-path = "fuzz_targets/box_secret_alloc_malloc.rs"
+name = "fuzz_box_sodium_alloc"
+path = "fuzz_targets/box_sodium_alloc.rs"
 test = false
 doc = false
 
 [[bin]]
-name = "fuzz_vec_secret_alloc_malloc"
-path = "fuzz_targets/vec_secret_alloc_malloc.rs"
-test = false
-doc = false
-
-[[bin]]
-name = "fuzz_box_secret_alloc_memfdsec"
-path = "fuzz_targets/box_secret_alloc_memfdsec.rs"
-test = false
-doc = false
-
-[[bin]]
-name = "fuzz_vec_secret_alloc_memfdsec"
-path = "fuzz_targets/vec_secret_alloc_memfdsec.rs"
-test = false
-doc = false
-
-[[bin]]
-name = "fuzz_box_secret_alloc_memfdsec_mallocfb"
-path = "fuzz_targets/box_secret_alloc_memfdsec_mallocfb.rs"
-test = false
-doc = false
-
-[[bin]]
-name = "fuzz_vec_secret_alloc_memfdsec_mallocfb"
-path = "fuzz_targets/vec_secret_alloc_memfdsec_mallocfb.rs"
+name = "fuzz_vec_sodium_alloc"
+path = "fuzz_targets/vec_sodium_alloc.rs"
 test = false
 doc = false

fuzz/fuzz_targets/aead_enc_into.rs

@@ -5,6 +5,7 @@ extern crate rosenpass;
 use libfuzzer_sys::fuzz_target;
 
 use rosenpass_ciphers::aead;
+use rosenpass_sodium::init as sodium_init;
 
 #[derive(arbitrary::Arbitrary, Debug)]
 pub struct Input {
@@ -15,7 +16,10 @@ pub struct Input {
 }
 
 fuzz_target!(|input: Input| {
-    let mut ciphertext = vec![0u8; input.plaintext.len() + 16];
+    sodium_init().unwrap();
+
+    let mut ciphertext: Vec<u8> = Vec::with_capacity(input.plaintext.len() + 16);
+    ciphertext.resize(input.plaintext.len() + 16, 0);
 
     aead::encrypt(
         ciphertext.as_mut_slice(),

fuzz/fuzz_targets/blake2b.rs

@@ -4,7 +4,7 @@ extern crate rosenpass;
 
 use libfuzzer_sys::fuzz_target;
 
-use rosenpass_ciphers::subtle::blake2b;
+use rosenpass_sodium::{hash::blake2b, init as sodium_init};
 use rosenpass_to::To;
 
 #[derive(arbitrary::Arbitrary, Debug)]
@@ -14,6 +14,8 @@ pub struct Blake2b {
 }
 
 fuzz_target!(|input: Blake2b| {
+    sodium_init().unwrap();
+
     let mut out = [0u8; 32];
 
     blake2b::hash(&input.key, &input.data).to(&mut out).unwrap();

fuzz/fuzz_targets/box_secret_alloc_malloc.rs

@@ -1,12 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_box;
-use rosenpass_secret_memory::policy::*;
-use std::sync::Once;
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_use_only_malloc_secrets);
-    let _ = secret_box(data);
-});

fuzz/fuzz_targets/box_secret_alloc_memfdsec.rs

@@ -1,13 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_box;
-use rosenpass_secret_memory::policy::*;
-use std::sync::Once;
-
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_use_only_memfd_secrets);
-    let _ = secret_box(data);
-});

fuzz/fuzz_targets/box_secret_alloc_memfdsec_mallocfb.rs

@@ -1,13 +0,0 @@
-#![no_main]
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_box;
-use rosenpass_secret_memory::policy::*;
-use std::sync::Once;
-
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_try_use_memfd_secrets);
-    let _ = secret_box(data);
-});

fuzz/fuzz_targets/box_sodium_alloc.rs

@@ -0,0 +1,12 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use rosenpass_sodium::{
+    alloc::{Alloc as SodiumAlloc, Box as SodiumBox},
+    init,
+};
+
+fuzz_target!(|data: &[u8]| {
+    let _ = init();
+    let _ = SodiumBox::new_in(data, SodiumAlloc::new());
+});

fuzz/fuzz_targets/handle_msg.rs

@@ -4,17 +4,14 @@ extern crate rosenpass;
 use libfuzzer_sys::fuzz_target;
 
 use rosenpass::protocol::CryptoServer;
-use rosenpass_cipher_traits::Kem;
-use rosenpass_ciphers::kem::StaticKem;
-use rosenpass_secret_memory::policy::*;
-use rosenpass_secret_memory::{PublicBox, Secret};
-use std::sync::Once;
+use rosenpass_secret_memory::Secret;
+use rosenpass_sodium::init as sodium_init;
 
-static ONCE: Once = Once::new();
 fuzz_target!(|rx_buf: &[u8]| {
-    ONCE.call_once(secret_policy_use_only_malloc_secrets);
-    let sk = Secret::from_slice(&[0; StaticKem::SK_LEN]);
-    let pk = PublicBox::from_slice(&[0; StaticKem::PK_LEN]);
+    sodium_init().unwrap();
+
+    let sk = Secret::from_slice(&[0; 13568]);
+    let pk = Secret::from_slice(&[0; 524160]);
 
     let mut cs = CryptoServer::new(sk, pk);
     let mut tx_buf = [0; 10240];

fuzz/fuzz_targets/kyber_encaps.rs

@@ -9,12 +9,12 @@ use rosenpass_ciphers::kem::EphemeralKem;
 
 #[derive(arbitrary::Arbitrary, Debug)]
 pub struct Input {
-    pub pk: [u8; EphemeralKem::PK_LEN],
+    pub pk: [u8; 800],
 }
 
 fuzz_target!(|input: Input| {
-    let mut ciphertext = [0u8; EphemeralKem::CT_LEN];
-    let mut shared_secret = [0u8; EphemeralKem::SHK_LEN];
+    let mut ciphertext = [0u8; 768];
+    let mut shared_secret = [0u8; 32];
 
     EphemeralKem::encaps(&mut shared_secret, &mut ciphertext, &input.pk).unwrap();
 });

fuzz/fuzz_targets/mceliece_encaps.rs

@@ -7,8 +7,8 @@ use rosenpass_cipher_traits::Kem;
 use rosenpass_ciphers::kem::StaticKem;
 
 fuzz_target!(|input: [u8; StaticKem::PK_LEN]| {
-    let mut ciphertext = [0u8; StaticKem::CT_LEN];
-    let mut shared_secret = [0u8; StaticKem::SHK_LEN];
+    let mut ciphertext = [0u8; 188];
+    let mut shared_secret = [0u8; 32];
 
     // We expect errors while fuzzing therefore we do not check the result.
     let _ = StaticKem::encaps(&mut shared_secret, &mut ciphertext, &input);

fuzz/fuzz_targets/vec_secret_alloc_malloc.rs

@@ -1,15 +0,0 @@
-#![no_main]
-
-use std::sync::Once;
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_vec;
-use rosenpass_secret_memory::policy::*;
-
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_use_only_malloc_secrets);
-    let mut vec = secret_vec();
-    vec.extend_from_slice(data);
-});

fuzz/fuzz_targets/vec_secret_alloc_memfdsec.rs

@@ -1,15 +0,0 @@
-#![no_main]
-
-use std::sync::Once;
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_vec;
-use rosenpass_secret_memory::policy::*;
-
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_use_only_memfd_secrets);
-    let mut vec = secret_vec();
-    vec.extend_from_slice(data);
-});

fuzz/fuzz_targets/vec_secret_alloc_memfdsec_mallocfb.rs

@@ -1,15 +0,0 @@
-#![no_main]
-
-use std::sync::Once;
-
-use libfuzzer_sys::fuzz_target;
-use rosenpass_secret_memory::alloc::secret_vec;
-use rosenpass_secret_memory::policy::*;
-
-static ONCE: Once = Once::new();
-
-fuzz_target!(|data: &[u8]| {
-    ONCE.call_once(secret_policy_try_use_memfd_secrets);
-    let mut vec = secret_vec();
-    vec.extend_from_slice(data);
-});

fuzz/fuzz_targets/vec_sodium_alloc.rs

@@ -0,0 +1,13 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use rosenpass_sodium::{
+    alloc::{Alloc as SodiumAlloc, Vec as SodiumVec},
+    init,
+};
+
+fuzz_target!(|data: &[u8]| {
+    let _ = init();
+    let mut vec = SodiumVec::new_in(SodiumAlloc::new());
+    vec.extend_from_slice(data);
+});

lenses/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "rosenpass-lenses"
+version = "0.1.0"
+authors = ["Karolin Varner <karo@cupdev.net>", "wucke13 <wucke13@gmail.com>"]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+description = "Rosenpass internal library for parsing binary data securely"
+homepage = "https://rosenpass.eu/"
+repository = "https://github.com/rosenpass/rosenpass"
+readme = "readme.md"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+paste = { workspace = true }
+thiserror = { workspace = true }

lenses/readme.md

@@ -0,0 +1,3 @@
+# Rosenpass internal binary parsing library
+
+This is an internal library; no guarantee is made about its API at this point in time.

lenses/src/lib.rs

@@ -0,0 +1,206 @@
+use std::result::Result;
+
+/// Common trait shared by all Lenses
+pub trait LenseView {
+    const LEN: usize;
+}
+
+/// Error during lense creation
+#[derive(thiserror::Error, Debug, Eq, PartialEq, Clone)]
+pub enum LenseError {
+    #[error("buffer size mismatch")]
+    BufferSizeMismatch,
+}
+
+pub type LenseResult<T> = Result<T, LenseError>;
+
+impl LenseError {
+    pub fn ensure_exact_buffer_size(len: usize, required: usize) -> LenseResult<()> {
+        (len == required)
+            .then_some(())
+            .ok_or(LenseError::BufferSizeMismatch)
+    }
+
+    pub fn ensure_sufficient_buffer_size(len: usize, required: usize) -> LenseResult<()> {
+        (len >= required)
+            .then_some(())
+            .ok_or(LenseError::BufferSizeMismatch)
+    }
+}
+
+/// A macro to create data lenses.
+#[macro_export]
+macro_rules! lense(
+    // prefix          @ offset       ; optional meta    ; field name   : field length, ...
+    (token_muncher_ref @ $offset:expr ; $( $attr:meta )* ; $field:ident : $len:expr $(, $( $tail:tt )+ )?) =>  {
+        ::paste::paste!{
+
+        #[allow(rustdoc::broken_intra_doc_links)]
+        $( #[ $attr ] )*
+        ///
+        #[doc = lense!(maybe_docstring_link $len)]
+        /// bytes long
+        pub fn $field(&self) -> &__ContainerType::Output {
+            &self.0[$offset .. $offset + $len]
+        }
+
+        /// The bytes until the
+        #[doc = lense!(maybe_docstring_link Self::$field)]
+        /// field
+        pub fn [< until_ $field >](&self) -> &__ContainerType::Output {
+            &self.0[0 .. $offset]
+        }
+
+        // if the tail exits, consume it as well
+        $(
+        lense!{token_muncher_ref @ $offset + $len ; $( $tail )+ }
+        )?
+        }
+    };
+
+    // prefix          @ offset       ; optional meta    ; field name   : field length, ...
+    (token_muncher_mut @ $offset:expr ; $( $attr:meta )* ; $field:ident : $len:expr $(, $( $tail:tt )+ )?) =>  {
+        ::paste::paste!{
+
+        #[allow(rustdoc::broken_intra_doc_links)]
+        $( #[ $attr ] )*
+        ///
+        #[doc = lense!(maybe_docstring_link $len)]
+        /// bytes long
+        pub fn [< $field _mut >](&mut self) -> &mut __ContainerType::Output {
+            &mut self.0[$offset .. $offset + $len]
+        }
+
+        // if the tail exits, consume it as well
+        $(
+        lense!{token_muncher_mut @ $offset + $len ; $( $tail )+ }
+        )?
+        }
+    };
+
+    // switch that yields literals unchanged, but creates docstring links to
+    // constants
+    // TODO the doc string link doesn't work if $x is taken from a generic,
+    (maybe_docstring_link $x:literal) => (stringify!($x));
+    (maybe_docstring_link $x:expr) => (stringify!([$x]));
+
+    // struct name  < optional generics     >    := optional doc string      field name   : field length, ...
+($type:ident $( < $( $generic:ident ),+ > )? := $( $( #[ $attr:meta ] )* $field:ident : $len:expr ),+) => (::paste::paste!{
+
+        #[allow(rustdoc::broken_intra_doc_links)]
+        /// A data lense to manipulate byte slices.
+        ///
+        //// # Fields
+        ///
+        $(
+        /// - `
+        #[doc = stringify!($field)]
+        /// `:
+        #[doc = lense!(maybe_docstring_link $len)]
+        /// bytes
+        )+
+        pub struct $type<__ContainerType $(, $( $generic ),+ )? > (
+            __ContainerType,
+            // The phantom data is required, since all generics declared on a
+            // type need to be used on the type.
+            // https://doc.rust-lang.org/stable/error_codes/E0392.html
+            $( $( ::core::marker::PhantomData<$generic> ),+ )?
+        );
+
+        impl<__ContainerType $(, $( $generic: LenseView ),+ )? > $type<__ContainerType $(, $( $generic ),+ )? >{
+            $(
+            /// Size in bytes of the field `
+            #[doc = !($field)]
+            /// `
+            pub const fn [< $field _len >]() -> usize{
+                $len
+            }
+            )+
+
+            /// Verify that `len` exactly holds [Self]
+            pub fn check_size(len: usize) -> ::rosenpass_lenses::LenseResult<()> {
+                ::rosenpass_lenses::LenseError::ensure_exact_buffer_size(len, $( $len + )+ 0)
+            }
+        }
+
+        // read-only accessor functions
+        impl<'a, __ContainerType $(, $( $generic: LenseView ),+ )?> $type<&'a __ContainerType $(, $( $generic ),+ )?>
+        where
+            __ContainerType: std::ops::Index<std::ops::Range<usize>> + ?Sized,
+        {
+            lense!{token_muncher_ref @ 0 ; $( $( $attr )* ; $field : $len ),+ }
+
+            /// View into all bytes belonging to this Lense
+            pub fn all_bytes(&self) -> &__ContainerType::Output {
+                &self.0[0..Self::LEN]
+            }
+        }
+
+        // mutable accessor functions
+        impl<'a, __ContainerType $(, $( $generic: LenseView ),+ )?> $type<&'a mut __ContainerType $(, $( $generic ),+ )?>
+        where
+            __ContainerType: std::ops::IndexMut<std::ops::Range<usize>> + ?Sized,
+        {
+            lense!{token_muncher_ref @ 0 ; $( $( $attr )* ; $field : $len ),+ }
+            lense!{token_muncher_mut @ 0 ; $( $( $attr )* ; $field : $len ),+ }
+
+            /// View into all bytes belonging to this Lense
+            pub fn all_bytes(&self) -> &__ContainerType::Output {
+                &self.0[0..Self::LEN]
+            }
+
+            /// View into all bytes belonging to this Lense
+            pub fn all_bytes_mut(&mut self) -> &mut __ContainerType::Output {
+                &mut self.0[0..Self::LEN]
+            }
+        }
+
+        // lense trait, allowing us to know the implementing lenses size
+        impl<__ContainerType $(, $( $generic: LenseView ),+ )? > LenseView for $type<__ContainerType $(, $( $generic ),+ )? >{
+            /// Number of bytes required to store this type in binary format
+            const LEN: usize = $( $len + )+ 0;
+        }
+
+        /// Extension trait to allow checked creation of a lense over
+        /// some byte slice that contains a
+        #[doc = lense!(maybe_docstring_link $type)]
+        pub trait [< $type Ext >] {
+            type __ContainerType;
+
+            /// Create a lense to the byte slice
+            fn [< $type:snake >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >>;
+
+            /// Create a lense to the byte slice, automatically truncating oversized buffers
+            fn [< $type:snake _ truncating >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >>;
+        }
+
+        impl<'a> [< $type Ext >] for &'a [u8] {
+            type __ContainerType = &'a [u8];
+
+            fn [< $type:snake >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >> {
+                $type::<Self::__ContainerType, $( $($generic),+ )? >::check_size(self.len())?;
+                Ok($type ( self, $( $( ::core::marker::PhantomData::<$generic>  ),+ )? ))
+            }
+
+            fn [< $type:snake _ truncating >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >> {
+                let required_size = $( $len + )+ 0;
+                ::rosenpass_lenses::LenseError::ensure_sufficient_buffer_size(self.len(), required_size)?;
+                [< $type Ext >]::[< $type:snake >](&self[..required_size])
+            }
+        }
+
+        impl<'a> [< $type Ext >] for &'a mut [u8] {
+            type __ContainerType = &'a mut [u8];
+            fn [< $type:snake >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >> {
+                $type::<Self::__ContainerType, $( $($generic),+ )? >::check_size(self.len())?;
+                Ok($type ( self, $( $( ::core::marker::PhantomData::<$generic>  ),+ )? ))
+            }
+
+            fn [< $type:snake _ truncating >] $(< $($generic : LenseView),* >)? (self) -> ::rosenpass_lenses::LenseResult< $type<Self::__ContainerType, $( $($generic),+ )? >> {
+                let required_size = $( $len + )+ 0;
+                ::rosenpass_lenses::LenseError::ensure_sufficient_buffer_size(self.len(), required_size)?;
+                [< $type Ext >]::[< $type:snake >](&mut self[..required_size])
+            }
+        }
+    });
+);

manual_tests/psk_broker/peer_a.rp.config

@@ -1,13 +0,0 @@
-secret_key = "peer_a.rp.sk"
-public_key = "peer_a.rp.pk"
-listen = ["[::1]:46127"]
-verbosity = "Verbose"
-
-[api]
-listen_path = []
-listen_fd = []
-stream_fd = []
-
-[[peers]]
-public_key = "peer_b.rp.pk"
-device = "rpPskBrkTestA"

manual_tests/psk_broker/peer_b.rp.config

@@ -1,14 +0,0 @@
-secret_key = "peer_b.rp.sk"
-public_key = "peer_b.rp.pk"
-listen = []
-verbosity = "Verbose"
-
-[api]
-listen_path = []
-listen_fd = []
-stream_fd = []
-
-[[peers]]
-public_key = "peer_a.rp.pk"
-endpoint = "[::1]:46127"
-device = "rpPskBrkTestB"

manual_tests/psk_broker/run_test.sh

@@ -1,215 +0,0 @@
-#! /bin/bash
-
-set -e -o pipefail
-
-enquote() {
-  while (( "$#" > 1)); do
-    printf "%q " "$1"
-    shift
-  done
-  if (("$#" > 0)); then
-    printf "%q" "$1"
-  fi
-}
-
-CLEANUP_HOOKS=()
-hook_cleanup() {
-  local hook
-  set +e +o pipefail
-  for hook in "${CLEANUP_HOOKS[@]}"; do
-    eval "${hook}"
-  done
-}
-
-cleanup() {
-  CLEANUP_HOOKS=("$(enquote exc_with_ctx cleanup "$@")" "${CLEANUP_HOOKS[@]}")
-}
-
-cleanup_eval() {
-  cleanup eval "$*"
-}
-
-stderr() {
-  echo >&2 "$@"
-}
-
-log() {
-  local level; level="$1"; shift || fatal "USAGE: log LVL MESSAGE.."
-  stderr "[${level}]" "$@"
-}
-
-info() {
-  log "INFO" "$@"
-}
-
-debug() {
-  log "DEBUG" "$@"
-}
-
-fatal() {
-  log "FATAL" "$@"
-  exit 1
-}
-
-assert() {
-  local msg; msg="$1"; shift || fatal "USAGE: assert_cmd MESSAGE COMMAND.."
-  "$@" || fatal "${msg}"
-}
-
-abs_dir() {
-  local dir; dir="$1"; shift || fatal "USAGE: abs_dir DIR"
-  (
-    cd "${dir}"
-    pwd -P
-  )
-}
-
-exc_with_ctx() {
-  local ctx; ctx="$1"; shift || fatal "USAGE: exc_with_ctx CONTEXT COMMAND.."
-  if [[ -z "${ctx}" ]]; then
-    info '$' "$@"
-  else
-    info "${ctx}\$" "$@"
-  fi
-
-  "$@"
-}
-
-exc() {
-  exc_with_ctx "" "$@"
-}
-
-exc_eval() {
-  exc eval "$*"
-} 
-
-exc_eval_with_ctx() {
-  local ctx; ctx="$1"; shift || fatal "USAGE: exc_eval_with_ctx CONTEXT EVAL_COMMAND.."
-  exc_with_ctx "eval:${ctx}" "$*"
-} 
-
-exc_as_user() {
-  exc sudo -u "${SUDO_USER}" "$@"
-}
-
-exc_eval_as_user() {
-  exc_as_user bash -c "$*"
-}
-
-fork_eval_as_user() {
-  exc sudo -u "${SUDO_USER}" bash -c "$*" &
-  local pid; pid="$!"
-  cleanup wait "${pid}"
-  cleanup pkill -2 -P "${pid}" # Reverse ordering
-}
-
-info_success() {
-  stderr
-  stderr
-  if [[ "${SUCCESS}" = 1 ]]; then
-    stderr "  Test was a success!"
-  else
-    stderr "  !!! TEST WAS A FAILURE!!!"
-  fi
-  stderr
-}
-
-main() {
-  assert "Use as root with sudo" [ "$(id -u)" -eq 0 ]
-  assert "Use as root with sudo" [ -n "${SUDO_UID}" ]
-  assert "SUDO_UID is 0; refusing to build as root" [ "${SUDO_UID}" -ne 0 ]
-
-  cleanup info_success
-
-  trap hook_cleanup EXIT
-
-  SCRIPT="$0"
-  CFG_TEMPLATE_DIR="$(abs_dir "$(dirname "${SCRIPT}")")"
-  REPO="$(abs_dir "${CFG_TEMPLATE_DIR}/../..")"
-  BINS="${REPO}/target/debug"
-
-  # Create temp dir
-  TMP_DIR="/tmp/rosenpass-psk-broker-test-$(date +%s)-$(uuidgen)"
-  cleanup rm -rf "${TMP_DIR}"
-  exc_as_user mkdir -p "${TMP_DIR}"
-
-  # Copy config
-  CFG_DIR="${TMP_DIR}/cfg"
-  exc_as_user cp -R "${CFG_TEMPLATE_DIR}" "${CFG_DIR}"
-
-  exc umask 077
-
-  exc cd "${REPO}"
-  local build_cmd; build_cmd=(cargo build --workspace --color=always --all-features --bins --profile dev)
-  if test -e "${BINS}/rosenpass-wireguard-broker-privileged" -a -e "${BINS}/rosenpass"; then
-    info "Found the binaries rosenpass-wireguard-broker-privileged and rosenpass." \
-      "Run following commands as a regular user to recompile the binaries with the right options" \
-      "in case of an error:" '$' "${build_cmd[@]}"
-  else
-    exc_as_user "${build_cmd[@]}"
-  fi
-  exc sudo setcap CAP_NET_ADMIN=+eip "${BINS}/rosenpass-wireguard-broker-privileged"
-
-  exc cd "${CFG_DIR}"
-  exc_eval_as_user "wg genkey > peer_a.wg.sk"
-  exc_eval_as_user "wg pubkey < peer_a.wg.sk > peer_a.wg.pk"
-  exc_eval_as_user "wg genkey > peer_b.wg.sk"
-  exc_eval_as_user "wg pubkey < peer_b.wg.sk > peer_b.wg.pk"
-  exc_eval_as_user "wg genpsk > peer_a_invalid.psk"
-  exc_eval_as_user "wg genpsk > peer_b_invalid.psk"
-  exc_eval_as_user "echo $(enquote "peer = \"$(cat peer_b.wg.pk)\"") >> peer_a.rp.config"
-  exc_eval_as_user "echo $(enquote "peer = \"$(cat peer_a.wg.pk)\"") >> peer_b.rp.config"
-  exc_as_user "${BINS}"/rosenpass gen-keys peer_a.rp.config
-  exc_as_user "${BINS}"/rosenpass gen-keys peer_b.rp.config
-
-  cleanup ip l del dev rpPskBrkTestA
-  cleanup ip l del dev rpPskBrkTestB
-  exc ip l add dev rpPskBrkTestA type wireguard
-  exc ip l add dev rpPskBrkTestB type wireguard
-
-  exc wg set rpPskBrkTestA \
-    listen-port 46125 \
-    private-key peer_a.wg.sk \
-    peer "$(cat peer_b.wg.pk)" \
-      endpoint 'localhost:46126' \
-      preshared-key peer_a_invalid.psk \
-      allowed-ips fe80::2/64
-  exc wg set rpPskBrkTestB \
-    listen-port 46126 \
-    private-key peer_b.wg.sk \
-    peer "$(cat peer_a.wg.pk)" \
-      endpoint 'localhost:46125' \
-      preshared-key peer_b_invalid.psk \
-      allowed-ips fe80::1/64
-
-  exc ip l set rpPskBrkTestA up
-  exc ip l set rpPskBrkTestB up
-
-  exc ip a add fe80::1/64 dev rpPskBrkTestA
-  exc ip a add fe80::2/64 dev rpPskBrkTestB
-
-  fork_eval_as_user "\
-    RUST_LOG='info' \
-    PATH=$(enquote "${REPO}/target/debug:${PATH}") \
-    $(enquote "${BINS}/rosenpass") --psk-broker-spawn \
-      exchange-config peer_a.rp.config"
-  fork_eval_as_user "\
-    RUST_LOG='info' \
-    PATH=$(enquote "${REPO}/target/debug:${PATH}") \
-    $(enquote "${BINS}/rosenpass-wireguard-broker-socket-handler") \
-      --listen-path broker.sock"
-  fork_eval_as_user "\
-    RUST_LOG='info' \
-    PATH=$(enquote "$PWD/target/debug:${PATH}") \
-    $(enquote "${BINS}/rosenpass") --psk-broker-path broker.sock \
-      exchange-config peer_b.rp.config"
-
-  exc_as_user ping -c 2 -w 10 fe80::1%rpPskBrkTestA
-  exc_as_user ping -c 2 -w 10 fe80::2%rpPskBrkTestB
-  exc_as_user ping -c 2 -w 10 fe80::2%rpPskBrkTestA
-  exc_as_user ping -c 2 -w 10 fe80::1%rpPskBrkTestB
-
-  SUCCESS=1
-}
-
-main "$@"

misc/README.md

@@ -1,40 +0,0 @@
-# Additional files
-
-This folder contains additional files that are used in the project.
-
-## `generate_configs.py`
-
-The script is used to generate configuration files for a benchmark setup
-consisting of a device under testing (DUT) and automatic test equipment (ATE),
-basically a strong machine capable of running multiple Rosenpass instances at
-once.
-
-At the top of the script multiple variables can be set to configure the DUT IP
-address and more. Once configured you may run `python3 generate_configs.py` to
-create the configuration files.
-
-A new folder called `output/` is created containing the subfolder `dut/` and
-`ate/`. The former has to be copied on the DUT, ideally reproducible hardware
-like a Raspberry Pi, while the latter is copied to the ATE, i.e. a laptop.
-
-### Running a benchmark
-
-On the ATE a run script is required since multiple instances of `rosenpass` are
-started with different configurations in parallel. The scripts are named after
-the number of instances they start, e.g. `run-50.sh` starts 50 instances.
-
-```shell
-# on the ATE aka laptop
-cd output/ate
-./run-10.sh
-```
-
-On the DUT you start a single Rosenpass instance with the configuration matching
-the ATE number of peers.
-
-```shell
-# on the DUT aka Raspberry Pi
-rosenpass exchange-config configs/dut-10.toml
-```
-
-Use whatever measurement tool you like to monitor the DUT and ATE.

misc/generate_configs.py

@@ -1,105 +0,0 @@
-from pathlib import Path
-from subprocess import run
-import os
-
-config = dict(
-    peer_counts=[1, 5, 10, 50, 100, 500],
-    peer_count_max=100,
-    ate_ip="127.0.0.1",
-    dut_ip="127.0.0.1",
-    dut_port=9999,
-    path_to_rosenpass_bin=os.getcwd() + "/target/release/rosenpass",
-)
-
-print(config)
-
-output_dir = Path("output")
-output_dir.mkdir(exist_ok=True)
-
-template_dut = """
-public_key = "keys/dut-public-key"
-secret_key = "keys/dut-secret-key"
-listen = ["{dut_ip}:{dut_port}"]
-verbosity = "Quiet"
-"""
-template_dut_peer = """
-[[peers]] # ATE-{i}
-public_key = "keys/ate-{i}-public-key"
-endpoint = "{ate_ip}:{ate_port}"
-key_out = "out/key_out_{i}"
-"""
-
-template_ate = """
-public_key = "keys/ate-{i}-public-key"
-secret_key = "keys/ate-{i}-secret-key"
-listen = ["{ate_ip}:{ate_port}"]
-verbosity = "Quiet"
-
-[[peers]] # DUT
-public_key = "keys/dut-public-key"
-endpoint = "{dut_ip}:{dut_port}"
-key_out = "out/key_out_{i}"
-"""
-
-(output_dir / "dut" / "keys").mkdir(exist_ok=True, parents=True)
-(output_dir / "dut" / "out").mkdir(exist_ok=True, parents=True)
-(output_dir / "dut" / "configs").mkdir(exist_ok=True, parents=True)
-(output_dir / "ate" / "keys").mkdir(exist_ok=True, parents=True)
-(output_dir / "ate" / "out").mkdir(exist_ok=True, parents=True)
-(output_dir / "ate" / "configs").mkdir(exist_ok=True, parents=True)
-
-for peer_count in config["peer_counts"]:
-    dut_config = template_dut.format(**config)
-    for i in range(peer_count):
-        dut_config += template_dut_peer.format(**config, i=i, ate_port=50000 + i)
-
-    (output_dir / "dut" / "configs" / f"dut-{peer_count}.toml").write_text(dut_config)
-
-    if not (output_dir / "dut" / "keys" / "dut-public-key").exists():
-        print("Generate DUT keys")
-        run(
-            [
-                config["path_to_rosenpass_bin"],
-                "gen-keys",
-                f"configs/dut-{peer_count}.toml",
-            ],
-            cwd=output_dir / "dut",
-        )
-    else:
-        print("DUT keys already exist")
-
-# copy the DUT public key to the ATE
-(output_dir / "ate" / "keys" / "dut-public-key").write_bytes(
-    (output_dir / "dut" / "keys" / "dut-public-key").read_bytes()
-)
-
-ate_script = "(trap 'kill 0' SIGINT; \\\n"
-
-for i in range(config["peer_count_max"]):
-    (output_dir / "ate" / "configs" / f"ate-{i}.toml").write_text(
-        template_ate.format(**config, i=i, ate_port=50000 + i)
-    )
-
-    if not (output_dir / "ate" / "keys" / f"ate-{i}-public-key").exists():
-        # generate ATE keys
-        run(
-            [config["path_to_rosenpass_bin"], "gen-keys", f"configs/ate-{i}.toml"],
-            cwd=output_dir / "ate",
-        )
-    else:
-        print(f"ATE-{i} keys already exist")
-
-    # copy the ATE public keys to the DUT
-    (output_dir / "dut" / "keys" / f"ate-{i}-public-key").write_bytes(
-        (output_dir / "ate" / "keys" / f"ate-{i}-public-key").read_bytes()
-    )
-
-    ate_script += (
-        f"{config['path_to_rosenpass_bin']} exchange-config configs/ate-{i}.toml & \\\n"
-    )
-
-    if (i + 1) in config["peer_counts"]:
-        write_script = ate_script
-        write_script += "wait)"
-
-        (output_dir / "ate" / f"run-{i+1}.sh").write_text(write_script)

papers/whitepaper.md

@@ -6,7 +6,6 @@ author:
 - Benjamin Lipp = Max Planck Institute for Security and Privacy (MPI-SP)
 - Wanja Zaeske
 - Lisa Schmidt = {Scientific Illustrator – \\url{mullana.de}}
-- Prabhpreet Dua
 abstract: |
        Rosenpass is used to create post-quantum-secure VPNs. Rosenpass computes a shared key, WireGuard (WG) [@wg] uses the shared key to establish a secure connection. Rosenpass can also be used without WireGuard, deriving post-quantum-secure symmetric keys for another application. The Rosenpass protocol builds on “Post-quantum WireGuard” (PQWG) [@pqwg] and improves it by using a cookie mechanism to provide security against state disruption attacks.
 
@@ -219,7 +218,6 @@ The server needs to store the following variables:
 * `spkm`
 * `biscuit_key` – Randomly chosen key used to encrypt biscuits
 * `biscuit_ctr` – Retransmission protection for biscuits
-* `cookie_secret`- A randomized cookie secret to derive cookies sent to peer when under load. This secret changes every 120 seconds
 
 Not mandated per se, but required in practice:
 
@@ -245,7 +243,6 @@ The initiator stores the following local state for each ongoing handshake:
 * `ck` – The chaining key
 * `eski` – The initiator's ephemeral secret key
 * `epki` – The initiator's ephemeral public key
-* `cookie_value`- Cookie value sent by an initiator peer under load, used to compute cookie field in outgoing handshake to peer under load. This value expires 120 seconds from when a peer sends this value using the CookieReply message
 
 The responder stores no state. While the responder has access to all of the above variables except for `eski`, the responder discards them after generating the RespHello message. Instead, the responder state is contained inside a cookie called a biscuit. This value is returned to the responder inside the InitConf packet. The biscuit consists of:
 
@@ -431,92 +428,12 @@ The responder code handling InitConf needs to deal with the biscuits and package
 
 ICR5 and ICR6 perform biscuit replay protection using the biscuit number. This is not handled in `load_biscuit()` itself because there is the case that `biscuit_no = biscuit_used` which needs to be dealt with for retransmission handling.
 
-### Denial of Service Mitigation and Cookies
-
-Rosenpass derives its cookie-based DoS mitigation technique for a responder when receiving InitHello messages from Wireguard [@wg]. 
-
-When the responder is under load, it may choose to not process further InitHello handshake messages, but instead to respond with a cookie reply message (see Figure \ref{img:MessageTypes}).
-
-The sender of the exchange then uses this cookie in order to resend the message and have it accepted the following time by the reciever. 
-
-For an initiator, Rosenpass ignores all messages when under load.
-
-#### Cookie Reply Message
-
-The cookie reply message is sent by the responder on receiving an InitHello message when under load. It consists of the `sidi` of the initiator, a random 24-byte bitstring `nonce` and encrypting `cookie_value` into a `cookie_encrypted` reply field which consists of the following:
-
-```pseudorust
-cookie_value = lhash("cookie-value", cookie_secret, initiator_host_info)[0..16]
-cookie_encrypted = XAEAD(lhash("cookie-key", spkm), nonce, cookie_value, mac_peer)
-```
-
-where `cookie_secret` is a secret variable that changes every two minutes to a random value. `initiator_host_info` is used to identify the initiator host, and is implementation-specific for the client. This paramaters used to identify the host must be carefully chosen to ensure there is a unique mapping, especially when using IPv4 and IPv6 addresses to identify the host (such as taking care of IPv6 link-local addresses). `cookie_value` is a truncated 16 byte value from the above hash operation. `mac_peer` is the `mac` field of the peer's handshake message to which message is the reply.  
-
-#### Envelope `mac` Field
-
-Similar to `mac.1` in Wireguard handshake messages, the `mac` field of a Rosenpass envelope from a handshake packet sender's point of view consists of the following:
-
-```pseudorust
-mac = lhash("mac", spkt, MAC_WIRE_DATA)[0..16]
-```
-
-where `MAC_WIRE_DATA` represents all bytes of msg prior to `mac` field in the envelope.
-
-If a client receives an invalid `mac` value for any message, it will discard the message.
-
-#### Envelope cookie field
-
-The initiator, on receiving a CookieReply message, decrypts `cookie_encrypted` and stores the `cookie_value` for the session into `peer[sid].cookie_value` for a limited time (120 seconds). This value is then used to set `cookie` field set for subsequent messages and retransmissions to the responder as follows:
-
-```pseudorust
-if (peer.cookie_value.is_none()  ||  seconds_since_update(peer[sid].cookie_value) >= 120) {
-    cookie.zeroize(); //zeroed out 16 bytes bitstring
-}
-else {
-    cookie = lhash("cookie",peer.cookie_value.unwrap(),COOKIE_WIRE_DATA)
-}
-```
-
-Here, `seconds_since_update(peer.cookie_value)` is the amount of time in seconds ellapsed since last cookie was received, and `COOKIE_WIRE_DATA` are the message contents of all bytes of the retransmitted message prior to the `cookie` field.
-
-The inititator can use an invalid value for the `cookie` value, when the responder is not under load, and the responder must ignore this value.
-However, when the responder is under load, it may reject InitHello messages with the invalid `cookie` value, and issue a cookie reply message. 
-
-### Conditions to trigger DoS Mechanism
-
-This whitepaper does not mandate any specific mechanism to detect responder contention (also mentioned as the under load condition) that would trigger use of the cookie mechanism.
-
-For the reference implemenation, Rosenpass has derived inspiration from the linux implementation of Wireguard.  This implementation suggests that the reciever keep track of the number of messages it is processing at a given time. 
-
-On receiving an incoming message, if the length of the message queue to be processed exceeds a threshold `MAX_QUEUED_INCOMING_HANDSHAKES_THRESHOLD`, the client is considered under load and its state is stored as under load. In addition, the timestamp of this instant when the client was last under load is stored. When recieving subsequent messages, if the client is still in an under load state, the client will check if the time ellpased since the client was last under load has exceeded `LAST_UNDER_LOAD_WINDOW` seconds. If this is the case, the client will update its state to normal operation, and process the message in a normal fashion.
-
-Currently, the following constants are derived from the Linux kernel implementation of Wireguard:
-
-```pseudorust
-MAX_QUEUED_INCOMING_HANDSHAKES_THRESHOLD = 4096
-LAST_UNDER_LOAD_WINDOW = 1 //seconds
-```
-
 ## Dealing with Packet Loss
 
 The initiator deals with packet loss by storing the messages it sends to the responder and retransmitting them in randomized, exponentially increasing intervals until they get a response. Receiving RespHello terminates retransmission of InitHello. A Data or EmptyData message serves as acknowledgement of receiving InitConf and terminates its retransmission.
 
 The responder does not need to do anything special to handle RespHello retransmission – if the RespHello package is lost, the initiator retransmits InitHello and the responder can generate another RespHello package from that. InitConf retransmission needs to be handled specifically in the responder code because accepting an InitConf retransmission would reset the live session including the nonce counter, which would cause nonce reuse. Implementations must detect the case that `biscuit_no = biscuit_used` in ICR5, skip execution of ICR6 and ICR7, and just transmit another EmptyData package to confirm that the initiator can stop transmitting InitConf.
 
-### Interaction with cookie reply system
-
-The cookie reply system does not interfere with the retransmission logic discussed above. 
-
-When the initator is under load, it will ignore processing any incoming messages.
-
-When a responder is under load and it receives an InitHello handshake message, the InitHello message will be discarded and a cookie reply message is sent. The initiator, then on the reciept of the cookie reply message, will store a decrypted `cookie_value` to set the `cookie` field to subsequently sent messages. As per the retransmission mechanism above, the initiator will send a retransmitted InitHello message with a valid `cookie` value appended. On receiving the retransmitted handshake message, the responder will validate the `cookie` value and resume with the handshake process. 
-
-When the responder is under load and it recieves an InitConf message, the message will be directly processed without checking the validity of the cookie field.
-
-# Changelog
-
-- Added section "Denial of Service Mitigation and Cookies", and modify "Dealing with Packet Loss" for DoS cookie mechanism
-
 \printbibliography
 
 \setupimage{landscape,fullpage,label=img:HandlingCode}

readme.md

@@ -25,11 +25,11 @@ Follow [quick start instructions](https://rosenpass.eu/#start) to get a VPN up a
 
 ## Software architecture
 
-The [rosenpass tool](./src/) is written in Rust and uses liboqs[^liboqs]. The tool establishes a symmetric key and provides it to WireGuard. Since it supplies WireGuard with key through the PSK feature using Rosenpass+WireGuard is cryptographically no less secure than using WireGuard on its own ("hybrid security"). Rosenpass refreshes the symmetric key every two minutes.
+The [rosenpass tool](./src/) is written in Rust and uses liboqs[^liboqs] and libsodium[^libsodium]. The tool establishes a symmetric key and provides it to WireGuard. Since it supplies WireGuard with key through the PSK feature using Rosenpass+WireGuard is cryptographically no less secure than using WireGuard on its own ("hybrid security"). Rosenpass refreshes the symmetric key every two minutes.
 
 As with any application a small risk of critical security issues (such as buffer overflows, remote code execution) exists; the Rosenpass application is written in the Rust programming language which is much less prone to such issues. Rosenpass can also write keys to files instead of supplying them to WireGuard With a bit of scripting the stand alone mode of the implementation can be used to run the application in a Container, VM or on another host. This mode can also be used to integrate tools other than WireGuard with Rosenpass.
 
-The [`rp`](./rp) tool written in Rust makes it easy to create a VPN using WireGuard and Rosenpass.
+The [`rp`](./rp) tool written in bash makes it easy to create a VPN using WireGuard and Rosenpass.
 
 `rp` is easy to get started with but has a few drawbacks; it runs as root, demanding access to both WireGuard
 and Rosenpass private keys, takes control of the interface and works with exactly one interface. If you do not feel confident about running Rosenpass as root, you should use the stand-alone mode to create a more secure setup using containers, jails, or virtual machines.
@@ -59,6 +59,7 @@ The code uses a variety of optimizations to speed up analysis such as using secr
 A wrapper script provides instant feedback about which queries execute as expected in color: A red cross if a query fails and a green check if it succeeds.
 
 [^liboqs]: https://openquantumsafe.org/liboqs/
+[^libsodium]: https://doc.libsodium.org/
 [^wg]: https://www.wireguard.com/
 [^pqwg]: https://eprint.iacr.org/2020/379
 [^pqwg-statedis]: Unless supplied with a pre-shared-key, but this defeats the purpose of a key exchange protocol
@@ -66,8 +67,6 @@ A wrapper script provides instant feedback about which queries execute as expect
 
 # Getting Rosenpass
 
-Documentation and installation guides can be found at the [Rosenpass website](https://rosenpass.eu/docs).
-
 Rosenpass is packaged for more and more distributions, maybe also for the distribution of your choice?
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/rosenpass.svg)](https://repology.org/project/rosenpass/versions)

rosenpass/Cargo.toml

@@ -9,23 +9,6 @@ homepage = "https://rosenpass.eu/"
 repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
-[[bin]]
-name = "rosenpass"
-path = "src/main.rs"
-
-[[bin]]
-name = "rosenpass-gen-ipc-msg-types"
-path = "src/bin/gen-ipc-msg-types.rs"
-required-features = ["experiment_api", "internal_bin_gen_ipc_msg_types"]
-
-[[test]]
-name = "api-integration-tests"
-required-features = ["experiment_api", "internal_testing"]
-
-[[test]]
-name = "api-integration-tests-api-setup"
-required-features = ["experiment_api", "internal_testing"]
-
 [[bench]]
 name = "handshake"
 harness = false
@@ -33,13 +16,16 @@ harness = false
 [dependencies]
 rosenpass-util = { workspace = true }
 rosenpass-constant-time = { workspace = true }
+rosenpass-sodium = { workspace = true }
 rosenpass-ciphers = { workspace = true }
 rosenpass-cipher-traits = { workspace = true }
 rosenpass-to = { workspace = true }
 rosenpass-secret-memory = { workspace = true }
+rosenpass-lenses = { workspace = true }
 anyhow = { workspace = true }
 static_assertions = { workspace = true }
 memoffset = { workspace = true }
+libsodium-sys-stable = { workspace = true }
 thiserror = { workspace = true }
 paste = { workspace = true }
 log = { workspace = true }
@@ -49,17 +35,6 @@ toml = { workspace = true }
 clap = { workspace = true }
 mio = { workspace = true }
 rand = { workspace = true }
-zerocopy = { workspace = true }
-home = { workspace = true }
-derive_builder = {workspace = true}
-rosenpass-wireguard-broker = {workspace = true}
-zeroize = { workspace = true }
-hex-literal = { workspace = true, optional = true }
-hex = { workspace = true, optional = true }
-heck = { workspace = true, optional = true }
-command-fds = { workspace = true, optional = true }
-rustix = { workspace = true }
-uds = { workspace = true, optional = true, features = ["mio_1xx"] }
 
 [build-dependencies]
 anyhow = { workspace = true }
@@ -68,15 +43,3 @@ anyhow = { workspace = true }
 criterion = { workspace = true }
 test_bin = { workspace = true }
 stacker = { workspace = true }
-serial_test = {workspace = true}
-procspawn = {workspace = true}
-tempfile = { workspace = true }
-rustix = {workspace = true}
-
-[features]
-default = ["experiment_api"]
-experiment_memfd_secret = ["rosenpass-wireguard-broker/experiment_memfd_secret"]
-experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"]
-experiment_api = ["hex-literal", "uds", "command-fds", "rosenpass-util/experiment_file_descriptor_passing", "rosenpass-wireguard-broker/experiment_api"]
-internal_testing  = []
-internal_bin_gen_ipc_msg_types = ["hex", "heck"]

rosenpass/benches/handshake.rs

@@ -1,12 +1,12 @@
 use anyhow::Result;
-use rosenpass::protocol::{CryptoServer, HandleMsgResult, MsgBuf, PeerPtr, SPk, SSk, SymKey};
-use std::ops::DerefMut;
-
-use rosenpass_cipher_traits::Kem;
-use rosenpass_ciphers::kem::StaticKem;
+use rosenpass::pqkem::KEM;
+use rosenpass::{
+    pqkem::StaticKEM,
+    protocol::{CryptoServer, HandleMsgResult, MsgBuf, PeerPtr, SPk, SSk, SymKey},
+    sodium::sodium_init,
+};
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use rosenpass_secret_memory::secret_policy_try_use_memfd_secrets;
 
 fn handle(
     tx: &mut CryptoServer,
@@ -41,7 +41,7 @@ fn hs(ini: &mut CryptoServer, res: &mut CryptoServer) -> Result<()> {
 
 fn keygen() -> Result<(SSk, SPk)> {
     let (mut sk, mut pk) = (SSk::zero(), SPk::zero());
-    StaticKem::keygen(sk.secret_mut(), pk.deref_mut())?;
+    StaticKEM::keygen(sk.secret_mut(), pk.secret_mut())?;
     Ok((sk, pk))
 }
 
@@ -58,7 +58,7 @@ fn make_server_pair() -> Result<(CryptoServer, CryptoServer)> {
 }
 
 fn criterion_benchmark(c: &mut Criterion) {
-    secret_policy_try_use_memfd_secrets();
+    sodium_init().unwrap();
     let (mut a, mut b) = make_server_pair().unwrap();
     c.bench_function("cca_secret_alloc", |bench| {
         bench.iter(|| {

rosenpass/build.rs

@@ -30,7 +30,8 @@ fn generate_man() -> String {
         return man;
     }
 
-    "Cannot render manual page. Please visit https://rosenpass.eu/docs/manuals/\n".into()
+    // TODO: Link to online manual here
+    "Cannot render manual page\n".into()
 }
 
 fn man() {

rosenpass/src/api/api_handler.rs

@@ -1,295 +0,0 @@
-use std::{borrow::BorrowMut, collections::VecDeque, os::fd::OwnedFd};
-
-use anyhow::Context;
-use rosenpass_to::{ops::copy_slice, To};
-use rosenpass_util::{
-    fd::FdIo,
-    functional::{run, ApplyExt},
-    io::ReadExt,
-    mem::DiscardResultExt,
-    mio::UnixStreamExt,
-    result::OkExt,
-};
-use rosenpass_wireguard_broker::brokers::mio_client::MioBrokerClient;
-
-use crate::{
-    api::{add_listen_socket_response_status, add_psk_broker_response_status},
-    app_server::AppServer,
-    protocol::BuildCryptoServer,
-};
-
-use super::{supply_keypair_response_status, Server as ApiServer};
-
-#[derive(Debug)]
-pub struct ApiHandler {
-    _dummy: (),
-}
-
-impl ApiHandler {
-    #[allow(clippy::new_without_default)]
-    pub fn new() -> Self {
-        Self { _dummy: () }
-    }
-}
-
-pub trait ApiHandlerContext {
-    fn api_handler(&self) -> &ApiHandler;
-    fn app_server(&self) -> &AppServer;
-    fn api_handler_mut(&mut self) -> &mut ApiHandler;
-    fn app_server_mut(&mut self) -> &mut AppServer;
-}
-
-#[derive(thiserror::Error, Debug)]
-#[error("Error in SupplyKeypair")]
-struct SupplyKeypairError {
-    status: u128,
-    #[source]
-    cause: anyhow::Error,
-}
-
-trait SupplyKeypairErrorExt<T> {
-    fn e_custom(self, status: u128) -> Result<T, SupplyKeypairError>;
-    fn einternal(self) -> Result<T, SupplyKeypairError>;
-    fn ealready_supplied(self) -> Result<T, SupplyKeypairError>;
-    fn einvalid_req(self) -> Result<T, SupplyKeypairError>;
-}
-
-impl<T, E: Into<anyhow::Error>> SupplyKeypairErrorExt<T> for Result<T, E> {
-    fn e_custom(self, status: u128) -> Result<T, SupplyKeypairError> {
-        self.map_err(|e| SupplyKeypairError {
-            status,
-            cause: e.into(),
-        })
-    }
-
-    fn einternal(self) -> Result<T, SupplyKeypairError> {
-        self.e_custom(supply_keypair_response_status::INTERNAL_ERROR)
-    }
-
-    fn ealready_supplied(self) -> Result<T, SupplyKeypairError> {
-        self.e_custom(supply_keypair_response_status::KEYPAIR_ALREADY_SUPPLIED)
-    }
-
-    fn einvalid_req(self) -> Result<T, SupplyKeypairError> {
-        self.e_custom(supply_keypair_response_status::INVALID_REQUEST)
-    }
-}
-
-impl<T> ApiServer for T
-where
-    T: ?Sized + ApiHandlerContext,
-{
-    fn ping(
-        &mut self,
-        req: &super::PingRequest,
-        _req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::PingResponse,
-    ) -> anyhow::Result<()> {
-        let (req, res) = (&req.payload, &mut res.payload);
-        copy_slice(&req.echo).to(&mut res.echo);
-        Ok(())
-    }
-
-    fn supply_keypair(
-        &mut self,
-        req: &super::SupplyKeypairRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::SupplyKeypairResponse,
-    ) -> anyhow::Result<()> {
-        let outcome: Result<(), SupplyKeypairError> = run(|| {
-            // Acquire the file descriptors
-            let mut sk_io = FdIo(
-                req_fds
-                    .front()
-                    .context("First file descriptor, secret key, missing.")
-                    .einvalid_req()?,
-            );
-            let mut pk_io = FdIo(
-                req_fds
-                    .get(1)
-                    .context("Second file descriptor, public key, missing.")
-                    .einvalid_req()?,
-            );
-
-            // Actually read the secrets
-            let mut sk = crate::protocol::SSk::zero();
-            sk_io.read_exact_til_end(sk.secret_mut()).einvalid_req()?;
-
-            let mut pk = crate::protocol::SPk::zero();
-            pk_io.read_exact_til_end(pk.borrow_mut()).einvalid_req()?;
-
-            // Retrieve the construction site
-            let construction_site = self.app_server_mut().crypto_site.borrow_mut();
-
-            // Retrieve the builder
-            use rosenpass_util::build::ConstructionSite as C;
-            let maybe_builder = match construction_site {
-                C::Builder(builder) => Some(builder),
-                C::Product(_) => None,
-                C::Void => {
-                    return Err(anyhow::Error::msg("CryptoServer construction side is void"))
-                        .einternal();
-                }
-            };
-
-            // Retrieve a reference to the keypair
-            let Some(BuildCryptoServer {
-                ref mut keypair, ..
-            }) = maybe_builder
-            else {
-                return Err(anyhow::Error::msg("CryptoServer already built")).ealready_supplied();
-            };
-
-            // Supply the keypair to the CryptoServer
-            keypair
-                .insert(crate::protocol::Keypair { sk, pk })
-                .discard_result();
-
-            // Actually construct the CryptoServer
-            construction_site
-                .erect()
-                .map_err(|e| anyhow::Error::msg(format!("Error erecting the CryptoServer {e:?}")))
-                .einternal()?;
-
-            Ok(())
-        });
-
-        // Handle errors
-        use supply_keypair_response_status as status;
-        let status = match outcome {
-            Ok(()) => status::OK,
-            Err(e) => {
-                let lvl = match e.status {
-                    status::INTERNAL_ERROR => log::Level::Warn,
-                    _ => log::Level::Debug,
-                };
-
-                log::log!(
-                    lvl,
-                    "Error while processing API Request.\n    Request: {:?}\n    Error: {:?}",
-                    req,
-                    e.cause
-                );
-
-                if e.status == status::INTERNAL_ERROR {
-                    return Err(e.cause);
-                }
-
-                e.status
-            }
-        };
-
-        res.payload.status = status;
-
-        Ok(())
-    }
-
-    fn add_listen_socket(
-        &mut self,
-        _req: &super::boilerplate::AddListenSocketRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::boilerplate::AddListenSocketResponse,
-    ) -> anyhow::Result<()> {
-        // Retrieve file descriptor
-        let sock_res = run(|| -> anyhow::Result<mio::net::UdpSocket> {
-            let sock = req_fds
-                .pop_front()
-                .context("Invalid request – socket missing.")?;
-            // TODO: We need to have this outside linux
-            #[cfg(target_os = "linux")]
-            rosenpass_util::fd::GetSocketProtocol::demand_udp_socket(&sock)?;
-            let sock = std::net::UdpSocket::from(sock);
-            sock.set_nonblocking(true)?;
-            mio::net::UdpSocket::from_std(sock).ok()
-        });
-
-        let sock = match sock_res {
-            Ok(sock) => sock,
-            Err(e) => {
-                log::debug!("Error processing AddListenSocket API request: {e:?}");
-                res.payload.status = add_listen_socket_response_status::INVALID_REQUEST;
-                return Ok(());
-            }
-        };
-
-        // Register socket
-        let reg_result = self.app_server_mut().register_listen_socket(sock);
-
-        if let Err(internal_error) = reg_result {
-            log::warn!("Internal error processing AddListenSocket API request: {internal_error:?}");
-            res.payload.status = add_listen_socket_response_status::INTERNAL_ERROR;
-            return Ok(());
-        };
-
-        res.payload.status = add_listen_socket_response_status::OK;
-        Ok(())
-    }
-
-    fn add_psk_broker(
-        &mut self,
-        _req: &super::boilerplate::AddPskBrokerRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::boilerplate::AddPskBrokerResponse,
-    ) -> anyhow::Result<()> {
-        // Retrieve file descriptor
-        let sock_res = run(|| {
-            let sock = req_fds
-                .pop_front()
-                .context("Invalid request – socket missing.")?;
-            mio::net::UnixStream::from_fd(sock)
-        });
-
-        // Handle errors
-        let sock = match sock_res {
-            Ok(sock) => sock,
-            Err(e) => {
-                log::debug!(
-                    "Request found to be invalid while processing AddPskBroker API request: {e:?}"
-                );
-                res.payload.status = add_psk_broker_response_status::INVALID_REQUEST;
-                return Ok(());
-            }
-        };
-
-        // Register Socket
-        let client = Box::new(MioBrokerClient::new(sock));
-
-        // Workaround: The broker code is currently impressively overcomplicated. Brokers are
-        // stored in a hash map but the hash map key used is just a counter so a vector could
-        // have been used. Broker configuration is abstracted, different peers can have different
-        // brokers but there is no facility to add multiple brokers in practice. The broker index
-        // uses a `Public` wrapper without actually holding any cryptographic data. Even the broker
-        // configuration uses a trait abstraction for no discernible reason and a lot of the code
-        // introduces pointless, single-field wrapper structs.
-        // We should use an implement-what-is-actually-needed strategy next time.
-        // The Broker code needs to be slimmed down, the right direction to go is probably to
-        // just add event and capability support to the API and use the API to deliver OSK events.
-        //
-        // For now, we just replace the latest broker.
-        let erase_ptr = {
-            use crate::app_server::BrokerStorePtr;
-            //
-            use rosenpass_secret_memory::Public;
-            use zerocopy::AsBytes;
-            (self.app_server().brokers.store.len() - 1)
-                .apply(|x| x as u64)
-                .apply(|x| Public::from_slice(x.as_bytes()))
-                .apply(BrokerStorePtr)
-        };
-
-        let register_result = run(|| {
-            let srv = self.app_server_mut();
-            srv.unregister_broker(erase_ptr)?;
-            srv.register_broker(client)
-        });
-
-        if let Err(e) = register_result {
-            log::warn!("Internal error while processing AddPskBroker API request: {e:?}");
-            res.payload.status = add_psk_broker_response_status::INTERNAL_ERROR;
-            return Ok(());
-        }
-
-        res.payload.status = add_psk_broker_response_status::OK;
-        Ok(())
-    }
-}

rosenpass/src/api/boilerplate/byte_slice_ext.rs

@@ -1,222 +0,0 @@
-use zerocopy::{ByteSlice, Ref};
-
-use rosenpass_util::zerocopy::{RefMaker, ZerocopySliceExt};
-
-use super::{
-    PingRequest, PingResponse, RawMsgType, RefMakerRawMsgTypeExt, RequestMsgType, RequestRef,
-    ResponseMsgType, ResponseRef, SupplyKeypairRequest, SupplyKeypairResponse,
-};
-
-pub trait ByteSliceRefExt: ByteSlice {
-    fn msg_type_maker(self) -> RefMaker<Self, RawMsgType> {
-        self.zk_ref_maker()
-    }
-
-    fn msg_type(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse()
-    }
-
-    fn msg_type_from_prefix(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse_prefix()
-    }
-
-    fn msg_type_from_suffix(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse_suffix()
-    }
-
-    fn request_msg_type(self) -> anyhow::Result<RequestMsgType> {
-        self.msg_type_maker().parse_request_msg_type()
-    }
-
-    fn request_msg_type_from_prefix(self) -> anyhow::Result<RequestMsgType> {
-        self.msg_type_maker()
-            .from_prefix()?
-            .parse_request_msg_type()
-    }
-
-    fn request_msg_type_from_suffix(self) -> anyhow::Result<RequestMsgType> {
-        self.msg_type_maker()
-            .from_suffix()?
-            .parse_request_msg_type()
-    }
-
-    fn response_msg_type(self) -> anyhow::Result<ResponseMsgType> {
-        self.msg_type_maker().parse_response_msg_type()
-    }
-
-    fn response_msg_type_from_prefix(self) -> anyhow::Result<ResponseMsgType> {
-        self.msg_type_maker()
-            .from_prefix()?
-            .parse_response_msg_type()
-    }
-
-    fn response_msg_type_from_suffix(self) -> anyhow::Result<ResponseMsgType> {
-        self.msg_type_maker()
-            .from_suffix()?
-            .parse_response_msg_type()
-    }
-
-    fn parse_request(self) -> anyhow::Result<RequestRef<Self>> {
-        RequestRef::parse(self)
-    }
-
-    fn parse_request_from_prefix(self) -> anyhow::Result<RequestRef<Self>> {
-        RequestRef::parse_from_prefix(self)
-    }
-
-    fn parse_request_from_suffix(self) -> anyhow::Result<RequestRef<Self>> {
-        RequestRef::parse_from_suffix(self)
-    }
-
-    fn parse_response(self) -> anyhow::Result<ResponseRef<Self>> {
-        ResponseRef::parse(self)
-    }
-
-    fn parse_response_from_prefix(self) -> anyhow::Result<ResponseRef<Self>> {
-        ResponseRef::parse_from_prefix(self)
-    }
-
-    fn parse_response_from_suffix(self) -> anyhow::Result<ResponseRef<Self>> {
-        ResponseRef::parse_from_suffix(self)
-    }
-
-    fn ping_request_maker(self) -> RefMaker<Self, PingRequest> {
-        self.zk_ref_maker()
-    }
-
-    fn ping_request(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse()
-    }
-
-    fn ping_request_from_prefix(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse_prefix()
-    }
-
-    fn ping_request_from_suffix(self) -> anyhow::Result<Ref<Self, PingRequest>> {
-        self.zk_parse_suffix()
-    }
-
-    fn ping_response_maker(self) -> RefMaker<Self, PingResponse> {
-        self.zk_ref_maker()
-    }
-
-    fn ping_response(self) -> anyhow::Result<Ref<Self, PingResponse>> {
-        self.zk_parse()
-    }
-
-    fn ping_response_from_prefix(self) -> anyhow::Result<Ref<Self, PingResponse>> {
-        self.zk_parse_prefix()
-    }
-
-    fn ping_response_from_suffix(self) -> anyhow::Result<Ref<Self, PingResponse>> {
-        self.zk_parse_suffix()
-    }
-
-    fn supply_keypair_request(self) -> anyhow::Result<Ref<Self, SupplyKeypairRequest>> {
-        self.zk_parse()
-    }
-
-    fn supply_keypair_request_from_prefix(self) -> anyhow::Result<Ref<Self, SupplyKeypairRequest>> {
-        self.zk_parse_prefix()
-    }
-
-    fn supply_keypair_request_from_suffix(self) -> anyhow::Result<Ref<Self, SupplyKeypairRequest>> {
-        self.zk_parse_suffix()
-    }
-
-    fn supply_keypair_response_maker(self) -> RefMaker<Self, SupplyKeypairResponse> {
-        self.zk_ref_maker()
-    }
-
-    fn supply_keypair_response(self) -> anyhow::Result<Ref<Self, SupplyKeypairResponse>> {
-        self.zk_parse()
-    }
-
-    fn supply_keypair_response_from_prefix(
-        self,
-    ) -> anyhow::Result<Ref<Self, SupplyKeypairResponse>> {
-        self.zk_parse_prefix()
-    }
-
-    fn supply_keypair_response_from_suffix(
-        self,
-    ) -> anyhow::Result<Ref<Self, SupplyKeypairResponse>> {
-        self.zk_parse_suffix()
-    }
-
-    fn add_listen_socket_request(self) -> anyhow::Result<Ref<Self, super::AddListenSocketRequest>> {
-        self.zk_parse()
-    }
-
-    fn add_listen_socket_request_from_prefix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddListenSocketRequest>> {
-        self.zk_parse_prefix()
-    }
-
-    fn add_listen_socket_request_from_suffix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddListenSocketRequest>> {
-        self.zk_parse_suffix()
-    }
-
-    fn add_listen_socket_response_maker(self) -> RefMaker<Self, super::AddListenSocketResponse> {
-        self.zk_ref_maker()
-    }
-
-    fn add_listen_socket_response(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddListenSocketResponse>> {
-        self.zk_parse()
-    }
-
-    fn add_listen_socket_response_from_prefix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddListenSocketResponse>> {
-        self.zk_parse_prefix()
-    }
-
-    fn add_listen_socket_response_from_suffix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddListenSocketResponse>> {
-        self.zk_parse_suffix()
-    }
-
-    fn add_psk_broker_request(self) -> anyhow::Result<Ref<Self, super::AddPskBrokerRequest>> {
-        self.zk_parse()
-    }
-
-    fn add_psk_broker_request_from_prefix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddPskBrokerRequest>> {
-        self.zk_parse_prefix()
-    }
-
-    fn add_psk_broker_request_from_suffix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddPskBrokerRequest>> {
-        self.zk_parse_suffix()
-    }
-
-    fn add_psk_broker_response_maker(self) -> RefMaker<Self, super::AddPskBrokerResponse> {
-        self.zk_ref_maker()
-    }
-
-    fn add_psk_broker_response(self) -> anyhow::Result<Ref<Self, super::AddPskBrokerResponse>> {
-        self.zk_parse()
-    }
-
-    fn add_psk_broker_response_from_prefix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddPskBrokerResponse>> {
-        self.zk_parse_prefix()
-    }
-
-    fn add_psk_broker_response_from_suffix(
-        self,
-    ) -> anyhow::Result<Ref<Self, super::AddPskBrokerResponse>> {
-        self.zk_parse_suffix()
-    }
-}
-
-impl<B: ByteSlice> ByteSliceRefExt for B {}

rosenpass/src/api/boilerplate/message_trait.rs

@@ -1,29 +0,0 @@
-use zerocopy::{ByteSliceMut, Ref};
-
-use rosenpass_util::zerocopy::RefMaker;
-
-use super::RawMsgType;
-
-pub trait Message {
-    type Payload;
-    type MessageClass: Into<RawMsgType>;
-    const MESSAGE_TYPE: Self::MessageClass;
-
-    fn from_payload(payload: Self::Payload) -> Self;
-    fn init(&mut self);
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>>;
-}
-
-pub trait ZerocopyResponseMakerSetupMessageExt<B, T> {
-    fn setup_msg(self) -> anyhow::Result<Ref<B, T>>;
-}
-
-impl<B, T> ZerocopyResponseMakerSetupMessageExt<B, T> for RefMaker<B, T>
-where
-    B: ByteSliceMut,
-    T: Message,
-{
-    fn setup_msg(self) -> anyhow::Result<Ref<B, T>> {
-        T::setup(self.into_buf())
-    }
-}

rosenpass/src/api/boilerplate/message_type.rs

@@ -1,162 +0,0 @@
-use hex_literal::hex;
-use rosenpass_util::zerocopy::RefMaker;
-use zerocopy::ByteSlice;
-
-use crate::RosenpassError::{self, InvalidApiMessageType};
-
-pub type RawMsgType = u128;
-
-// constants generated by gen-ipc-msg-types:
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Ping Request
-pub const PING_REQUEST: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("2397 3ecc c441 704d    0b02 ea31 45d3 4999"));
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Ping Response
-pub const PING_RESPONSE: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("4ec7 f6f0 2bbc ba64    48f1 da14 c7cf 0260"));
-
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Supply Keypair Request
-const SUPPLY_KEYPAIR_REQUEST: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("ac91 a5a6 4f4b 21d0    ac7f 9b55 74f7 3529"));
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Supply Keypair Response
-const SUPPLY_KEYPAIR_RESPONSE: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("f2dc 49bd e261 5f10    40b7 3c16 ec61 edb9"));
-
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Add Listen Socket Request
-const ADD_LISTEN_SOCKET_REQUEST: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("3f21 434f 87cc a08c    02c4 61e4 0816 c7da"));
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Add Listen Socket Response
-const ADD_LISTEN_SOCKET_RESPONSE: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("45d5 0f0d 93f0 6105    98f2 9469 5dfd 5f36"));
-
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Add Psk Broker Request
-const ADD_PSK_BROKER_REQUEST: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("d798 b8dc bd61 5cab    8df1 c63d e4eb a2d1"));
-// hash domain hash of: Rosenpass IPC API -> Rosenpass Protocol Server -> Add Psk Broker Response
-const ADD_PSK_BROKER_RESPONSE: RawMsgType =
-    RawMsgType::from_le_bytes(hex!("bd25 e418 ffb0 6930    248b 217e 2fae e353"));
-
-pub trait MessageAttributes {
-    fn message_size(&self) -> usize;
-}
-
-#[derive(Hash, PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
-pub enum RequestMsgType {
-    Ping,
-    SupplyKeypair,
-    AddListenSocket,
-    AddPskBroker,
-}
-
-#[derive(Hash, PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
-pub enum ResponseMsgType {
-    Ping,
-    SupplyKeypair,
-    AddListenSocket,
-    AddPskBroker,
-}
-
-impl MessageAttributes for RequestMsgType {
-    fn message_size(&self) -> usize {
-        match self {
-            Self::Ping => std::mem::size_of::<super::PingRequest>(),
-            Self::SupplyKeypair => std::mem::size_of::<super::SupplyKeypairRequest>(),
-            Self::AddListenSocket => std::mem::size_of::<super::AddListenSocketRequest>(),
-            Self::AddPskBroker => std::mem::size_of::<super::AddPskBrokerRequest>(),
-        }
-    }
-}
-
-impl MessageAttributes for ResponseMsgType {
-    fn message_size(&self) -> usize {
-        match self {
-            Self::Ping => std::mem::size_of::<super::PingResponse>(),
-            Self::SupplyKeypair => std::mem::size_of::<super::SupplyKeypairResponse>(),
-            Self::AddListenSocket => std::mem::size_of::<super::AddListenSocketResponse>(),
-            Self::AddPskBroker => std::mem::size_of::<super::AddPskBrokerResponse>(),
-        }
-    }
-}
-
-impl TryFrom<RawMsgType> for RequestMsgType {
-    type Error = RosenpassError;
-
-    fn try_from(value: RawMsgType) -> Result<Self, Self::Error> {
-        use RequestMsgType as E;
-        Ok(match value {
-            self::PING_REQUEST => E::Ping,
-            self::SUPPLY_KEYPAIR_REQUEST => E::SupplyKeypair,
-            self::ADD_LISTEN_SOCKET_REQUEST => E::AddListenSocket,
-            self::ADD_PSK_BROKER_REQUEST => E::AddPskBroker,
-            _ => return Err(InvalidApiMessageType(value)),
-        })
-    }
-}
-
-impl From<RequestMsgType> for RawMsgType {
-    fn from(val: RequestMsgType) -> Self {
-        use RequestMsgType as E;
-        match val {
-            E::Ping => self::PING_REQUEST,
-            E::SupplyKeypair => self::SUPPLY_KEYPAIR_REQUEST,
-            E::AddListenSocket => self::ADD_LISTEN_SOCKET_REQUEST,
-            E::AddPskBroker => self::ADD_PSK_BROKER_REQUEST,
-        }
-    }
-}
-
-impl TryFrom<RawMsgType> for ResponseMsgType {
-    type Error = RosenpassError;
-
-    fn try_from(value: RawMsgType) -> Result<Self, Self::Error> {
-        use ResponseMsgType as E;
-        Ok(match value {
-            self::PING_RESPONSE => E::Ping,
-            self::SUPPLY_KEYPAIR_RESPONSE => E::SupplyKeypair,
-            self::ADD_LISTEN_SOCKET_RESPONSE => E::AddListenSocket,
-            self::ADD_PSK_BROKER_RESPONSE => E::AddPskBroker,
-            _ => return Err(InvalidApiMessageType(value)),
-        })
-    }
-}
-
-impl From<ResponseMsgType> for RawMsgType {
-    fn from(val: ResponseMsgType) -> Self {
-        use ResponseMsgType as E;
-        match val {
-            E::Ping => self::PING_RESPONSE,
-            E::SupplyKeypair => self::SUPPLY_KEYPAIR_RESPONSE,
-            E::AddListenSocket => self::ADD_LISTEN_SOCKET_RESPONSE,
-            E::AddPskBroker => self::ADD_PSK_BROKER_RESPONSE,
-        }
-    }
-}
-
-pub trait RawMsgTypeExt {
-    fn into_request_msg_type(self) -> Result<RequestMsgType, RosenpassError>;
-    fn into_response_msg_type(self) -> Result<ResponseMsgType, RosenpassError>;
-}
-
-impl RawMsgTypeExt for RawMsgType {
-    fn into_request_msg_type(self) -> Result<RequestMsgType, RosenpassError> {
-        self.try_into()
-    }
-
-    fn into_response_msg_type(self) -> Result<ResponseMsgType, RosenpassError> {
-        self.try_into()
-    }
-}
-
-pub trait RefMakerRawMsgTypeExt {
-    fn parse_request_msg_type(self) -> anyhow::Result<RequestMsgType>;
-    fn parse_response_msg_type(self) -> anyhow::Result<ResponseMsgType>;
-}
-
-impl<B: ByteSlice> RefMakerRawMsgTypeExt for RefMaker<B, RawMsgType> {
-    fn parse_request_msg_type(self) -> anyhow::Result<RequestMsgType> {
-        Ok(self.parse()?.read().try_into()?)
-    }
-
-    fn parse_response_msg_type(self) -> anyhow::Result<ResponseMsgType> {
-        Ok(self.parse()?.read().try_into()?)
-    }
-}

rosenpass/src/api/boilerplate/mod.rs

@@ -1,17 +0,0 @@
-mod byte_slice_ext;
-mod message_trait;
-mod message_type;
-mod payload;
-mod request_ref;
-mod request_response;
-mod response_ref;
-mod server;
-
-pub use byte_slice_ext::*;
-pub use message_trait::*;
-pub use message_type::*;
-pub use payload::*;
-pub use request_ref::*;
-pub use request_response::*;
-pub use response_ref::*;
-pub use server::*;

rosenpass/src/api/boilerplate/payload.rs

@@ -1,351 +0,0 @@
-use rosenpass_util::zerocopy::ZerocopyMutSliceExt;
-use zerocopy::{AsBytes, ByteSliceMut, FromBytes, FromZeroes, Ref};
-
-use super::{Message, RawMsgType, RequestMsgType, ResponseMsgType};
-
-/// Size required to fit any message in binary form
-pub const MAX_REQUEST_LEN: usize = 2500; // TODO fix this
-pub const MAX_RESPONSE_LEN: usize = 2500; // TODO fix this
-pub const MAX_REQUEST_FDS: usize = 2;
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct Envelope<M: AsBytes + FromBytes> {
-    /// Which message this is
-    pub msg_type: RawMsgType,
-    /// The actual Paylod
-    pub payload: M,
-}
-
-pub type RequestEnvelope<M> = Envelope<M>;
-pub type ResponseEnvelope<M> = Envelope<M>;
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct PingRequestPayload {
-    /// Randomly generated connection id
-    pub echo: [u8; 256],
-}
-
-pub type PingRequest = RequestEnvelope<PingRequestPayload>;
-
-impl PingRequest {
-    pub fn new(echo: [u8; 256]) -> Self {
-        Self::from_payload(PingRequestPayload { echo })
-    }
-}
-
-impl Message for PingRequest {
-    type Payload = PingRequestPayload;
-    type MessageClass = RequestMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = RequestMsgType::Ping;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct PingResponsePayload {
-    /// Randomly generated connection id
-    pub echo: [u8; 256],
-}
-
-pub type PingResponse = ResponseEnvelope<PingResponsePayload>;
-
-impl PingResponse {
-    pub fn new(echo: [u8; 256]) -> Self {
-        Self::from_payload(PingResponsePayload { echo })
-    }
-}
-
-impl Message for PingResponse {
-    type Payload = PingResponsePayload;
-    type MessageClass = ResponseMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = ResponseMsgType::Ping;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct SupplyKeypairRequestPayload {}
-
-pub type SupplyKeypairRequest = RequestEnvelope<SupplyKeypairRequestPayload>;
-
-impl Default for SupplyKeypairRequest {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl SupplyKeypairRequest {
-    pub fn new() -> Self {
-        Self::from_payload(SupplyKeypairRequestPayload {})
-    }
-}
-
-impl Message for SupplyKeypairRequest {
-    type Payload = SupplyKeypairRequestPayload;
-    type MessageClass = RequestMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = RequestMsgType::SupplyKeypair;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-pub mod supply_keypair_response_status {
-    pub const OK: u128 = 0;
-    pub const KEYPAIR_ALREADY_SUPPLIED: u128 = 1;
-    pub const INTERNAL_ERROR: u128 = 2;
-    pub const INVALID_REQUEST: u128 = 3;
-    pub const IO_ERROR: u128 = 4;
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct SupplyKeypairResponsePayload {
-    pub status: u128,
-}
-
-pub type SupplyKeypairResponse = ResponseEnvelope<SupplyKeypairResponsePayload>;
-
-impl SupplyKeypairResponse {
-    pub fn new(status: u128) -> Self {
-        Self::from_payload(SupplyKeypairResponsePayload { status })
-    }
-}
-
-impl Message for SupplyKeypairResponse {
-    type Payload = SupplyKeypairResponsePayload;
-    type MessageClass = ResponseMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = ResponseMsgType::SupplyKeypair;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct AddListenSocketRequestPayload {}
-
-pub type AddListenSocketRequest = RequestEnvelope<AddListenSocketRequestPayload>;
-
-impl Default for AddListenSocketRequest {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AddListenSocketRequest {
-    pub fn new() -> Self {
-        Self::from_payload(AddListenSocketRequestPayload {})
-    }
-}
-
-impl Message for AddListenSocketRequest {
-    type Payload = AddListenSocketRequestPayload;
-    type MessageClass = RequestMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = RequestMsgType::AddListenSocket;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-pub mod add_listen_socket_response_status {
-    pub const OK: u128 = 0;
-    pub const INVALID_REQUEST: u128 = 1;
-    pub const INTERNAL_ERROR: u128 = 2;
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct AddListenSocketResponsePayload {
-    pub status: u128,
-}
-
-pub type AddListenSocketResponse = ResponseEnvelope<AddListenSocketResponsePayload>;
-
-impl AddListenSocketResponse {
-    pub fn new(status: u128) -> Self {
-        Self::from_payload(AddListenSocketResponsePayload { status })
-    }
-}
-
-impl Message for AddListenSocketResponse {
-    type Payload = AddListenSocketResponsePayload;
-    type MessageClass = ResponseMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = ResponseMsgType::AddListenSocket;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct AddPskBrokerRequestPayload {}
-
-pub type AddPskBrokerRequest = RequestEnvelope<AddPskBrokerRequestPayload>;
-
-impl Default for AddPskBrokerRequest {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl AddPskBrokerRequest {
-    pub fn new() -> Self {
-        Self::from_payload(AddPskBrokerRequestPayload {})
-    }
-}
-
-impl Message for AddPskBrokerRequest {
-    type Payload = AddPskBrokerRequestPayload;
-    type MessageClass = RequestMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = RequestMsgType::AddPskBroker;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}
-
-pub mod add_psk_broker_response_status {
-    pub const OK: u128 = 0;
-    pub const INVALID_REQUEST: u128 = 1;
-    pub const INTERNAL_ERROR: u128 = 2;
-}
-
-#[repr(packed)]
-#[derive(Debug, Copy, Clone, Hash, AsBytes, FromBytes, FromZeroes, PartialEq, Eq)]
-pub struct AddPskBrokerResponsePayload {
-    pub status: u128,
-}
-
-pub type AddPskBrokerResponse = ResponseEnvelope<AddPskBrokerResponsePayload>;
-
-impl AddPskBrokerResponse {
-    pub fn new(status: u128) -> Self {
-        Self::from_payload(AddPskBrokerResponsePayload { status })
-    }
-}
-
-impl Message for AddPskBrokerResponse {
-    type Payload = AddPskBrokerResponsePayload;
-    type MessageClass = ResponseMsgType;
-    const MESSAGE_TYPE: Self::MessageClass = ResponseMsgType::AddPskBroker;
-
-    fn from_payload(payload: Self::Payload) -> Self {
-        Self {
-            msg_type: Self::MESSAGE_TYPE.into(),
-            payload,
-        }
-    }
-
-    fn setup<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self>> {
-        let mut r: Ref<B, Self> = buf.zk_zeroized()?;
-        r.init();
-        Ok(r)
-    }
-
-    fn init(&mut self) {
-        self.msg_type = Self::MESSAGE_TYPE.into();
-    }
-}

rosenpass/src/api/boilerplate/request_ref.rs

@@ -1,146 +0,0 @@
-use anyhow::ensure;
-
-use zerocopy::{ByteSlice, ByteSliceMut, Ref};
-
-use super::{ByteSliceRefExt, MessageAttributes, PingRequest, RequestMsgType};
-
-struct RequestRefMaker<B> {
-    buf: B,
-    msg_type: RequestMsgType,
-}
-
-impl<B: ByteSlice> RequestRef<B> {
-    pub fn parse(buf: B) -> anyhow::Result<Self> {
-        RequestRefMaker::new(buf)?.parse()
-    }
-
-    pub fn parse_from_prefix(buf: B) -> anyhow::Result<Self> {
-        RequestRefMaker::new(buf)?.from_prefix()?.parse()
-    }
-
-    pub fn parse_from_suffix(buf: B) -> anyhow::Result<Self> {
-        RequestRefMaker::new(buf)?.from_suffix()?.parse()
-    }
-
-    pub fn message_type(&self) -> RequestMsgType {
-        match self {
-            Self::Ping(_) => RequestMsgType::Ping,
-            Self::SupplyKeypair(_) => RequestMsgType::SupplyKeypair,
-            Self::AddListenSocket(_) => RequestMsgType::AddListenSocket,
-            Self::AddPskBroker(_) => RequestMsgType::AddPskBroker,
-        }
-    }
-}
-
-impl<B> From<Ref<B, PingRequest>> for RequestRef<B> {
-    fn from(v: Ref<B, PingRequest>) -> Self {
-        Self::Ping(v)
-    }
-}
-
-impl<B> From<Ref<B, super::SupplyKeypairRequest>> for RequestRef<B> {
-    fn from(v: Ref<B, super::SupplyKeypairRequest>) -> Self {
-        Self::SupplyKeypair(v)
-    }
-}
-
-impl<B> From<Ref<B, super::AddListenSocketRequest>> for RequestRef<B> {
-    fn from(v: Ref<B, super::AddListenSocketRequest>) -> Self {
-        Self::AddListenSocket(v)
-    }
-}
-
-impl<B> From<Ref<B, super::AddPskBrokerRequest>> for RequestRef<B> {
-    fn from(v: Ref<B, super::AddPskBrokerRequest>) -> Self {
-        Self::AddPskBroker(v)
-    }
-}
-
-impl<B: ByteSlice> RequestRefMaker<B> {
-    fn new(buf: B) -> anyhow::Result<Self> {
-        let msg_type = buf.deref().request_msg_type_from_prefix()?;
-        Ok(Self { buf, msg_type })
-    }
-
-    fn target_size(&self) -> usize {
-        self.msg_type.message_size()
-    }
-
-    fn parse(self) -> anyhow::Result<RequestRef<B>> {
-        Ok(match self.msg_type {
-            RequestMsgType::Ping => RequestRef::Ping(self.buf.ping_request()?),
-            RequestMsgType::SupplyKeypair => {
-                RequestRef::SupplyKeypair(self.buf.supply_keypair_request()?)
-            }
-            RequestMsgType::AddListenSocket => {
-                RequestRef::AddListenSocket(self.buf.add_listen_socket_request()?)
-            }
-            RequestMsgType::AddPskBroker => {
-                RequestRef::AddPskBroker(self.buf.add_psk_broker_request()?)
-            }
-        })
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    fn from_prefix(self) -> anyhow::Result<Self> {
-        self.ensure_fit()?;
-        let point = self.target_size();
-        let Self { buf, msg_type } = self;
-        let (buf, _) = buf.split_at(point);
-        Ok(Self { buf, msg_type })
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    fn from_suffix(self) -> anyhow::Result<Self> {
-        self.ensure_fit()?;
-        let point = self.buf.len() - self.target_size();
-        let Self { buf, msg_type } = self;
-        let (buf, _) = buf.split_at(point);
-        Ok(Self { buf, msg_type })
-    }
-
-    pub fn ensure_fit(&self) -> anyhow::Result<()> {
-        let have = self.buf.len();
-        let need = self.target_size();
-        ensure!(
-            need <= have,
-            "Buffer is undersized at {have} bytes (need {need} bytes)!"
-        );
-        Ok(())
-    }
-}
-
-pub enum RequestRef<B> {
-    Ping(Ref<B, PingRequest>),
-    SupplyKeypair(Ref<B, super::SupplyKeypairRequest>),
-    AddListenSocket(Ref<B, super::AddListenSocketRequest>),
-    AddPskBroker(Ref<B, super::AddPskBrokerRequest>),
-}
-
-impl<B> RequestRef<B>
-where
-    B: ByteSlice,
-{
-    pub fn bytes(&self) -> &[u8] {
-        match self {
-            Self::Ping(r) => r.bytes(),
-            Self::SupplyKeypair(r) => r.bytes(),
-            Self::AddListenSocket(r) => r.bytes(),
-            Self::AddPskBroker(r) => r.bytes(),
-        }
-    }
-}
-
-impl<B> RequestRef<B>
-where
-    B: ByteSliceMut,
-{
-    pub fn bytes_mut(&mut self) -> &[u8] {
-        match self {
-            Self::Ping(r) => r.bytes_mut(),
-            Self::SupplyKeypair(r) => r.bytes_mut(),
-            Self::AddListenSocket(r) => r.bytes_mut(),
-            Self::AddPskBroker(r) => r.bytes_mut(),
-        }
-    }
-}

rosenpass/src/api/boilerplate/request_response.rs

@@ -1,190 +0,0 @@
-use rosenpass_util::zerocopy::{
-    RefMaker, ZerocopyEmancipateExt, ZerocopyEmancipateMutExt, ZerocopySliceExt,
-};
-use zerocopy::{ByteSlice, ByteSliceMut, Ref};
-
-use super::{Message, PingRequest, PingResponse};
-use super::{RequestRef, ResponseRef, ZerocopyResponseMakerSetupMessageExt};
-
-pub trait RequestMsg: Sized + Message {
-    type ResponseMsg: ResponseMsg;
-
-    fn zk_response_maker<B: ByteSlice>(buf: B) -> RefMaker<B, Self::ResponseMsg> {
-        buf.zk_ref_maker()
-    }
-
-    fn setup_response<B: ByteSliceMut>(buf: B) -> anyhow::Result<Ref<B, Self::ResponseMsg>> {
-        Self::zk_response_maker(buf).setup_msg()
-    }
-
-    fn setup_response_from_prefix<B: ByteSliceMut>(
-        buf: B,
-    ) -> anyhow::Result<Ref<B, Self::ResponseMsg>> {
-        Self::zk_response_maker(buf).from_prefix()?.setup_msg()
-    }
-
-    fn setup_response_from_suffix<B: ByteSliceMut>(
-        buf: B,
-    ) -> anyhow::Result<Ref<B, Self::ResponseMsg>> {
-        Self::zk_response_maker(buf).from_prefix()?.setup_msg()
-    }
-}
-
-pub trait ResponseMsg: Message {
-    type RequestMsg: RequestMsg;
-}
-
-impl RequestMsg for PingRequest {
-    type ResponseMsg = PingResponse;
-}
-
-impl ResponseMsg for PingResponse {
-    type RequestMsg = PingRequest;
-}
-
-impl RequestMsg for super::SupplyKeypairRequest {
-    type ResponseMsg = super::SupplyKeypairResponse;
-}
-
-impl ResponseMsg for super::SupplyKeypairResponse {
-    type RequestMsg = super::SupplyKeypairRequest;
-}
-
-impl RequestMsg for super::AddListenSocketRequest {
-    type ResponseMsg = super::AddListenSocketResponse;
-}
-
-impl ResponseMsg for super::AddListenSocketResponse {
-    type RequestMsg = super::AddListenSocketRequest;
-}
-
-impl RequestMsg for super::AddPskBrokerRequest {
-    type ResponseMsg = super::AddPskBrokerResponse;
-}
-
-impl ResponseMsg for super::AddPskBrokerResponse {
-    type RequestMsg = super::AddPskBrokerRequest;
-}
-
-pub type PingPair<B1, B2> = (Ref<B1, PingRequest>, Ref<B2, PingResponse>);
-pub type SupplyKeypairPair<B1, B2> = (
-    Ref<B1, super::SupplyKeypairRequest>,
-    Ref<B2, super::SupplyKeypairResponse>,
-);
-pub type AddListenSocketPair<B1, B2> = (
-    Ref<B1, super::AddListenSocketRequest>,
-    Ref<B2, super::AddListenSocketResponse>,
-);
-pub type AddPskBrokerPair<B1, B2> = (
-    Ref<B1, super::AddPskBrokerRequest>,
-    Ref<B2, super::AddPskBrokerResponse>,
-);
-
-pub enum RequestResponsePair<B1, B2> {
-    Ping(PingPair<B1, B2>),
-    SupplyKeypair(SupplyKeypairPair<B1, B2>),
-    AddListenSocket(AddListenSocketPair<B1, B2>),
-    AddPskBroker(AddPskBrokerPair<B1, B2>),
-}
-
-impl<B1, B2> From<PingPair<B1, B2>> for RequestResponsePair<B1, B2> {
-    fn from(v: PingPair<B1, B2>) -> Self {
-        RequestResponsePair::Ping(v)
-    }
-}
-
-impl<B1, B2> From<SupplyKeypairPair<B1, B2>> for RequestResponsePair<B1, B2> {
-    fn from(v: SupplyKeypairPair<B1, B2>) -> Self {
-        RequestResponsePair::SupplyKeypair(v)
-    }
-}
-
-impl<B1, B2> From<AddListenSocketPair<B1, B2>> for RequestResponsePair<B1, B2> {
-    fn from(v: AddListenSocketPair<B1, B2>) -> Self {
-        RequestResponsePair::AddListenSocket(v)
-    }
-}
-
-impl<B1, B2> From<AddPskBrokerPair<B1, B2>> for RequestResponsePair<B1, B2> {
-    fn from(v: AddPskBrokerPair<B1, B2>) -> Self {
-        RequestResponsePair::AddPskBroker(v)
-    }
-}
-
-impl<B1, B2> RequestResponsePair<B1, B2>
-where
-    B1: ByteSlice,
-    B2: ByteSlice,
-{
-    pub fn both(&self) -> (RequestRef<&[u8]>, ResponseRef<&[u8]>) {
-        match self {
-            Self::Ping((req, res)) => {
-                let req = RequestRef::Ping(req.emancipate());
-                let res = ResponseRef::Ping(res.emancipate());
-                (req, res)
-            }
-            Self::SupplyKeypair((req, res)) => {
-                let req = RequestRef::SupplyKeypair(req.emancipate());
-                let res = ResponseRef::SupplyKeypair(res.emancipate());
-                (req, res)
-            }
-            Self::AddListenSocket((req, res)) => {
-                let req = RequestRef::AddListenSocket(req.emancipate());
-                let res = ResponseRef::AddListenSocket(res.emancipate());
-                (req, res)
-            }
-            Self::AddPskBroker((req, res)) => {
-                let req = RequestRef::AddPskBroker(req.emancipate());
-                let res = ResponseRef::AddPskBroker(res.emancipate());
-                (req, res)
-            }
-        }
-    }
-
-    pub fn request(&self) -> RequestRef<&[u8]> {
-        self.both().0
-    }
-
-    pub fn response(&self) -> ResponseRef<&[u8]> {
-        self.both().1
-    }
-}
-
-impl<B1, B2> RequestResponsePair<B1, B2>
-where
-    B1: ByteSliceMut,
-    B2: ByteSliceMut,
-{
-    pub fn both_mut(&mut self) -> (RequestRef<&mut [u8]>, ResponseRef<&mut [u8]>) {
-        match self {
-            Self::Ping((req, res)) => {
-                let req = RequestRef::Ping(req.emancipate_mut());
-                let res = ResponseRef::Ping(res.emancipate_mut());
-                (req, res)
-            }
-            Self::SupplyKeypair((req, res)) => {
-                let req = RequestRef::SupplyKeypair(req.emancipate_mut());
-                let res = ResponseRef::SupplyKeypair(res.emancipate_mut());
-                (req, res)
-            }
-            Self::AddListenSocket((req, res)) => {
-                let req = RequestRef::AddListenSocket(req.emancipate_mut());
-                let res = ResponseRef::AddListenSocket(res.emancipate_mut());
-                (req, res)
-            }
-            Self::AddPskBroker((req, res)) => {
-                let req = RequestRef::AddPskBroker(req.emancipate_mut());
-                let res = ResponseRef::AddPskBroker(res.emancipate_mut());
-                (req, res)
-            }
-        }
-    }
-
-    pub fn request_mut(&mut self) -> RequestRef<&mut [u8]> {
-        self.both_mut().0
-    }
-
-    pub fn response_mut(&mut self) -> ResponseRef<&mut [u8]> {
-        self.both_mut().1
-    }
-}

rosenpass/src/api/boilerplate/response_ref.rs

@@ -1,147 +0,0 @@
-// TODO: This is copied verbatim from ResponseRef…not pretty
-use anyhow::ensure;
-
-use zerocopy::{ByteSlice, ByteSliceMut, Ref};
-
-use super::{ByteSliceRefExt, MessageAttributes, PingResponse, ResponseMsgType};
-
-struct ResponseRefMaker<B> {
-    buf: B,
-    msg_type: ResponseMsgType,
-}
-
-impl<B: ByteSlice> ResponseRef<B> {
-    pub fn parse(buf: B) -> anyhow::Result<Self> {
-        ResponseRefMaker::new(buf)?.parse()
-    }
-
-    pub fn parse_from_prefix(buf: B) -> anyhow::Result<Self> {
-        ResponseRefMaker::new(buf)?.from_prefix()?.parse()
-    }
-
-    pub fn parse_from_suffix(buf: B) -> anyhow::Result<Self> {
-        ResponseRefMaker::new(buf)?.from_suffix()?.parse()
-    }
-
-    pub fn message_type(&self) -> ResponseMsgType {
-        match self {
-            Self::Ping(_) => ResponseMsgType::Ping,
-            Self::SupplyKeypair(_) => ResponseMsgType::SupplyKeypair,
-            Self::AddListenSocket(_) => ResponseMsgType::AddListenSocket,
-            Self::AddPskBroker(_) => ResponseMsgType::AddPskBroker,
-        }
-    }
-}
-
-impl<B> From<Ref<B, PingResponse>> for ResponseRef<B> {
-    fn from(v: Ref<B, PingResponse>) -> Self {
-        Self::Ping(v)
-    }
-}
-
-impl<B> From<Ref<B, super::SupplyKeypairResponse>> for ResponseRef<B> {
-    fn from(v: Ref<B, super::SupplyKeypairResponse>) -> Self {
-        Self::SupplyKeypair(v)
-    }
-}
-
-impl<B> From<Ref<B, super::AddListenSocketResponse>> for ResponseRef<B> {
-    fn from(v: Ref<B, super::AddListenSocketResponse>) -> Self {
-        Self::AddListenSocket(v)
-    }
-}
-
-impl<B> From<Ref<B, super::AddPskBrokerResponse>> for ResponseRef<B> {
-    fn from(v: Ref<B, super::AddPskBrokerResponse>) -> Self {
-        Self::AddPskBroker(v)
-    }
-}
-
-impl<B: ByteSlice> ResponseRefMaker<B> {
-    fn new(buf: B) -> anyhow::Result<Self> {
-        let msg_type = buf.deref().response_msg_type_from_prefix()?;
-        Ok(Self { buf, msg_type })
-    }
-
-    fn target_size(&self) -> usize {
-        self.msg_type.message_size()
-    }
-
-    fn parse(self) -> anyhow::Result<ResponseRef<B>> {
-        Ok(match self.msg_type {
-            ResponseMsgType::Ping => ResponseRef::Ping(self.buf.ping_response()?),
-            ResponseMsgType::SupplyKeypair => {
-                ResponseRef::SupplyKeypair(self.buf.supply_keypair_response()?)
-            }
-            ResponseMsgType::AddListenSocket => {
-                ResponseRef::AddListenSocket(self.buf.add_listen_socket_response()?)
-            }
-            ResponseMsgType::AddPskBroker => {
-                ResponseRef::AddPskBroker(self.buf.add_psk_broker_response()?)
-            }
-        })
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    fn from_prefix(self) -> anyhow::Result<Self> {
-        self.ensure_fit()?;
-        let point = self.target_size();
-        let Self { buf, msg_type } = self;
-        let (buf, _) = buf.split_at(point);
-        Ok(Self { buf, msg_type })
-    }
-
-    #[allow(clippy::wrong_self_convention)]
-    fn from_suffix(self) -> anyhow::Result<Self> {
-        self.ensure_fit()?;
-        let point = self.buf.len() - self.target_size();
-        let Self { buf, msg_type } = self;
-        let (buf, _) = buf.split_at(point);
-        Ok(Self { buf, msg_type })
-    }
-
-    pub fn ensure_fit(&self) -> anyhow::Result<()> {
-        let have = self.buf.len();
-        let need = self.target_size();
-        ensure!(
-            need <= have,
-            "Buffer is undersized at {have} bytes (need {need} bytes)!"
-        );
-        Ok(())
-    }
-}
-
-pub enum ResponseRef<B> {
-    Ping(Ref<B, PingResponse>),
-    SupplyKeypair(Ref<B, super::SupplyKeypairResponse>),
-    AddListenSocket(Ref<B, super::AddListenSocketResponse>),
-    AddPskBroker(Ref<B, super::AddPskBrokerResponse>),
-}
-
-impl<B> ResponseRef<B>
-where
-    B: ByteSlice,
-{
-    pub fn bytes(&self) -> &[u8] {
-        match self {
-            Self::Ping(r) => r.bytes(),
-            Self::SupplyKeypair(r) => r.bytes(),
-            Self::AddListenSocket(r) => r.bytes(),
-            Self::AddPskBroker(r) => r.bytes(),
-        }
-    }
-}
-
-impl<B> ResponseRef<B>
-where
-    B: ByteSliceMut,
-{
-    pub fn bytes_mut(&mut self) -> &[u8] {
-        match self {
-            Self::Ping(r) => r.bytes_mut(),
-            Self::SupplyKeypair(r) => r.bytes_mut(),
-            Self::AddListenSocket(r) => r.bytes_mut(),
-            Self::AddPskBroker(r) => r.bytes_mut(),
-        }
-    }
-}

rosenpass/src/api/boilerplate/server.rs

@@ -1,94 +0,0 @@
-use super::{ByteSliceRefExt, Message, PingRequest, PingResponse, RequestRef, RequestResponsePair};
-use std::{collections::VecDeque, os::fd::OwnedFd};
-use zerocopy::{ByteSlice, ByteSliceMut};
-
-pub trait Server {
-    fn ping(
-        &mut self,
-        req: &PingRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut PingResponse,
-    ) -> anyhow::Result<()>;
-
-    fn supply_keypair(
-        &mut self,
-        req: &super::SupplyKeypairRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::SupplyKeypairResponse,
-    ) -> anyhow::Result<()>;
-
-    fn add_listen_socket(
-        &mut self,
-        req: &super::AddListenSocketRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::AddListenSocketResponse,
-    ) -> anyhow::Result<()>;
-
-    fn add_psk_broker(
-        &mut self,
-        req: &super::AddPskBrokerRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::AddPskBrokerResponse,
-    ) -> anyhow::Result<()>;
-
-    fn dispatch<ReqBuf, ResBuf>(
-        &mut self,
-        p: &mut RequestResponsePair<ReqBuf, ResBuf>,
-        req_fds: &mut VecDeque<OwnedFd>,
-    ) -> anyhow::Result<()>
-    where
-        ReqBuf: ByteSlice,
-        ResBuf: ByteSliceMut,
-    {
-        match p {
-            RequestResponsePair::Ping((req, res)) => self.ping(req, req_fds, res),
-            RequestResponsePair::SupplyKeypair((req, res)) => {
-                self.supply_keypair(req, req_fds, res)
-            }
-            RequestResponsePair::AddListenSocket((req, res)) => {
-                self.add_listen_socket(req, req_fds, res)
-            }
-            RequestResponsePair::AddPskBroker((req, res)) => self.add_psk_broker(req, req_fds, res),
-        }
-    }
-
-    fn handle_message<ReqBuf, ResBuf>(
-        &mut self,
-        req: ReqBuf,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: ResBuf,
-    ) -> anyhow::Result<usize>
-    where
-        ReqBuf: ByteSlice,
-        ResBuf: ByteSliceMut,
-    {
-        let req = req.parse_request_from_prefix()?;
-        // TODO: This is not pretty; This match should be moved into RequestRef
-        let mut pair = match req {
-            RequestRef::Ping(req) => {
-                let mut res = res.ping_response_from_prefix()?;
-                res.init();
-                RequestResponsePair::Ping((req, res))
-            }
-            RequestRef::SupplyKeypair(req) => {
-                let mut res = res.supply_keypair_response_from_prefix()?;
-                res.init();
-                RequestResponsePair::SupplyKeypair((req, res))
-            }
-            RequestRef::AddListenSocket(req) => {
-                let mut res = res.add_listen_socket_response_from_prefix()?;
-                res.init();
-                RequestResponsePair::AddListenSocket((req, res))
-            }
-            RequestRef::AddPskBroker(req) => {
-                let mut res = res.add_psk_broker_response_from_prefix()?;
-                res.init();
-                RequestResponsePair::AddPskBroker((req, res))
-            }
-        };
-        self.dispatch(&mut pair, req_fds)?;
-
-        let res_len = pair.response().bytes().len();
-        Ok(res_len)
-    }
-}

rosenpass/src/api/cli.rs

@@ -1,40 +0,0 @@
-use std::path::PathBuf;
-
-use clap::Args;
-
-use crate::config::Rosenpass as RosenpassConfig;
-
-use super::config::ApiConfig;
-
-#[cfg(feature = "experiment_api")]
-#[derive(Args, Debug)]
-pub struct ApiCli {
-    /// Where in the file-system to create the unix socket the rosenpass API will be listening for
-    /// connections on.
-    #[arg(long)]
-    api_listen_path: Vec<PathBuf>,
-
-    /// When rosenpass is called from another process, the other process can open and bind the
-    /// unix socket for the Rosenpass API to use themselves, passing it to this process. In Rust this can be achieved
-    /// using the [command-fds](https://docs.rs/command-fds/latest/command_fds/) crate.
-    #[arg(long)]
-    api_listen_fd: Vec<i32>,
-
-    /// When rosenpass is called from another process, the other process can connect the unix socket for the API
-    /// themselves, for instance using the `socketpair(2)` system call.
-    #[arg(long)]
-    api_stream_fd: Vec<i32>,
-}
-
-impl ApiCli {
-    pub fn apply_to_config(&self, cfg: &mut RosenpassConfig) -> anyhow::Result<()> {
-        self.apply_to_api_config(&mut cfg.api)
-    }
-
-    pub fn apply_to_api_config(&self, cfg: &mut ApiConfig) -> anyhow::Result<()> {
-        cfg.listen_path.extend_from_slice(&self.api_listen_path);
-        cfg.listen_fd.extend_from_slice(&self.api_listen_fd);
-        cfg.stream_fd.extend_from_slice(&self.api_stream_fd);
-        Ok(())
-    }
-}

rosenpass/src/api/config.rs

@@ -1,49 +0,0 @@
-use std::path::PathBuf;
-
-use mio::net::UnixListener;
-use rosenpass_util::mio::{UnixListenerExt, UnixStreamExt};
-use serde::{Deserialize, Serialize};
-
-use crate::app_server::AppServer;
-
-#[derive(Debug, Serialize, Deserialize, Default, Clone)]
-pub struct ApiConfig {
-    /// Where in the file-system to create the unix socket the rosenpass API will be listening for
-    /// connections on
-    pub listen_path: Vec<PathBuf>,
-
-    /// When rosenpass is called from another process, the other process can open and bind the
-    /// unix socket for the Rosenpass API to use themselves, passing it to this process. In Rust this can be achieved
-    /// using the [command-fds](https://docs.rs/command-fds/latest/command_fds/) crate.
-    pub listen_fd: Vec<i32>,
-
-    /// When rosenpass is called from another process, the other process can connect the unix socket for the API
-    /// themselves, for instance using the `socketpair(2)` system call.
-    pub stream_fd: Vec<i32>,
-}
-
-impl ApiConfig {
-    pub fn apply_to_app_server(&self, srv: &mut AppServer) -> anyhow::Result<()> {
-        for path in self.listen_path.iter() {
-            srv.add_api_listener(UnixListener::bind(path)?)?;
-        }
-
-        for fd in self.listen_fd.iter() {
-            srv.add_api_listener(UnixListenerExt::claim_fd(*fd)?)?;
-        }
-
-        for fd in self.stream_fd.iter() {
-            srv.add_api_connection(UnixStreamExt::claim_fd(*fd)?)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn count_api_sources(&self) -> usize {
-        self.listen_path.len() + self.listen_fd.len() + self.stream_fd.len()
-    }
-
-    pub fn has_api_sources(&self) -> bool {
-        self.count_api_sources() > 0
-    }
-}

rosenpass/src/api/mio/connection.rs

@@ -1,321 +0,0 @@
-use std::borrow::{Borrow, BorrowMut};
-use std::collections::VecDeque;
-use std::os::fd::OwnedFd;
-
-use mio::net::UnixStream;
-use rosenpass_secret_memory::Secret;
-use rosenpass_util::mio::ReadWithFileDescriptors;
-use rosenpass_util::{
-    io::{IoResultKindHintExt, TryIoResultKindHintExt},
-    length_prefix_encoding::{
-        decoder::{self as lpe_decoder, LengthPrefixDecoder},
-        encoder::{self as lpe_encoder, LengthPrefixEncoder},
-    },
-    mio::interest::RW as MIO_RW,
-};
-use zeroize::Zeroize;
-
-use crate::api::MAX_REQUEST_FDS;
-use crate::{api::Server, app_server::AppServer};
-
-use super::super::{ApiHandler, ApiHandlerContext};
-
-#[derive(Debug)]
-struct SecretBuffer<const N: usize>(pub Secret<N>);
-
-impl<const N: usize> SecretBuffer<N> {
-    fn new() -> Self {
-        Self(Secret::zero())
-    }
-}
-
-impl<const N: usize> Borrow<[u8]> for SecretBuffer<N> {
-    fn borrow(&self) -> &[u8] {
-        self.0.secret()
-    }
-}
-
-impl<const N: usize> BorrowMut<[u8]> for SecretBuffer<N> {
-    fn borrow_mut(&mut self) -> &mut [u8] {
-        self.0.secret_mut()
-    }
-}
-// TODO: Unfortunately, zerocopy is quite particular about alignment, hence the 4096
-type ReadBuffer = LengthPrefixDecoder<SecretBuffer<4096>>;
-type WriteBuffer = LengthPrefixEncoder<SecretBuffer<4096>>;
-type ReadFdBuffer = VecDeque<OwnedFd>;
-
-#[derive(Debug)]
-struct MioConnectionBuffers {
-    read_buffer: ReadBuffer,
-    write_buffer: WriteBuffer,
-    read_fd_buffer: ReadFdBuffer,
-}
-
-#[derive(Debug)]
-pub struct MioConnection {
-    io: UnixStream,
-    mio_token: mio::Token,
-    invalid_read: bool,
-    buffers: Option<MioConnectionBuffers>,
-    api_handler: ApiHandler,
-}
-
-impl MioConnection {
-    pub fn new(app_server: &mut AppServer, mut io: UnixStream) -> std::io::Result<Self> {
-        let mio_token = app_server.mio_token_dispenser.dispense();
-        app_server
-            .mio_poll
-            .registry()
-            .register(&mut io, mio_token, MIO_RW)?;
-
-        let invalid_read = false;
-        let read_buffer = LengthPrefixDecoder::new(SecretBuffer::new());
-        let write_buffer = LengthPrefixEncoder::from_buffer(SecretBuffer::new());
-        let read_fd_buffer = VecDeque::new();
-        let buffers = Some(MioConnectionBuffers {
-            read_buffer,
-            write_buffer,
-            read_fd_buffer,
-        });
-        let api_state = ApiHandler::new();
-        Ok(Self {
-            io,
-            mio_token,
-            invalid_read,
-            buffers,
-            api_handler: api_state,
-        })
-    }
-
-    pub fn shoud_close(&self) -> bool {
-        let exhausted = self
-            .buffers
-            .as_ref()
-            .map(|b| b.write_buffer.exhausted())
-            .unwrap_or(false);
-        self.invalid_read && exhausted
-    }
-
-    pub fn close(mut self, app_server: &mut AppServer) -> anyhow::Result<()> {
-        app_server.mio_poll.registry().deregister(&mut self.io)?;
-        Ok(())
-    }
-
-    pub fn mio_token(&self) -> mio::Token {
-        self.mio_token
-    }
-}
-
-pub trait MioConnectionContext {
-    fn mio_connection(&self) -> &MioConnection;
-    fn app_server(&self) -> &AppServer;
-    fn mio_connection_mut(&mut self) -> &mut MioConnection;
-    fn app_server_mut(&mut self) -> &mut AppServer;
-
-    fn poll(&mut self) -> anyhow::Result<()> {
-        macro_rules! short {
-            ($e:expr) => {
-                match $e {
-                    None => return Ok(()),
-                    Some(()) => {}
-                }
-            };
-        }
-
-        // All of these functions return an error, None ("operation incomplete")
-        // or some ("operation complete, keep processing")
-        short!(self.flush_write_buffer()?); // Flush last message
-        short!(self.recv()?); // Receive new message
-        short!(self.handle_incoming_message()?); // Process new message with API
-        short!(self.flush_write_buffer()?); // Begin flushing response
-
-        Ok(())
-    }
-
-    fn handle_incoming_message(&mut self) -> anyhow::Result<Option<()>> {
-        self.with_buffers_stolen(|this, bufs| {
-            // Acquire request & response. Caller is responsible to make sure
-            // that read buffer holds a message and that write buffer is cleared.
-            // Hence the unwraps and assertions
-            assert!(bufs.write_buffer.exhausted());
-            let req = bufs.read_buffer.message().unwrap().unwrap();
-            let req_fds = &mut bufs.read_fd_buffer;
-            let res = bufs.write_buffer.buffer_bytes_mut();
-
-            // Call API handler
-            // Transitive trait implementations: MioConnectionContext -> ApiHandlerContext -> as ApiServer
-            let response_len = this.handle_message(req, req_fds, res)?;
-
-            bufs.write_buffer
-                .restart_write_with_new_message(response_len)?;
-            bufs.read_buffer.zeroize(); // clear for new message to read
-            bufs.read_fd_buffer.clear();
-
-            Ok(Some(()))
-        })
-    }
-
-    fn flush_write_buffer(&mut self) -> anyhow::Result<Option<()>> {
-        if self.write_buf_mut().exhausted() {
-            return Ok(Some(()));
-        }
-
-        use lpe_encoder::WriteToIoReturn as Ret;
-        use std::io::ErrorKind as K;
-
-        loop {
-            let conn = self.mio_connection_mut();
-            let bufs = conn.buffers.as_mut().unwrap();
-
-            let sock = &conn.io;
-            let write_buf = &mut bufs.write_buffer;
-
-            match write_buf.write_to_stdio(sock).io_err_kind_hint() {
-                // Done
-                Ok(Ret { done: true, .. }) => {
-                    write_buf.zeroize(); // clear for new message to write
-                    break Ok(Some(()));
-                }
-
-                // Would block
-                Ok(Ret {
-                    bytes_written: 0, ..
-                }) => break Ok(None),
-                Err((_e, K::WouldBlock)) => break Ok(None),
-
-                // Just continue
-                Ok(_) => continue, /* Ret { bytes_written > 0, done = false } acc. to previous cases*/
-                Err((_e, K::Interrupted)) => continue,
-
-                // Other errors
-                Err((e, _ek)) => Err(e)?,
-            }
-        }
-    }
-
-    fn recv(&mut self) -> anyhow::Result<Option<()>> {
-        if !self.write_buf_mut().exhausted() || self.mio_connection().invalid_read {
-            return Ok(None);
-        }
-
-        use lpe_decoder::{ReadFromIoError as E, ReadFromIoReturn as Ret};
-        use std::io::ErrorKind as K;
-
-        loop {
-            let conn = self.mio_connection_mut();
-            let bufs = conn.buffers.as_mut().unwrap();
-
-            let read_buf = &mut bufs.read_buffer;
-            let read_fd_buf = &mut bufs.read_fd_buffer;
-
-            let sock = &conn.io;
-            let fd_passing_sock = ReadWithFileDescriptors::<MAX_REQUEST_FDS, UnixStream, _, _>::new(
-                sock,
-                read_fd_buf,
-            );
-
-            match read_buf
-                .read_from_stdio(fd_passing_sock)
-                .try_io_err_kind_hint()
-            {
-                // We actually received a proper message
-                // (Impl below match to appease borrow checker)
-                Ok(Ret {
-                    message: Some(_msg),
-                    ..
-                }) => break Ok(Some(())),
-
-                // Message does not fit in buffer
-                Err((e @ E::MessageTooLargeError { .. }, _)) => {
-                    log::warn!("Received message on API that was too big to fit in our buffers; \
-                            looks like the client is broken. Stopping to process messages of the client.\n\
-                            Error: {e:?}");
-                    conn.invalid_read = true; // Closed mio_manager
-                    break Ok(None);
-                }
-
-                // Would block
-                Ok(Ret { bytes_read: 0, .. }) => break Ok(None),
-                Err((_, Some(K::WouldBlock))) => break Ok(None),
-
-                // Just keep going
-                Ok(Ret { bytes_read: _, .. }) => continue,
-                Err((_, Some(K::Interrupted))) => continue,
-
-                // Other IO Error (just pass on to the caller)
-                Err((E::IoError(e), _)) => {
-                    log::warn!(
-                        "IO error while trying to read message from API socket. \
-                            The connection is broken. Stopping to process messages of the client.\n\
-                            Error: {e:?}"
-                    );
-                    conn.invalid_read = true; // closed later by mio_manager
-                    break Err(e.into());
-                }
-            };
-        }
-    }
-
-    fn mio_token(&self) -> mio::Token {
-        self.mio_connection().mio_token()
-    }
-
-    fn should_close(&self) -> bool {
-        self.mio_connection().shoud_close()
-    }
-}
-
-trait MioConnectionContextPrivate: MioConnectionContext {
-    fn steal_buffers(&mut self) -> MioConnectionBuffers {
-        self.mio_connection_mut().buffers.take().unwrap()
-    }
-
-    fn return_buffers(&mut self, buffers: MioConnectionBuffers) {
-        let opt = &mut self.mio_connection_mut().buffers;
-        assert!(opt.is_none());
-        let _ = opt.insert(buffers);
-    }
-
-    fn with_buffers_stolen<R, F: FnOnce(&mut Self, &mut MioConnectionBuffers) -> R>(
-        &mut self,
-        f: F,
-    ) -> R {
-        let mut bufs = self.steal_buffers();
-        let res = f(self, &mut bufs);
-        self.return_buffers(bufs);
-        res
-    }
-
-    fn write_buf_mut(&mut self) -> &mut WriteBuffer {
-        self.mio_connection_mut()
-            .buffers
-            .as_mut()
-            .unwrap()
-            .write_buffer
-            .borrow_mut()
-    }
-}
-
-impl<T> MioConnectionContextPrivate for T where T: ?Sized + MioConnectionContext {}
-
-impl<T> ApiHandlerContext for T
-where
-    T: ?Sized + MioConnectionContext,
-{
-    fn api_handler(&self) -> &ApiHandler {
-        &self.mio_connection().api_handler
-    }
-
-    fn app_server(&self) -> &AppServer {
-        MioConnectionContext::app_server(self)
-    }
-
-    fn api_handler_mut(&mut self) -> &mut ApiHandler {
-        &mut self.mio_connection_mut().api_handler
-    }
-
-    fn app_server_mut(&mut self) -> &mut AppServer {
-        MioConnectionContext::app_server_mut(self)
-    }
-}

rosenpass/src/api/mio/manager.rs

@@ -1,173 +0,0 @@
-use std::{borrow::BorrowMut, io};
-
-use mio::net::{UnixListener, UnixStream};
-
-use rosenpass_util::{
-    functional::ApplyExt, io::nonblocking_handle_io_errors, mio::interest::RW as MIO_RW,
-};
-
-use crate::app_server::{AppServer, AppServerIoSource};
-
-use super::{MioConnection, MioConnectionContext};
-
-#[derive(Default, Debug)]
-pub struct MioManager {
-    listeners: Vec<UnixListener>,
-    connections: Vec<Option<MioConnection>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum MioManagerIoSource {
-    Listener(usize),
-    Connection(usize),
-}
-
-impl MioManager {
-    pub fn new() -> Self {
-        Self::default()
-    }
-}
-
-struct MioConnectionFocus<'a, T: ?Sized + MioManagerContext> {
-    ctx: &'a mut T,
-    conn_idx: usize,
-}
-
-impl<'a, T: ?Sized + MioManagerContext> MioConnectionFocus<'a, T> {
-    fn new(ctx: &'a mut T, conn_idx: usize) -> Self {
-        Self { ctx, conn_idx }
-    }
-}
-
-pub trait MioManagerContext {
-    fn mio_manager(&self) -> &MioManager;
-    fn mio_manager_mut(&mut self) -> &mut MioManager;
-    fn app_server(&self) -> &AppServer;
-    fn app_server_mut(&mut self) -> &mut AppServer;
-
-    fn add_listener(&mut self, mut listener: UnixListener) -> io::Result<()> {
-        let srv = self.app_server_mut();
-        let mio_token = srv.mio_token_dispenser.dispense();
-        srv.mio_poll
-            .registry()
-            .register(&mut listener, mio_token, MIO_RW)?;
-        let io_source = self
-            .mio_manager()
-            .listeners
-            .len()
-            .apply(MioManagerIoSource::Listener)
-            .apply(AppServerIoSource::MioManager);
-        self.mio_manager_mut().listeners.push(listener);
-        self.app_server_mut()
-            .register_io_source(mio_token, io_source);
-
-        Ok(())
-    }
-
-    fn add_connection(&mut self, connection: UnixStream) -> io::Result<()> {
-        let connection = MioConnection::new(self.app_server_mut(), connection)?;
-        let mio_token = connection.mio_token();
-        let conns: &mut Vec<Option<MioConnection>> =
-            self.mio_manager_mut().connections.borrow_mut();
-        let idx = conns
-            .iter_mut()
-            .enumerate()
-            .find(|(_, slot)| slot.is_some())
-            .map(|(idx, _)| idx)
-            .unwrap_or(conns.len());
-        conns.insert(idx, Some(connection));
-        let io_source = idx
-            .apply(MioManagerIoSource::Listener)
-            .apply(AppServerIoSource::MioManager);
-        self.app_server_mut()
-            .register_io_source(mio_token, io_source);
-        Ok(())
-    }
-
-    fn poll_particular(&mut self, io_source: MioManagerIoSource) -> anyhow::Result<()> {
-        use MioManagerIoSource as S;
-        match io_source {
-            S::Listener(idx) => self.accept_from(idx)?,
-            S::Connection(idx) => self.poll_particular_connection(idx)?,
-        };
-        Ok(())
-    }
-
-    fn poll(&mut self) -> anyhow::Result<()> {
-        self.accept_connections()?;
-        self.poll_connections()?;
-        Ok(())
-    }
-
-    fn accept_connections(&mut self) -> io::Result<()> {
-        for idx in 0..self.mio_manager_mut().listeners.len() {
-            self.accept_from(idx)?;
-        }
-        Ok(())
-    }
-
-    fn accept_from(&mut self, idx: usize) -> io::Result<()> {
-        // Accept connection until the socket would block or returns another error
-        // TODO: This currently only adds connections--we eventually need the ability to remove
-        // them as well, see the note in connection.rs
-        loop {
-            match nonblocking_handle_io_errors(|| self.mio_manager().listeners[idx].accept())? {
-                None => break,
-                Some((conn, _addr)) => {
-                    self.add_connection(conn)?;
-                }
-            };
-        }
-
-        Ok(())
-    }
-
-    fn poll_connections(&mut self) -> anyhow::Result<()> {
-        for idx in 0..self.mio_manager().connections.len() {
-            self.poll_particular_connection(idx)?;
-        }
-        Ok(())
-    }
-
-    fn poll_particular_connection(&mut self, idx: usize) -> anyhow::Result<()> {
-        if self.mio_manager().connections[idx].is_none() {
-            return Ok(());
-        }
-
-        let mut conn = MioConnectionFocus::new(self, idx);
-        conn.poll()?;
-
-        if conn.should_close() {
-            let conn = self.mio_manager_mut().connections[idx].take().unwrap();
-            let mio_token = conn.mio_token();
-            if let Err(e) = conn.close(self.app_server_mut()) {
-                log::warn!("Error while closing API connection {e:?}");
-            };
-            self.app_server_mut().unregister_io_source(mio_token);
-        }
-
-        Ok(())
-    }
-}
-
-impl<T: ?Sized + MioManagerContext> MioConnectionContext for MioConnectionFocus<'_, T> {
-    fn mio_connection(&self) -> &MioConnection {
-        self.ctx.mio_manager().connections[self.conn_idx]
-            .as_ref()
-            .unwrap()
-    }
-
-    fn app_server(&self) -> &AppServer {
-        self.ctx.app_server()
-    }
-
-    fn mio_connection_mut(&mut self) -> &mut MioConnection {
-        self.ctx.mio_manager_mut().connections[self.conn_idx]
-            .as_mut()
-            .unwrap()
-    }
-
-    fn app_server_mut(&mut self) -> &mut AppServer {
-        self.ctx.app_server_mut()
-    }
-}

rosenpass/src/api/mio/mod.rs

@@ -1,5 +0,0 @@
-mod connection;
-mod manager;
-
-pub use connection::*;
-pub use manager::*;

rosenpass/src/api/mod.rs

@@ -1,9 +0,0 @@
-mod api_handler;
-mod boilerplate;
-
-pub use api_handler::*;
-pub use boilerplate::*;
-
-pub mod cli;
-pub mod config;
-pub mod mio;

rosenpass/src/app_server.rs

@@ -1,34 +1,15 @@
 use anyhow::bail;
 
-use anyhow::Context;
 use anyhow::Result;
-use derive_builder::Builder;
-use log::{error, info, warn};
+use log::{debug, error, info, warn};
 use mio::Interest;
 use mio::Token;
-use rosenpass_secret_memory::Public;
-use rosenpass_secret_memory::Secret;
-use rosenpass_util::build::ConstructionSite;
-use rosenpass_util::file::StoreValueB64;
-use rosenpass_util::functional::run;
-use rosenpass_util::functional::ApplyExt;
-use rosenpass_util::io::IoResultKindHintExt;
-use rosenpass_util::io::SubstituteForIoErrorKindExt;
-use rosenpass_util::option::SomeExt;
-use rosenpass_util::result::OkExt;
-use rosenpass_wireguard_broker::WireguardBrokerMio;
-use rosenpass_wireguard_broker::{WireguardBrokerCfg, WG_KEY_LEN};
-use zerocopy::AsBytes;
+use rosenpass_util::file::fopen_w;
 
 use std::cell::Cell;
-
-use std::collections::HashMap;
-use std::collections::VecDeque;
-use std::fmt::Debug;
-use std::io;
-use std::io::stdout;
-use std::io::ErrorKind;
 use std::io::Write;
+
+use std::io::ErrorKind;
 use std::net::Ipv4Addr;
 use std::net::Ipv6Addr;
 use std::net::SocketAddr;
@@ -36,30 +17,22 @@ use std::net::SocketAddrV4;
 use std::net::SocketAddrV6;
 use std::net::ToSocketAddrs;
 use std::path::PathBuf;
+use std::process::Command;
+use std::process::Stdio;
 use std::slice;
+use std::thread;
 use std::time::Duration;
-use std::time::Instant;
 
-use crate::protocol::BuildCryptoServer;
-use crate::protocol::HostIdentification;
 use crate::{
     config::Verbosity,
     protocol::{CryptoServer, MsgBuf, PeerPtr, SPk, SSk, SymKey, Timing},
 };
 use rosenpass_util::attempt;
-use rosenpass_util::b64::B64Display;
-
-const MAX_B64_KEY_SIZE: usize = 32 * 5 / 3;
-const MAX_B64_PEER_ID_SIZE: usize = 32 * 5 / 3;
+use rosenpass_util::b64::{b64_writer, fmt_b64};
 
 const IPV4_ANY_ADDR: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 0);
 const IPV6_ANY_ADDR: Ipv6Addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0);
 
-const UNDER_LOAD_RATIO: f64 = 0.5;
-const DURATION_UPDATE_UNDER_LOAD_STATUS: Duration = Duration::from_millis(500);
-
-const BROKER_ID_BYTES: usize = 8;
-
 fn ipv4_any_binding() -> SocketAddr {
     // addr, port
     SocketAddr::V4(SocketAddrV4::new(IPV4_ANY_ADDR, 0))
@@ -70,50 +43,10 @@ fn ipv6_any_binding() -> SocketAddr {
     SocketAddr::V6(SocketAddrV6::new(IPV6_ANY_ADDR, 0, 0, 0))
 }
 
-#[derive(Debug, Default)]
-pub struct MioTokenDispenser {
-    counter: usize,
-}
-
-impl MioTokenDispenser {
-    pub fn dispense(&mut self) -> Token {
-        let r = self.counter;
-        self.counter += 1;
-        Token(r)
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct BrokerStore {
-    pub store: HashMap<
-        Public<BROKER_ID_BYTES>,
-        Box<dyn WireguardBrokerMio<Error = anyhow::Error, MioError = anyhow::Error>>,
-    >,
-}
-
-#[derive(Debug, Clone)]
-pub struct BrokerStorePtr(pub Public<BROKER_ID_BYTES>);
-
-#[derive(Debug)]
-pub struct BrokerPeer {
-    ptr: BrokerStorePtr,
-    peer_cfg: Box<dyn WireguardBrokerCfg>,
-}
-
-impl BrokerPeer {
-    pub fn new(ptr: BrokerStorePtr, peer_cfg: Box<dyn WireguardBrokerCfg>) -> Self {
-        Self { ptr, peer_cfg }
-    }
-
-    pub fn ptr(&self) -> &BrokerStorePtr {
-        &self.ptr
-    }
-}
-
 #[derive(Default, Debug)]
 pub struct AppPeer {
     pub outfile: Option<PathBuf>,
-    pub broker_peer: Option<BrokerPeer>,
+    pub outwg: Option<WireguardOut>, // TODO make this a generic command
     pub initial_endpoint: Option<Endpoint>,
     pub current_endpoint: Option<Endpoint>,
 }
@@ -134,60 +67,19 @@ pub struct WireguardOut {
     pub extra_params: Vec<String>,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum DoSOperation {
-    UnderLoad,
-    Normal,
-}
-/// Integration test helpers for AppServer
-#[derive(Debug, Builder)]
-#[builder(pattern = "owned")]
-pub struct AppServerTest {
-    /// Enable DoS operation permanently
-    #[builder(default = "false")]
-    pub enable_dos_permanently: bool,
-    /// Terminate application signal
-    #[builder(default = "None")]
-    pub termination_handler: Option<std::sync::mpsc::Receiver<()>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum AppServerIoSource {
-    Socket(usize),
-    #[cfg(feature = "experiment_api")]
-    PskBroker(Public<BROKER_ID_BYTES>),
-    #[cfg(feature = "experiment_api")]
-    MioManager(crate::api::mio::MioManagerIoSource),
-}
-
-const EVENT_CAPACITY: usize = 20;
-
 /// Holds the state of the application, namely the external IO
 ///
 /// Responsible for file IO, network IO
 // TODO add user control via unix domain socket and stdin/stdout
 #[derive(Debug)]
 pub struct AppServer {
-    pub crypto_site: ConstructionSite<BuildCryptoServer, CryptoServer>,
+    pub crypt: CryptoServer,
     pub sockets: Vec<mio::net::UdpSocket>,
     pub events: mio::Events,
-    pub short_poll_queue: VecDeque<mio::event::Event>,
-    pub performed_long_poll: bool,
-    pub io_source_index: HashMap<mio::Token, AppServerIoSource>,
     pub mio_poll: mio::Poll,
-    pub mio_token_dispenser: MioTokenDispenser,
-    pub brokers: BrokerStore,
     pub peers: Vec<AppPeer>,
     pub verbosity: Verbosity,
     pub all_sockets_drained: bool,
-    pub under_load: DoSOperation,
-    pub blocking_polls_count: usize,
-    pub non_blocking_polls_count: usize,
-    pub unpolled_count: usize,
-    pub last_update_time: Instant,
-    pub test_helpers: Option<AppServerTest>,
-    #[cfg(feature = "experiment_api")]
-    pub api_manager: crate::api::mio::MioManager,
 }
 
 /// A socket pointer is an index assigned to a socket;
@@ -236,17 +128,6 @@ impl AppPeerPtr {
     pub fn get_app_mut<'a>(&self, srv: &'a mut AppServer) -> &'a mut AppPeer {
         &mut srv.peers[self.0]
     }
-
-    pub fn set_psk(&self, server: &mut AppServer, psk: &Secret<WG_KEY_LEN>) -> anyhow::Result<()> {
-        if let Some(broker) = server.peers[self.0].broker_peer.as_ref() {
-            let config = broker.peer_cfg.create_config(psk);
-            let broker = server.brokers.store.get_mut(&broker.ptr().0).unwrap();
-            broker.set_psk(config)?;
-        } else if server.peers[self.0].outfile.is_none() {
-            log::warn!("No broker peer found for peer {}", self.0);
-        }
-        Ok(())
-    }
 }
 
 #[derive(Debug)]
@@ -281,7 +162,13 @@ pub enum Endpoint {
     /// at the same time. It also would reply on the same port RespHello was
     /// sent to when listening on multiple ports on the same interface. This
     /// may be required for some arcane firewall setups.
-    SocketBoundAddress(SocketBoundEndpoint),
+    SocketBoundAddress {
+        /// The socket the address can be reached under; this is generally
+        /// determined when we actually receive an RespHello message
+        socket: SocketPtr,
+        /// Just the address
+        addr: SocketAddr,
+    },
     // A host name or IP address; storing the hostname here instead of an
     // ip address makes sure that we look up the host name whenever we try
     // to make a connection; this may be beneficial in some setups where a host-name
@@ -289,85 +176,6 @@ pub enum Endpoint {
     Discovery(HostPathDiscoveryEndpoint),
 }
 
-impl std::fmt::Display for Endpoint {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Endpoint::SocketBoundAddress(host) => write!(f, "{}", host),
-            Endpoint::Discovery(host) => write!(f, "{}", host),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct SocketBoundEndpoint {
-    /// The socket the address can be reached under; this is generally
-    /// determined when we actually receive an RespHello message
-    socket: SocketPtr,
-    /// Just the address
-    addr: SocketAddr,
-    /// identifier
-    bytes: (usize, [u8; SocketBoundEndpoint::BUFFER_SIZE]),
-}
-
-impl std::fmt::Display for SocketBoundEndpoint {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.addr)
-    }
-}
-
-impl SocketBoundEndpoint {
-    const SOCKET_SIZE: usize = usize::BITS as usize / 8;
-    const IPV6_SIZE: usize = 16;
-    const PORT_SIZE: usize = 2;
-    const SCOPE_ID_SIZE: usize = 4;
-
-    const BUFFER_SIZE: usize = SocketBoundEndpoint::SOCKET_SIZE
-        + SocketBoundEndpoint::IPV6_SIZE
-        + SocketBoundEndpoint::PORT_SIZE
-        + SocketBoundEndpoint::SCOPE_ID_SIZE;
-
-    pub fn new(socket: SocketPtr, addr: SocketAddr) -> Self {
-        let bytes = Self::to_bytes(&socket, &addr);
-        Self {
-            socket,
-            addr,
-            bytes,
-        }
-    }
-
-    fn to_bytes(
-        socket: &SocketPtr,
-        addr: &SocketAddr,
-    ) -> (usize, [u8; SocketBoundEndpoint::BUFFER_SIZE]) {
-        let mut buf = [0u8; SocketBoundEndpoint::BUFFER_SIZE];
-        let addr = match addr {
-            SocketAddr::V4(addr) => {
-                //Map IPv4-mapped to IPv6 addresses
-                let ip = addr.ip().to_ipv6_mapped();
-                SocketAddrV6::new(ip, addr.port(), 0, 0)
-            }
-            SocketAddr::V6(addr) => *addr,
-        };
-        let mut len: usize = 0;
-        buf[len..len + SocketBoundEndpoint::SOCKET_SIZE].copy_from_slice(&socket.0.to_be_bytes());
-        len += SocketBoundEndpoint::SOCKET_SIZE;
-        buf[len..len + SocketBoundEndpoint::IPV6_SIZE].copy_from_slice(&addr.ip().octets());
-        len += SocketBoundEndpoint::IPV6_SIZE;
-        buf[len..len + SocketBoundEndpoint::PORT_SIZE].copy_from_slice(&addr.port().to_be_bytes());
-        len += SocketBoundEndpoint::PORT_SIZE;
-        buf[len..len + SocketBoundEndpoint::SCOPE_ID_SIZE]
-            .copy_from_slice(&addr.scope_id().to_be_bytes());
-        len += SocketBoundEndpoint::SCOPE_ID_SIZE;
-        (len, buf)
-    }
-}
-
-impl HostIdentification for SocketBoundEndpoint {
-    fn encode(&self) -> &[u8] {
-        &self.bytes.1[0..self.bytes.0]
-    }
-}
-
 impl Endpoint {
     /// Start discovery from some addresses
     pub fn discovery_from_addresses(addresses: Vec<SocketAddr>) -> Self {
@@ -408,7 +216,7 @@ impl Endpoint {
     pub fn send(&self, srv: &AppServer, buf: &[u8]) -> anyhow::Result<()> {
         use Endpoint::*;
         match self {
-            SocketBoundAddress(host) => host.socket.send_to(srv, buf, host.addr),
+            SocketBoundAddress { socket, addr } => socket.send_to(srv, buf, *addr),
             Discovery(host) => host.send_scouting(srv, buf),
         }
     }
@@ -416,7 +224,7 @@ impl Endpoint {
     fn addresses(&self) -> &[SocketAddr] {
         use Endpoint::*;
         match self {
-            SocketBoundAddress(host) => slice::from_ref(&host.addr),
+            SocketBoundAddress { addr, .. } => slice::from_ref(addr),
             Discovery(host) => host.addresses(),
         }
     }
@@ -454,12 +262,6 @@ pub struct HostPathDiscoveryEndpoint {
     addresses: Vec<SocketAddr>,
 }
 
-impl std::fmt::Display for HostPathDiscoveryEndpoint {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self.addresses)
-    }
-}
-
 impl HostPathDiscoveryEndpoint {
     pub fn from_addresses(addresses: Vec<SocketAddr>) -> Self {
         let scouting_state = Cell::new((0, 0));
@@ -525,7 +327,7 @@ impl HostPathDiscoveryEndpoint {
                     .to_string()
                     .starts_with("Address family not supported by protocol");
                 if !ignore {
-                    warn!("Socket #{} refusing to send to {}: {}", sock_no, addr, err);
+                    warn!("Socket #{} refusing to send to {}: ", sock_no, addr);
                 }
             }
         }
@@ -536,15 +338,14 @@ impl HostPathDiscoveryEndpoint {
 
 impl AppServer {
     pub fn new(
-        keypair: Option<(SSk, SPk)>,
+        sk: SSk,
+        pk: SPk,
         addrs: Vec<SocketAddr>,
         verbosity: Verbosity,
-        test_helpers: Option<AppServerTest>,
     ) -> anyhow::Result<Self> {
         // setup mio
         let mio_poll = mio::Poll::new()?;
-        let events = mio::Events::with_capacity(EVENT_CAPACITY);
-        let mut mio_token_dispenser = MioTokenDispenser::default();
+        let events = mio::Events::with_capacity(8);
 
         // bind each SocketAddr to a socket
         let maybe_sockets: Result<Vec<_>, _> =
@@ -618,137 +419,46 @@ impl AppServer {
         }
 
         // register all sockets to mio
-        let mut io_source_index = HashMap::new();
-        for (idx, socket) in sockets.iter_mut().enumerate() {
-            let mio_token = mio_token_dispenser.dispense();
+        for (i, socket) in sockets.iter_mut().enumerate() {
             mio_poll
                 .registry()
-                .register(socket, mio_token, Interest::READABLE)?;
-            let prev = io_source_index.insert(mio_token, AppServerIoSource::Socket(idx));
-            assert!(prev.is_none());
+                .register(socket, Token(i), Interest::READABLE)?;
         }
 
-        let crypto_site = match keypair {
-            Some((sk, pk)) => ConstructionSite::from_product(CryptoServer::new(sk, pk)),
-            None => ConstructionSite::new(BuildCryptoServer::empty()),
-        };
+        // TODO use mio::net::UnixStream together with std::os::unix::net::UnixStream for Linux
 
         Ok(Self {
-            crypto_site,
+            crypt: CryptoServer::new(sk, pk),
             peers: Vec::new(),
             verbosity,
             sockets,
             events,
-            short_poll_queue: Default::default(),
-            performed_long_poll: false,
-            io_source_index,
             mio_poll,
-            mio_token_dispenser,
-            brokers: BrokerStore::default(),
             all_sockets_drained: false,
-            under_load: DoSOperation::Normal,
-            blocking_polls_count: 0,
-            non_blocking_polls_count: 0,
-            unpolled_count: 0,
-            last_update_time: Instant::now(),
-            test_helpers,
-            #[cfg(feature = "experiment_api")]
-            api_manager: crate::api::mio::MioManager::default(),
         })
     }
 
-    pub fn crypto_server(&self) -> anyhow::Result<&CryptoServer> {
-        self.crypto_site
-            .product_ref()
-            .context("Cryptography handler not initialized")
-    }
-
-    pub fn crypto_server_mut(&mut self) -> anyhow::Result<&mut CryptoServer> {
-        self.crypto_site
-            .product_mut()
-            .context("Cryptography handler not initialized")
-    }
-
     pub fn verbose(&self) -> bool {
         matches!(self.verbosity, Verbosity::Verbose)
     }
 
-    pub fn register_listen_socket(&mut self, mut sock: mio::net::UdpSocket) -> anyhow::Result<()> {
-        let mio_token = self.mio_token_dispenser.dispense();
-        self.mio_poll
-            .registry()
-            .register(&mut sock, mio_token, mio::Interest::READABLE)?;
-        let io_source = self.sockets.len().apply(AppServerIoSource::Socket);
-        self.sockets.push(sock);
-        self.register_io_source(mio_token, io_source);
-        Ok(())
-    }
-
-    pub fn register_io_source(&mut self, token: mio::Token, io_source: AppServerIoSource) {
-        let prev = self.io_source_index.insert(token, io_source);
-        assert!(prev.is_none());
-    }
-
-    pub fn unregister_io_source(&mut self, token: mio::Token) {
-        let value = self.io_source_index.remove(&token);
-        assert!(value.is_some(), "Removed IO source that does not exist");
-    }
-
-    pub fn register_broker(
-        &mut self,
-        broker: Box<dyn WireguardBrokerMio<Error = anyhow::Error, MioError = anyhow::Error>>,
-    ) -> Result<BrokerStorePtr> {
-        let ptr = Public::from_slice((self.brokers.store.len() as u64).as_bytes());
-        if self.brokers.store.insert(ptr, broker).is_some() {
-            bail!("Broker already registered");
-        }
-
-        let mio_token = self.mio_token_dispenser.dispense();
-        let io_source = ptr.apply(AppServerIoSource::PskBroker);
-        //Register broker
-        self.brokers
-            .store
-            .get_mut(&ptr)
-            .ok_or(anyhow::format_err!("Broker wasn't added to registry"))?
-            .register(self.mio_poll.registry(), mio_token)?;
-        self.register_io_source(mio_token, io_source);
-
-        Ok(BrokerStorePtr(ptr))
-    }
-
-    pub fn unregister_broker(&mut self, ptr: BrokerStorePtr) -> Result<()> {
-        let mut broker = self
-            .brokers
-            .store
-            .remove(&ptr.0)
-            .context("Broker not found")?;
-        self.unregister_io_source(broker.mio_token().unwrap());
-        broker.unregister(self.mio_poll.registry())?;
-        Ok(())
-    }
-
     pub fn add_peer(
         &mut self,
         psk: Option<SymKey>,
         pk: SPk,
         outfile: Option<PathBuf>,
-        broker_peer: Option<BrokerPeer>,
+        outwg: Option<WireguardOut>,
         hostname: Option<String>,
     ) -> anyhow::Result<AppPeerPtr> {
-        let PeerPtr(pn) = match &mut self.crypto_site {
-            ConstructionSite::Void => bail!("Crypto server construction site is void"),
-            ConstructionSite::Builder(builder) => builder.add_peer(psk, pk),
-            ConstructionSite::Product(srv) => srv.add_peer(psk, pk)?,
-        };
+        let PeerPtr(pn) = self.crypt.add_peer(psk, pk)?;
         assert!(pn == self.peers.len());
-
         let initial_endpoint = hostname
             .map(Endpoint::discovery_from_hostname)
             .transpose()?;
         let current_endpoint = None;
         self.peers.push(AppPeer {
             outfile,
-            broker_peer,
+            outwg,
             initial_endpoint,
             current_endpoint,
         });
@@ -783,7 +493,7 @@ impl AppServer {
             );
             if tries_left > 0 {
                 error!("re-initializing networking in {sleep}! {tries_left} tries left.");
-                std::thread::sleep(Duration::from_secs_f64(sleep));
+                std::thread::sleep(self.crypt.timebase.dur(sleep));
                 continue;
             }
 
@@ -815,42 +525,16 @@ impl AppServer {
             use crate::protocol::HandleMsgResult;
             use AppPollResult::*;
             use KeyOutputReason::*;
-
-            if let Some(AppServerTest {
-                termination_handler: Some(terminate),
-                ..
-            }) = &self.test_helpers
-            {
-                if terminate.try_recv().is_ok() {
-                    return Ok(());
-                }
-            }
-
-            enum CryptoSrv {
-                Avail,
-                Missing,
-            }
-
-            let poll_result = self.poll(&mut *rx)?;
-            let have_crypto = match self.crypto_site.is_available() {
-                true => CryptoSrv::Avail,
-                false => CryptoSrv::Missing,
-            };
-
-            #[allow(clippy::redundant_closure_call)]
-            match (have_crypto, poll_result) {
-                (CryptoSrv::Missing, SendInitiation(_)) => {}
-                (CryptoSrv::Avail, SendInitiation(peer)) => tx_maybe_with!(peer, || self
-                    .crypto_server_mut()?
+            match self.poll(&mut *rx)? {
+                #[allow(clippy::redundant_closure_call)]
+                SendInitiation(peer) => tx_maybe_with!(peer, || self
+                    .crypt
                     .initiate_handshake(peer.lower(), &mut *tx))?,
-
-                (CryptoSrv::Missing, SendRetransmission(_)) => {}
-                (CryptoSrv::Avail, SendRetransmission(peer)) => tx_maybe_with!(peer, || self
-                    .crypto_server_mut()?
+                #[allow(clippy::redundant_closure_call)]
+                SendRetransmission(peer) => tx_maybe_with!(peer, || self
+                    .crypt
                     .retransmit_handshake(peer.lower(), &mut *tx))?,
-
-                (CryptoSrv::Missing, DeleteKey(_)) => {}
-                (CryptoSrv::Avail, DeleteKey(peer)) => {
+                DeleteKey(peer) => {
                     self.output_key(peer, Stale, &SymKey::random())?;
 
                     // There was a loss of connection apparently; restart host discovery
@@ -864,21 +548,12 @@ impl AppServer {
                     );
                 }
 
-                (CryptoSrv::Missing, ReceivedMessage(_, _)) => {}
-                (CryptoSrv::Avail, ReceivedMessage(len, endpoint)) => {
-                    let msg_result = match self.under_load {
-                        DoSOperation::UnderLoad => {
-                            self.handle_msg_under_load(&endpoint, &rx[..len], &mut *tx)
-                        }
-                        DoSOperation::Normal => {
-                            self.crypto_server_mut()?.handle_msg(&rx[..len], &mut *tx)
-                        }
-                    };
-                    match msg_result {
+                ReceivedMessage(len, endpoint) => {
+                    match self.crypt.handle_msg(&rx[..len], &mut *tx) {
                         Err(ref e) => {
                             self.verbose().then(|| {
                                 info!(
-                                    "error processing incoming message from {}: {:?} {}",
+                                    "error processing incoming message from {:?}: {:?} {}",
                                     endpoint,
                                     e,
                                     e.backtrace()
@@ -900,8 +575,7 @@ impl AppServer {
                                 ap.get_app_mut(self).current_endpoint = Some(endpoint);
 
                                 // TODO: Maybe we should rather call the key "rosenpass output"?
-                                let osk = &self.crypto_server_mut()?.osk(p)?;
-                                self.output_key(ap, Exchanged, osk)?;
+                                self.output_key(ap, Exchanged, &self.crypt.osk(p)?)?;
                             }
                         }
                     }
@@ -910,40 +584,23 @@ impl AppServer {
         }
     }
 
-    fn handle_msg_under_load(
-        &mut self,
-        endpoint: &Endpoint,
-        rx: &[u8],
-        tx: &mut [u8],
-    ) -> Result<crate::protocol::HandleMsgResult> {
-        match endpoint {
-            Endpoint::SocketBoundAddress(socket) => self
-                .crypto_server_mut()?
-                .handle_msg_under_load(rx, &mut *tx, socket),
-            Endpoint::Discovery(_) => {
-                anyhow::bail!("Host-path discovery is not supported under load")
-            }
-        }
-    }
-
     pub fn output_key(
-        &mut self,
+        &self,
         peer: AppPeerPtr,
         why: KeyOutputReason,
         key: &SymKey,
     ) -> anyhow::Result<()> {
-        let peerid = peer.lower().get(self.crypto_server()?).pidt()?;
+        let peerid = peer.lower().get(&self.crypt).pidt()?;
+        let ap = peer.get_app(self);
 
         if self.verbose() {
             let msg = match why {
                 KeyOutputReason::Exchanged => "Exchanged key with peer",
                 KeyOutputReason::Stale => "Erasing outdated key from peer",
             };
-            info!("{} {}", msg, peerid.fmt_b64::<MAX_B64_PEER_ID_SIZE>());
+            info!("{} {}", msg, fmt_b64(&*peerid));
         }
 
-        let ap = peer.get_app(self);
-
         if let Some(of) = ap.outfile.as_ref() {
             // This might leave some fragments of the secret on the stack;
             // in practice this is likely not a problem because the stack likely
@@ -952,7 +609,7 @@ impl AppServer {
             // data will linger in the linux page cache anyways with the current
             // implementation, going to great length to erase the secret here is
             // not worth it right now.
-            key.store_b64::<MAX_B64_KEY_SIZE, _>(of)?;
+            b64_writer(fopen_w(of)?).write_all(key.secret())?;
             let why = match why {
                 KeyOutputReason::Exchanged => "exchanged",
                 KeyOutputReason::Stale => "stale",
@@ -960,17 +617,39 @@ impl AppServer {
 
             // this is intentionally writing to stdout instead of stderr, because
             // it is meant to allow external detection of a successful key-exchange
-            let stdout = stdout();
-            let mut stdout = stdout.lock();
-            writeln!(
-                stdout,
+            println!(
                 "output-key peer {} key-file {of:?} {why}",
-                peerid.fmt_b64::<MAX_B64_PEER_ID_SIZE>()
-            )?;
-            stdout.flush()?;
+                fmt_b64(&*peerid)
+            );
         }
 
-        peer.set_psk(self, key)?;
+        if let Some(owg) = ap.outwg.as_ref() {
+            let mut child = Command::new("wg")
+                .arg("set")
+                .arg(&owg.dev)
+                .arg("peer")
+                .arg(&owg.pk)
+                .arg("preshared-key")
+                .arg("/dev/stdin")
+                .stdin(Stdio::piped())
+                .args(&owg.extra_params)
+                .spawn()?;
+            b64_writer(child.stdin.take().unwrap()).write_all(key.secret())?;
+
+            thread::spawn(move || {
+                let status = child.wait();
+
+                if let Ok(status) = status {
+                    if status.success() {
+                        debug!("successfully passed psk to wg")
+                    } else {
+                        error!("could not pass psk to wg {:?}", status)
+                    }
+                } else {
+                    error!("wait failed: {:?}", status)
+                }
+            });
+        }
 
         Ok(())
     }
@@ -978,32 +657,17 @@ impl AppServer {
     pub fn poll(&mut self, rx_buf: &mut [u8]) -> anyhow::Result<AppPollResult> {
         use crate::protocol::PollResult as C;
         use AppPollResult as A;
-        let res = loop {
-            // Call CryptoServer's poll (if available)
-            let crypto_poll = self
-                .crypto_site
-                .product_mut()
-                .map(|crypto| crypto.poll())
-                .transpose()?;
-
-            // Map crypto server's poll result to our poll result
-            let io_poll_timeout = match crypto_poll {
-                Some(C::DeleteKey(PeerPtr(no))) => break A::DeleteKey(AppPeerPtr(no)),
-                Some(C::SendInitiation(PeerPtr(no))) => break A::SendInitiation(AppPeerPtr(no)),
-                Some(C::SendRetransmission(PeerPtr(no))) => {
-                    break A::SendRetransmission(AppPeerPtr(no))
-                }
-                Some(C::Sleep(timeout)) => timeout, // No event from crypto-server, do IO
-                None => crate::protocol::UNENDING,  // Crypto server is uninitialized, do IO
-            };
-
-            // Perform IO (look for a message)
-            if let Some((len, addr)) = self.try_recv(rx_buf, io_poll_timeout)? {
-                break A::ReceivedMessage(len, addr);
-            }
-        };
-
-        Ok(res)
+        loop {
+            return Ok(match self.crypt.poll()? {
+                C::DeleteKey(PeerPtr(no)) => A::DeleteKey(AppPeerPtr(no)),
+                C::SendInitiation(PeerPtr(no)) => A::SendInitiation(AppPeerPtr(no)),
+                C::SendRetransmission(PeerPtr(no)) => A::SendRetransmission(AppPeerPtr(no)),
+                C::Sleep(timeout) => match self.try_recv(rx_buf, timeout)? {
+                    Some((len, addr)) => A::ReceivedMessage(len, addr),
+                    None => continue,
+                },
+            });
+        }
     }
 
     /// Tries to receive a new message
@@ -1041,250 +705,35 @@ impl AppServer {
         // readiness event seems to be good enough™ for now.
 
         // only poll if we drained all sockets before
-        run(|| -> anyhow::Result<()> {
-            if !self.all_sockets_drained || !self.short_poll_queue.is_empty() {
-                self.unpolled_count += 1;
-                return Ok(());
-            }
-
-            self.perform_mio_poll_and_register_events(Duration::from_secs(0))?; // Non-blocking poll
-            if !self.short_poll_queue.is_empty() {
-                // Got some events in non-blocking mode
-                self.non_blocking_polls_count += 1;
-                return Ok(());
-            }
-
-            if !self.performed_long_poll {
-                // pass – go perform a full long poll before we enter blocking poll mode
-                // to make sure our experimental short poll feature did not miss any events
-                // due to being buggy.
-                return Ok(());
-            }
-
-            // Perform and register blocking poll
-            self.blocking_polls_count += 1;
-            self.perform_mio_poll_and_register_events(timeout)?;
-            self.performed_long_poll = false;
-
-            Ok(())
-        })?;
-
-        if let Some(AppServerTest {
-            enable_dos_permanently: true,
-            ..
-        }) = self.test_helpers
-        {
-            self.under_load = DoSOperation::UnderLoad;
-        } else {
-            //Reset blocking poll count if waiting for more than BLOCKING_POLL_COUNT_DURATION
-            if self.last_update_time.elapsed() > DURATION_UPDATE_UNDER_LOAD_STATUS {
-                self.last_update_time = Instant::now();
-                let total_polls = self.blocking_polls_count + self.non_blocking_polls_count;
-
-                let load_ratio = if total_polls > 0 {
-                    self.non_blocking_polls_count as f64 / total_polls as f64
-                } else if self.unpolled_count > 0 {
-                    //There are no polls, so we are under load
-                    1.0
-                } else {
-                    0.0
-                };
-
-                if load_ratio > UNDER_LOAD_RATIO {
-                    self.under_load = DoSOperation::UnderLoad;
-                } else {
-                    self.under_load = DoSOperation::Normal;
-                }
-
-                self.blocking_polls_count = 0;
-                self.non_blocking_polls_count = 0;
-                self.unpolled_count = 0;
-            }
+        if self.all_sockets_drained {
+            self.mio_poll.poll(&mut self.events, Some(timeout))?;
         }
 
-        // Focused polling – i.e. actually using mio::Token – is experimental for now.
-        // The reason for this is that we need to figure out how to integrate load detection
-        // and focused polling for one. Mio event-based polling also does not play nice with
-        // the current function signature and its reentrant design which is focused around receiving UDP socket packages
-        // for processing by the crypto protocol server.
-        // Besides that, there are also some parts of the code which intentionally block
-        // despite available data. This is the correct behavior; e.g. api::mio::Connection blocks
-        // further reads from its unix socket until the write buffer is flushed. In other words
-        // the connection handler makes sure that there is a buffer to put the response in while
-        // before reading further request.
-        // The potential problem with this behavior is that we end up ignoring instructions from
-        // epoll() to read from the particular sockets, so epoll will return information about that
-        // particular – blocked – file descriptor every call. We have only so many event slots and
-        // in theory, the event array could fill up entirely with intentionally blocked sockets.
-        // We need to figure out how to deal with this situation.
-        // Mio uses uses epoll in level-triggered mode, so we could handle taint-tracking for ignored
-        // sockets ourselves. The facilities are available in epoll and Mio, but we need to figure out how mio uses those
-        // facilities and how we can integrate them here.
-        // This will involve rewriting a lot of IO code and we should probably have integration
-        // tests  before we approach that.
-        //
-        // This hybrid approach is not without merit though; the short poll implementation covers
-        // all our IO sources, so under contention, rosenpass should generally not hit the long
-        // poll mode below. We keep short polling and calling epoll() in non-blocking mode (timeout
-        // of zero) until we run out of IO events processed. Then, just before we would perform a
-        // blocking poll, we go through all available IO sources to see if we missed anything.
-        {
-            while let Some(ev) = self.short_poll_queue.pop_front() {
-                if let Some(v) = self.try_recv_from_mio_token(buf, ev.token())? {
-                    return Ok(Some(v));
-                }
-            }
-        }
-
-        // drain all sockets
         let mut would_block_count = 0;
-        for sock_no in 0..self.sockets.len() {
-            match self
-                .try_recv_from_listen_socket(buf, sock_no)
-                .io_err_kind_hint()
-            {
-                Ok(None) => continue,
-                Ok(Some(v)) => {
+        for (sock_no, socket) in self.sockets.iter_mut().enumerate() {
+            match socket.recv_from(buf) {
+                Ok((n, addr)) => {
                     // at least one socket was not drained...
                     self.all_sockets_drained = false;
-                    return Ok(Some(v));
+                    return Ok(Some((
+                        n,
+                        Endpoint::SocketBoundAddress {
+                            socket: SocketPtr(sock_no),
+                            addr,
+                        },
+                    )));
                 }
-                Err((_, ErrorKind::WouldBlock)) => {
+                Err(e) if e.kind() == ErrorKind::WouldBlock => {
                     would_block_count += 1;
                 }
                 // TODO if one socket continuously returns an error, then we never poll, thus we never wait for a timeout, thus we have a spin-lock
-                Err((e, _)) => return Err(e)?,
+                Err(e) => return Err(e.into()),
             }
         }
 
         // if each socket returned WouldBlock, then we drained them all at least once indeed
         self.all_sockets_drained = would_block_count == self.sockets.len();
 
-        // Process brokers poll
-        for (_, broker) in self.brokers.store.iter_mut() {
-            broker.process_poll()?;
-        }
-
-        // API poll
-
-        #[cfg(feature = "experiment_api")]
-        {
-            use crate::api::mio::MioManagerContext;
-            MioManagerFocus(self).poll()?;
-        }
-
-        self.performed_long_poll = true;
-
         Ok(None)
     }
-
-    fn perform_mio_poll_and_register_events(&mut self, timeout: Duration) -> io::Result<()> {
-        self.mio_poll.poll(&mut self.events, Some(timeout))?;
-        // Fill the short poll buffer with the acquired events
-        self.events
-            .iter()
-            .cloned()
-            .for_each(|v| self.short_poll_queue.push_back(v));
-        Ok(())
-    }
-
-    fn try_recv_from_mio_token(
-        &mut self,
-        buf: &mut [u8],
-        token: mio::Token,
-    ) -> anyhow::Result<Option<(usize, Endpoint)>> {
-        let io_source = match self.io_source_index.get(&token) {
-            Some(io_source) => *io_source,
-            None => {
-                log::warn!("No IO source assiociated with mio token ({token:?}). Polling using mio tokens directly is an experimental feature and IO handler should recover when all available io sources are polled. This is a developer error. Please report it.");
-                return Ok(None);
-            }
-        };
-
-        self.try_recv_from_io_source(buf, io_source)
-    }
-
-    fn try_recv_from_io_source(
-        &mut self,
-        buf: &mut [u8],
-        io_source: AppServerIoSource,
-    ) -> anyhow::Result<Option<(usize, Endpoint)>> {
-        use crate::api::mio::MioManagerContext;
-
-        match io_source {
-            AppServerIoSource::Socket(idx) => self
-                .try_recv_from_listen_socket(buf, idx)
-                .substitute_for_ioerr_wouldblock(None)?
-                .ok(),
-
-            #[cfg(feature = "experiment_api")]
-            AppServerIoSource::PskBroker(key) => self
-                .brokers
-                .store
-                .get_mut(&key)
-                .with_context(|| format!("No PSK broker under key {key:?}"))?
-                .process_poll()
-                .map(|_| None),
-
-            #[cfg(feature = "experiment_api")]
-            AppServerIoSource::MioManager(mmio_src) => MioManagerFocus(self)
-                .poll_particular(mmio_src)
-                .map(|_| None),
-        }
-    }
-
-    fn try_recv_from_listen_socket(
-        &mut self,
-        buf: &mut [u8],
-        idx: usize,
-    ) -> io::Result<Option<(usize, Endpoint)>> {
-        use std::io::ErrorKind as K;
-        let (n, addr) = loop {
-            match self.sockets[idx].recv_from(buf).io_err_kind_hint() {
-                Ok(v) => break v,
-                Err((_, K::Interrupted)) => continue,
-                Err((e, _)) => return Err(e)?,
-            }
-        };
-        SocketPtr(idx)
-            .apply(|sp| SocketBoundEndpoint::new(sp, addr))
-            .apply(Endpoint::SocketBoundAddress)
-            .apply(|ep| (n, ep))
-            .some()
-            .ok()
-    }
-
-    #[cfg(feature = "experiment_api")]
-    pub fn add_api_connection(&mut self, connection: mio::net::UnixStream) -> std::io::Result<()> {
-        use crate::api::mio::MioManagerContext;
-        MioManagerFocus(self).add_connection(connection)
-    }
-
-    #[cfg(feature = "experiment_api")]
-    pub fn add_api_listener(&mut self, listener: mio::net::UnixListener) -> std::io::Result<()> {
-        use crate::api::mio::MioManagerContext;
-        MioManagerFocus(self).add_listener(listener)
-    }
-}
-
-#[cfg(feature = "experiment_api")]
-struct MioManagerFocus<'a>(&'a mut AppServer);
-
-#[cfg(feature = "experiment_api")]
-impl crate::api::mio::MioManagerContext for MioManagerFocus<'_> {
-    fn mio_manager(&self) -> &crate::api::mio::MioManager {
-        &self.0.api_manager
-    }
-
-    fn mio_manager_mut(&mut self) -> &mut crate::api::mio::MioManager {
-        &mut self.0.api_manager
-    }
-
-    fn app_server(&self) -> &AppServer {
-        self.0
-    }
-
-    fn app_server_mut(&mut self) -> &mut AppServer {
-        self.0
-    }
 }

rosenpass/src/bin/gen-ipc-msg-types.rs

@@ -1,92 +0,0 @@
-use anyhow::{Context, Result};
-use heck::ToShoutySnakeCase;
-
-use rosenpass_ciphers::{hash_domain::HashDomain, KEY_LEN};
-
-fn calculate_hash_value(hd: HashDomain, values: &[&str]) -> Result<[u8; KEY_LEN]> {
-    match values.split_first() {
-        Some((head, tail)) => calculate_hash_value(hd.mix(head.as_bytes())?, tail),
-        None => Ok(hd.into_value()),
-    }
-}
-
-fn print_literal(path: &[&str]) -> Result<()> {
-    let val = calculate_hash_value(HashDomain::zero(), path)?;
-    let (last, prefix) = path.split_last().context("developer error!")?;
-    let var_name = last.to_shouty_snake_case();
-
-    print!("// hash domain hash of: ");
-    for n in prefix.iter() {
-        print!("{n} -> ");
-    }
-    println!("{last}");
-
-    let c = hex::encode(val)
-        .chars()
-        .collect::<Vec<char>>()
-        .chunks_exact(4)
-        .map(|chunk| chunk.iter().collect::<String>())
-        .collect::<Vec<_>>();
-    println!("const {var_name} : RawMsgType = RawMsgType::from_le_bytes(hex!(\"{} {} {} {}    {} {} {} {}\"));",
-        c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
-
-    Ok(())
-}
-
-#[derive(Debug, Clone)]
-enum Tree {
-    Branch(String, Vec<Tree>),
-    Leaf(String),
-}
-
-impl Tree {
-    fn name(&self) -> &str {
-        match self {
-            Self::Branch(name, _) => name,
-            Self::Leaf(name) => name,
-        }
-    }
-
-    fn gen_code_inner(&self, prefix: &[&str]) -> Result<()> {
-        let mut path = prefix.to_owned();
-        path.push(self.name());
-
-        match self {
-            Self::Branch(_, ref children) => {
-                for c in children.iter() {
-                    c.gen_code_inner(&path)?
-                }
-            }
-            Self::Leaf(_) => print_literal(&path)?,
-        };
-
-        Ok(())
-    }
-
-    fn gen_code(&self) -> Result<()> {
-        self.gen_code_inner(&[])
-    }
-}
-
-fn main() -> Result<()> {
-    let tree = Tree::Branch(
-        "Rosenpass IPC API".to_owned(),
-        vec![Tree::Branch(
-            "Rosenpass Protocol Server".to_owned(),
-            vec![
-                Tree::Leaf("Ping Request".to_owned()),
-                Tree::Leaf("Ping Response".to_owned()),
-                Tree::Leaf("Supply Keypair Request".to_owned()),
-                Tree::Leaf("Supply Keypair Response".to_owned()),
-                Tree::Leaf("Add Listen Socket Request".to_owned()),
-                Tree::Leaf("Add Listen Socket Response".to_owned()),
-                Tree::Leaf("Add Psk Broker Request".to_owned()),
-                Tree::Leaf("Add Psk Broker Response".to_owned()),
-            ],
-        )],
-    );
-
-    println!("type RawMsgType = u128;");
-    println!();
-    tree.gen_code()
-}

rosenpass/src/cli.rs

@@ -1,140 +1,20 @@
-use anyhow::{bail, ensure, Context};
-use clap::{Parser, Subcommand};
+use anyhow::{bail, ensure};
+use clap::Parser;
 use rosenpass_cipher_traits::Kem;
 use rosenpass_ciphers::kem::StaticKem;
 use rosenpass_secret_memory::file::StoreSecret;
-use rosenpass_util::file::{LoadValue, LoadValueB64, StoreValue};
-use rosenpass_wireguard_broker::brokers::native_unix::{
-    NativeUnixBroker, NativeUnixBrokerConfigBaseBuilder, NativeUnixBrokerConfigBaseBuilderError,
-};
-use std::ops::DerefMut;
+use rosenpass_util::file::{LoadValue, LoadValueB64};
 use std::path::PathBuf;
 
-use crate::app_server::AppServerTest;
-use crate::app_server::{AppServer, BrokerPeer};
+use crate::app_server;
+use crate::app_server::AppServer;
 use crate::protocol::{SPk, SSk, SymKey};
 
 use super::config;
 
-#[cfg(feature = "experiment_api")]
-use {
-    command_fds::{CommandFdExt, FdMapping},
-    log::{error, info},
-    mio::net::UnixStream,
-    rosenpass_util::fd::claim_fd,
-    rosenpass_wireguard_broker::brokers::mio_client::MioBrokerClient,
-    rosenpass_wireguard_broker::WireguardBrokerMio,
-    rustix::fd::AsRawFd,
-    rustix::net::{socketpair, AddressFamily, SocketFlags, SocketType},
-    std::os::unix::net,
-    std::process::Command,
-    std::thread,
-};
-
-/// enum representing a choice of interface to a WireGuard broker
-#[derive(Debug)]
-pub enum BrokerInterface {
-    Socket(PathBuf),
-    FileDescriptor(i32),
-    SocketPair,
-}
-
-/// struct holding all CLI arguments for `clap` crate to parse
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about)]
-pub struct CliArgs {
-    /// lowest log level to show – log messages at higher levels will be omitted
-    #[arg(long = "log-level", value_name = "LOG_LEVEL", group = "log-level")]
-    log_level: Option<log::LevelFilter>,
-
-    /// show verbose log output – sets log level to "debug"
-    #[arg(short, long, group = "log-level")]
-    verbose: bool,
-
-    /// show no log output – sets log level to "error"
-    #[arg(short, long, group = "log-level")]
-    quiet: bool,
-
-    #[command(flatten)]
-    #[cfg(feature = "experiment_api")]
-    api: crate::api::cli::ApiCli,
-
-    /// path of the wireguard_psk broker socket to connect to
-    #[cfg(feature = "experiment_api")]
-    #[arg(long, group = "psk-broker-specs")]
-    psk_broker_path: Option<PathBuf>,
-
-    /// fd of the wireguard_spk broker socket to connect to
-    ///
-    /// when this command is called from another process, the other process can open and bind the
-    /// Unix socket for the psk broker connection to use themselves, passing it to this process --
-    /// in Rust this can be achieved using the
-    /// [command-fds](https://docs.rs/command-fds/latest/command_fds/) crate
-    #[cfg(feature = "experiment_api")]
-    #[arg(long, group = "psk-broker-specs")]
-    psk_broker_fd: Option<i32>,
-
-    /// spawn a psk broker locally using a socket pair
-    #[cfg(feature = "experiment_api")]
-    #[arg(short, long, group = "psk-broker-specs")]
-    psk_broker_spawn: bool,
-
-    #[command(subcommand)]
-    pub command: CliCommand,
-}
-
-impl CliArgs {
-    pub fn apply_to_config(&self, _cfg: &mut config::Rosenpass) -> anyhow::Result<()> {
-        #[cfg(feature = "experiment_api")]
-        self.api.apply_to_config(_cfg)?;
-        Ok(())
-    }
-
-    /// returns the log level filter set by CLI args
-    /// returns `None` if the user did not specify any log level filter via CLI
-    ///
-    /// NOTE: the clap feature of ["argument groups"](https://docs.rs/clap/latest/clap/_derive/_tutorial/chapter_3/index.html#argument-relations)
-    /// ensures that the user can not specify more than one of the possible log level arguments.
-    /// Note the `#[arg("group")]` in the [`CliArgs`] struct.
-    pub fn get_log_level(&self) -> Option<log::LevelFilter> {
-        if self.verbose {
-            return Some(log::LevelFilter::Info);
-        }
-        if self.quiet {
-            return Some(log::LevelFilter::Warn);
-        }
-        if let Some(level_filter) = self.log_level {
-            return Some(level_filter);
-        }
-        None
-    }
-
-    #[cfg(feature = "experiment_api")]
-    /// returns the broker interface set by CLI args
-    /// returns `None` if the `experiment_api` feature isn't enabled
-    pub fn get_broker_interface(&self) -> Option<BrokerInterface> {
-        if let Some(path_ref) = self.psk_broker_path.as_ref() {
-            Some(BrokerInterface::Socket(path_ref.to_path_buf()))
-        } else if let Some(fd) = self.psk_broker_fd {
-            Some(BrokerInterface::FileDescriptor(fd))
-        } else if self.psk_broker_spawn {
-            Some(BrokerInterface::SocketPair)
-        } else {
-            None
-        }
-    }
-
-    #[cfg(not(feature = "experiment_api"))]
-    /// returns the broker interface set by CLI args
-    /// returns `None` if the `experiment_api` feature isn't enabled
-    pub fn get_broker_interface(&self) -> Option<BrokerInterface> {
-        None
-    }
-}
-
-/// represents a command specified via CLI
-#[derive(Subcommand, Debug)]
-pub enum CliCommand {
+pub enum Cli {
     /// Start Rosenpass in server mode and carry on with the key exchange
     ///
     /// This will parse the configuration file and perform the key exchange
@@ -207,15 +87,6 @@ pub enum CliCommand {
         force: bool,
     },
 
-    /// Deprecated - use gen-keys instead
-    #[allow(rustdoc::broken_intra_doc_links)]
-    #[allow(rustdoc::invalid_html_tags)]
-    Keygen {
-        // NOTE yes, the legacy keygen argument initially really accepted "privet-key", not "secret-key"!
-        /// public-key <PATH> private-key <PATH>
-        args: Vec<String>,
-    },
-
     /// Validate a configuration
     Validate { config_files: Vec<PathBuf> },
 
@@ -224,18 +95,12 @@ pub enum CliCommand {
     Man,
 }
 
-impl CliArgs {
-    /// runs the command specified via CLI
-    ///
-    /// ## TODO
-    /// - This method consumes the [`CliCommand`] value. It might be wise to use a reference...
-    pub fn run(
-        self,
-        broker_interface: Option<BrokerInterface>,
-        test_helpers: Option<AppServerTest>,
-    ) -> anyhow::Result<()> {
-        use CliCommand::*;
-        match &self.command {
+impl Cli {
+    pub fn run() -> anyhow::Result<()> {
+        let cli = Self::parse();
+
+        use Cli::*;
+        match cli {
             Man => {
                 let man_cmd = std::process::Command::new("man")
                     .args(["1", "rosenpass"])
@@ -247,47 +112,13 @@ impl CliArgs {
             }
             GenConfig { config_file, force } => {
                 ensure!(
-                    *force || !config_file.exists(),
+                    force || !config_file.exists(),
                     "config file {config_file:?} already exists"
                 );
 
                 config::Rosenpass::example_config().store(config_file)?;
             }
 
-            // Deprecated - use gen-keys instead
-            Keygen { args } => {
-                log::warn!("The 'keygen' command is deprecated. Please use the 'gen-keys' command instead.");
-
-                let mut public_key: Option<PathBuf> = None;
-                let mut secret_key: Option<PathBuf> = None;
-
-                // Manual arg parsing, since clap wants to prefix flags with "--"
-                let mut args = args.iter();
-                loop {
-                    match (args.next().map(|x| x.as_str()), args.next()) {
-                        (Some("private-key"), Some(opt)) | (Some("secret-key"), Some(opt)) => {
-                            secret_key = Some(opt.into());
-                        }
-                        (Some("public-key"), Some(opt)) => {
-                            public_key = Some(opt.into());
-                        }
-                        (Some(flag), _) => {
-                            bail!("Unknown option `{}`", flag);
-                        }
-                        (_, _) => break,
-                    };
-                }
-
-                if secret_key.is_none() {
-                    bail!("private-key is required");
-                }
-                if public_key.is_none() {
-                    bail!("public-key is required");
-                }
-
-                generate_and_save_keypair(secret_key.unwrap(), public_key.unwrap())?;
-            }
-
             GenKeys {
                 config_file,
                 public_key,
@@ -303,13 +134,10 @@ impl CliArgs {
                         );
 
                         let config = config::Rosenpass::load(config_file)?;
-                        let keypair = config
-                            .keypair
-                            .context("Config file present, but no keypair is specified.")?;
 
-                        (keypair.public_key, keypair.secret_key)
+                        (config.public_key, config.secret_key)
                     }
-                    (_, Some(pkf), Some(skf)) => (pkf.clone(), skf.clone()),
+                    (_, Some(pkf), Some(skf)) => (pkf, skf),
                     _ => {
                         bail!("either a config-file or both public-key and secret-key file are required")
                     }
@@ -319,14 +147,12 @@ impl CliArgs {
                 let mut problems = vec![];
                 if !force && pkf.is_file() {
                     problems.push(format!(
-                        "public-key file {:?} exists, refusing to overwrite",
-                        std::fs::canonicalize(&pkf)?,
+                        "public-key file {pkf:?} exist, refusing to overwrite it"
                     ));
                 }
                 if !force && skf.is_file() {
                     problems.push(format!(
-                        "secret-key file {:?} exists, refusing to overwrite",
-                        std::fs::canonicalize(&skf)?,
+                        "secret-key file {skf:?} exist, refusing to overwrite it"
                     ));
                 }
                 if !problems.is_empty() {
@@ -334,7 +160,12 @@ impl CliArgs {
                 }
 
                 // generate the keys and store them in files
-                generate_and_save_keypair(skf, pkf)?;
+                let mut ssk = crate::protocol::SSk::random();
+                let mut spk = crate::protocol::SPk::random();
+                StaticKem::keygen(ssk.secret_mut(), spk.secret_mut())?;
+
+                ssk.store_secret(skf)?;
+                spk.store_secret(pkf)?;
             }
 
             ExchangeConfig { config_file } => {
@@ -343,42 +174,35 @@ impl CliArgs {
                     "config file '{config_file:?}' does not exist"
                 );
 
-                let mut config = config::Rosenpass::load(config_file)?;
+                let config = config::Rosenpass::load(config_file)?;
                 config.validate()?;
-                self.apply_to_config(&mut config)?;
-                config.check_usefullness()?;
-
-                Self::event_loop(config, broker_interface, test_helpers)?;
+                Self::event_loop(config)?;
             }
 
             Exchange {
                 first_arg,
-                rest_of_args,
+                mut rest_of_args,
                 config_file,
             } => {
-                let mut rest_of_args = rest_of_args.clone();
-                rest_of_args.insert(0, first_arg.clone());
+                rest_of_args.insert(0, first_arg);
                 let args = rest_of_args;
                 let mut config = config::Rosenpass::parse_args(args)?;
 
                 if let Some(p) = config_file {
-                    config.store(p)?;
-                    config.config_file_path.clone_from(p);
+                    config.store(&p)?;
+                    config.config_file_path = p;
                 }
                 config.validate()?;
-                self.apply_to_config(&mut config)?;
-                config.check_usefullness()?;
-
-                Self::event_loop(config, broker_interface, test_helpers)?;
+                Self::event_loop(config)?;
             }
 
             Validate { config_files } => {
                 for file in config_files {
-                    match config::Rosenpass::load(file) {
+                    match config::Rosenpass::load(&file) {
                         Ok(config) => {
                             eprintln!("{file:?} is valid TOML and conforms to the expected schema");
                             match config.validate() {
-                                Ok(_) => eprintln!("{file:?} has passed all logical checks"),
+                                Ok(_) => eprintln!("{file:?} is passed all logical checks"),
                                 Err(_) => eprintln!("{file:?} contains logical errors"),
                             }
                         }
@@ -391,168 +215,34 @@ impl CliArgs {
         Ok(())
     }
 
-    fn event_loop(
-        config: config::Rosenpass,
-        broker_interface: Option<BrokerInterface>,
-        test_helpers: Option<AppServerTest>,
-    ) -> anyhow::Result<()> {
-        const MAX_PSK_SIZE: usize = 1000;
-
+    fn event_loop(config: config::Rosenpass) -> anyhow::Result<()> {
         // load own keys
-        let keypair = config
-            .keypair
-            .as_ref()
-            .map(|kp| -> anyhow::Result<_> {
-                let sk = SSk::load(&kp.secret_key)?;
-                let pk = SPk::load(&kp.public_key)?;
-                Ok((sk, pk))
-            })
-            .transpose()?;
+        let sk = SSk::load(&config.secret_key)?;
+        let pk = SPk::load(&config.public_key)?;
 
         // start an application server
         let mut srv = std::boxed::Box::<AppServer>::new(AppServer::new(
-            keypair,
-            config.listen.clone(),
+            sk,
+            pk,
+            config.listen,
             config.verbosity,
-            test_helpers,
         )?);
 
-        config.apply_to_app_server(&mut srv)?;
-
-        let broker = Self::create_broker(broker_interface)?;
-        let broker_store_ptr = srv.register_broker(broker)?;
-
-        fn cfg_err_map(e: NativeUnixBrokerConfigBaseBuilderError) -> anyhow::Error {
-            anyhow::Error::msg(format!("NativeUnixBrokerConfigBaseBuilderError: {:?}", e))
-        }
-
         for cfg_peer in config.peers {
-            let broker_peer = if let Some(wg) = &cfg_peer.wg {
-                let peer_cfg = NativeUnixBrokerConfigBaseBuilder::default()
-                    .peer_id_b64(&wg.peer)?
-                    .interface(wg.device.clone())
-                    .extra_params_ser(&wg.extra_params)?
-                    .build()
-                    .map_err(cfg_err_map)?;
-
-                let broker_peer = BrokerPeer::new(broker_store_ptr.clone(), Box::new(peer_cfg));
-
-                Some(broker_peer)
-            } else {
-                None
-            };
-
             srv.add_peer(
                 // psk, pk, outfile, outwg, tx_addr
-                cfg_peer
-                    .pre_shared_key
-                    .map(SymKey::load_b64::<MAX_PSK_SIZE, _>)
-                    .transpose()?,
+                cfg_peer.pre_shared_key.map(SymKey::load_b64).transpose()?,
                 SPk::load(&cfg_peer.public_key)?,
                 cfg_peer.key_out,
-                broker_peer,
+                cfg_peer.wg.map(|cfg| app_server::WireguardOut {
+                    dev: cfg.device,
+                    pk: cfg.peer,
+                    extra_params: cfg.extra_params,
+                }),
                 cfg_peer.endpoint.clone(),
             )?;
         }
 
         srv.event_loop()
     }
-
-    #[cfg(feature = "experiment_api")]
-    fn create_broker(
-        broker_interface: Option<BrokerInterface>,
-    ) -> Result<
-        Box<dyn WireguardBrokerMio<MioError = anyhow::Error, Error = anyhow::Error>>,
-        anyhow::Error,
-    > {
-        if let Some(interface) = broker_interface {
-            let socket = Self::get_broker_socket(interface)?;
-            Ok(Box::new(MioBrokerClient::new(socket)))
-        } else {
-            Ok(Box::new(NativeUnixBroker::new()))
-        }
-    }
-
-    #[cfg(not(feature = "experiment_api"))]
-    fn create_broker(
-        _broker_interface: Option<BrokerInterface>,
-    ) -> Result<Box<NativeUnixBroker>, anyhow::Error> {
-        Ok(Box::new(NativeUnixBroker::new()))
-    }
-
-    #[cfg(feature = "experiment_api")]
-    fn get_broker_socket(broker_interface: BrokerInterface) -> Result<UnixStream, anyhow::Error> {
-        // Connect to the psk broker unix socket if one was specified
-        // OR OTHERWISE spawn the psk broker and use socketpair(2) to connect with them
-        match broker_interface {
-            BrokerInterface::Socket(broker_path) => Ok(UnixStream::connect(broker_path)?),
-            BrokerInterface::FileDescriptor(broker_fd) => {
-                // mio::net::UnixStream doesn't implement From<OwnedFd>, so we have to go through std
-                let sock = net::UnixStream::from(claim_fd(broker_fd)?);
-                sock.set_nonblocking(true)?;
-                Ok(UnixStream::from_std(sock))
-            }
-            BrokerInterface::SocketPair => {
-                // Form a socketpair for communicating to the broker
-                let (ours, theirs) = socketpair(
-                    AddressFamily::UNIX,
-                    SocketType::STREAM,
-                    SocketFlags::empty(),
-                    None,
-                )?;
-
-                // Setup our end of the socketpair
-                let ours = net::UnixStream::from(ours);
-                ours.set_nonblocking(true)?;
-
-                // Start the PSK broker
-                let mut child = Command::new("rosenpass-wireguard-broker-socket-handler")
-                    .args(["--stream-fd", "3"])
-                    .fd_mappings(vec![FdMapping {
-                        parent_fd: theirs.as_raw_fd(),
-                        child_fd: 3,
-                    }])?
-                    .spawn()?;
-
-                // Handle the PSK broker crashing
-                thread::spawn(move || {
-                    let status = child.wait();
-
-                    if let Ok(status) = status {
-                        if status.success() {
-                            // Maybe they are doing double forking?
-                            info!("PSK broker exited.");
-                        } else {
-                            error!("PSK broker exited with an error ({status:?})");
-                        }
-                    } else {
-                        error!("Wait on PSK broker process failed ({status:?})");
-                    }
-                });
-
-                Ok(UnixStream::from_std(ours))
-            }
-        }
-    }
-}
-
-/// generate secret and public keys, store in files according to the paths passed as arguments
-fn generate_and_save_keypair(secret_key: PathBuf, public_key: PathBuf) -> anyhow::Result<()> {
-    let mut ssk = crate::protocol::SSk::random();
-    let mut spk = crate::protocol::SPk::random();
-    StaticKem::keygen(ssk.secret_mut(), spk.deref_mut())?;
-    ssk.store_secret(secret_key)?;
-    spk.store(public_key)
-}
-
-#[cfg(feature = "internal_testing")]
-pub mod testing {
-    use super::*;
-
-    pub fn generate_and_save_keypair(
-        secret_key: PathBuf,
-        public_key: PathBuf,
-    ) -> anyhow::Result<()> {
-        super::generate_and_save_keypair(secret_key, public_key)
-    }
 }

rosenpass/src/config.rs

@@ -1,12 +1,3 @@
-//! Configuration readable from a config file.
-//!
-//! Rosenpass supports reading its configuration from a TOML file. This module contains a struct
-//! [`Rosenpass`] which holds such a configuration.
-//!
-//! ## TODO
-//! - support `~` in <https://github.com/rosenpass/rosenpass/issues/237>
-//! - provide tooling to create config file from shell <https://github.com/rosenpass/rosenpass/issues/247>
-
 use std::{
     collections::HashSet,
     fs,
@@ -16,171 +7,62 @@ use std::{
 };
 
 use anyhow::{bail, ensure};
-use rosenpass_util::file::{fopen_w, Visibility};
+use rosenpass_util::file::fopen_w;
 use serde::{Deserialize, Serialize};
 
-use crate::app_server::AppServer;
-
-#[cfg(feature = "experiment_api")]
-fn empty_api_config() -> crate::api::config::ApiConfig {
-    crate::api::config::ApiConfig {
-        listen_path: Vec::new(),
-        listen_fd: Vec::new(),
-        stream_fd: Vec::new(),
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Rosenpass {
-    // TODO: Raise error if secret key or public key alone is set during deserialization
-    // SEE: https://github.com/serde-rs/serde/issues/2793
-    #[serde(flatten)]
-    pub keypair: Option<Keypair>,
+    pub public_key: PathBuf,
 
-    /// Location of the API listen sockets
-    #[cfg(feature = "experiment_api")]
-    #[serde(default = "empty_api_config")]
-    pub api: crate::api::config::ApiConfig,
+    pub secret_key: PathBuf,
 
-    /// list of [`SocketAddr`] to listen on
-    ///
-    /// Examples:
-    /// - `0.0.0.0:123`
     pub listen: Vec<SocketAddr>,
 
-    /// log verbosity
-    ///
-    /// This is subject to change. See [`Verbosity`] for details.
     #[serde(default)]
     pub verbosity: Verbosity,
-
-    /// list of peers
-    ///
-    /// See the [`RosenpassPeer`] type for more information and examples.
     pub peers: Vec<RosenpassPeer>,
 
-    /// path to the file which provided this configuration
-    ///
-    /// This item is of course not read from the TOML but is added by the algorithm that parses
-    /// the config file.
     #[serde(skip)]
     pub config_file_path: PathBuf,
 }
 
-#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone)]
-pub struct Keypair {
-    /// path to the public key file
-    pub public_key: PathBuf,
-
-    /// path to the secret key file
-    pub secret_key: PathBuf,
-}
-
-impl Keypair {
-    pub fn new<Pk: AsRef<Path>, Sk: AsRef<Path>>(public_key: Pk, secret_key: Sk) -> Self {
-        let public_key = public_key.as_ref().to_path_buf();
-        let secret_key = secret_key.as_ref().to_path_buf();
-        Self {
-            public_key,
-            secret_key,
-        }
-    }
-}
-
-/// ## TODO
-/// - replace this type with [`log::LevelFilter`], also see <https://github.com/rosenpass/rosenpass/pull/246>
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Copy, Clone)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Verbosity {
     Quiet,
     Verbose,
 }
 
-/// ## TODO
-/// - examples
-/// - documentation
 #[derive(Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct RosenpassPeer {
-    /// path to the public key of the peer
     pub public_key: PathBuf,
-
-    /// ## TODO
-    /// - documentation
     pub endpoint: Option<String>,
-
-    /// path to the pre-shared key with the peer
-    ///
-    /// NOTE: this item can be skipped in the config if you do not use a pre-shared key with the peer
     pub pre_shared_key: Option<PathBuf>,
 
-    /// ## TODO
-    /// - documentation
     #[serde(default)]
     pub key_out: Option<PathBuf>,
 
-    /// ## TODO
-    /// - documentation
-    /// - make this field only available on binary builds, not on library builds <https://github.com/rosenpass/rosenpass/issues/249>
+    // TODO make this field only available on binary builds, not on library builds
     #[serde(flatten)]
     pub wg: Option<WireGuard>,
 }
 
-/// ## TODO
-/// - documentation
 #[derive(Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct WireGuard {
-    /// ## TODO
-    /// - documentation
     pub device: String,
-
-    /// ## TODO
-    /// - documentation
     pub peer: String,
 
-    /// ## TODO
-    /// - documentation
     #[serde(default)]
     pub extra_params: Vec<String>,
 }
 
-impl Default for Rosenpass {
-    fn default() -> Self {
-        Self::empty()
-    }
-}
-
 impl Rosenpass {
-    /// load configuration from a TOML file
+    /// Load a config file from a file path
     ///
-    /// NOTE: no validation is conducted, e.g. the paths specified in the configuration are not
-    /// checked whether they even exist.
-    ///
-    /// ## TODO
-    /// - consider using a different algorithm to determine home directory – the below one may
-    ///   behave unexpectedly on Windows
+    /// no validation is conducted
     pub fn load<P: AsRef<Path>>(p: P) -> anyhow::Result<Self> {
-        // read file and deserialize
         let mut config: Self = toml::from_str(&fs::read_to_string(&p)?)?;
 
-        // resolve `~` (see https://github.com/rosenpass/rosenpass/issues/237)
-        use util::resolve_path_with_tilde;
-        if let Some(ref mut keypair) = config.keypair {
-            resolve_path_with_tilde(&mut keypair.public_key);
-            resolve_path_with_tilde(&mut keypair.secret_key);
-        }
-        for peer in config.peers.iter_mut() {
-            resolve_path_with_tilde(&mut peer.public_key);
-            if let Some(ref mut psk) = &mut peer.pre_shared_key {
-                resolve_path_with_tilde(psk);
-            }
-            if let Some(ref mut ko) = &mut peer.key_out {
-                resolve_path_with_tilde(ko);
-            }
-        }
-
-        // add path to "self"
-        p.as_ref().clone_into(&mut config.config_file_path);
-
-        // return
+        config.config_file_path = p.as_ref().to_owned();
         Ok(config)
     }
 
@@ -194,39 +76,27 @@ impl Rosenpass {
 
     /// Commit the configuration to where it came from, overwriting the original file
     pub fn commit(&self) -> anyhow::Result<()> {
-        let mut f = fopen_w(&self.config_file_path, Visibility::Public)?;
+        let mut f = fopen_w(&self.config_file_path)?;
         f.write_all(toml::to_string_pretty(&self)?.as_bytes())?;
 
         self.store(&self.config_file_path)
     }
 
-    pub fn apply_to_app_server(&self, _srv: &mut AppServer) -> anyhow::Result<()> {
-        #[cfg(feature = "experiment_api")]
-        self.api.apply_to_app_server(_srv)?;
-        Ok(())
-    }
-
     /// Validate a configuration
-    ///
-    /// ## TODO
-    /// - check that files do not just exist but are also readable
-    /// - warn if neither out_key nor exchange_command of a peer is defined (v.i.)
     pub fn validate(&self) -> anyhow::Result<()> {
-        if let Some(ref keypair) = self.keypair {
-            // check the public key file exists
-            ensure!(
-                keypair.public_key.is_file(),
-                "could not find public-key file {:?}: no such file",
-                keypair.public_key
-            );
+        // check the public-key file exists
+        ensure!(
+            self.public_key.is_file(),
+            "public-key file {:?} does not exist",
+            self.public_key
+        );
 
-            // check the secret-key file exists
-            ensure!(
-                keypair.secret_key.is_file(),
-                "could not find secret-key file {:?}: no such file",
-                keypair.secret_key
-            );
-        }
+        // check the secret-key file exists
+        ensure!(
+            self.secret_key.is_file(),
+            "secret-key file {:?} does not exist",
+            self.secret_key
+        );
 
         for (i, peer) in self.peers.iter().enumerate() {
             // check peer's public-key file exists
@@ -251,36 +121,12 @@ impl Rosenpass {
         Ok(())
     }
 
-    pub fn check_usefullness(&self) -> anyhow::Result<()> {
-        #[cfg(not(feature = "experiment_api"))]
-        ensure!(self.keypair.is_some(), "Server keypair missing.");
-
-        #[cfg(feature = "experiment_api")]
-        ensure!(
-            self.keypair.is_some() || self.api.has_api_sources(),
-            "{}{}",
-            "Specify a server keypair or some API connections to configure the keypair with.",
-            "Without a keypair, rosenpass can not operate."
-        );
-
-        Ok(())
-    }
-
-    pub fn empty() -> Self {
-        Self::new(None)
-    }
-
-    pub fn from_sk_pk<Sk: AsRef<Path>, Pk: AsRef<Path>>(sk: Sk, pk: Pk) -> Self {
-        Self::new(Some(Keypair::new(pk, sk)))
-    }
-
     /// Creates a new configuration
-    pub fn new(keypair: Option<Keypair>) -> Self {
+    pub fn new<P1: AsRef<Path>, P2: AsRef<Path>>(public_key: P1, secret_key: P2) -> Self {
         Self {
-            keypair,
+            public_key: PathBuf::from(public_key.as_ref()),
+            secret_key: PathBuf::from(secret_key.as_ref()),
             listen: vec![],
-            #[cfg(feature = "experiment_api")]
-            api: crate::api::config::ApiConfig::default(),
             verbosity: Verbosity::Quiet,
             peers: vec![],
             config_file_path: PathBuf::new(),
@@ -303,7 +149,7 @@ impl Rosenpass {
     /// from chaotic args
     /// Quest: the grammar is undecideable, what do we do here?
     pub fn parse_args(args: Vec<String>) -> anyhow::Result<Self> {
-        let mut config = Self::new(Some(Keypair::new("", "")));
+        let mut config = Self::new("", "");
 
         #[derive(Debug, Hash, PartialEq, Eq)]
         enum State {
@@ -364,7 +210,7 @@ impl Rosenpass {
                         already_set.insert(OwnPublicKey),
                         "public-key was already set"
                     );
-                    config.keypair.as_mut().unwrap().public_key = pk.into();
+                    config.public_key = pk.into();
                     Own
                 }
                 (OwnSecretKey, sk, None) => {
@@ -372,7 +218,7 @@ impl Rosenpass {
                         already_set.insert(OwnSecretKey),
                         "secret-key was already set"
                     );
-                    config.keypair.as_mut().unwrap().secret_key = sk.into();
+                    config.secret_key = sk.into();
                     Own
                 }
                 (OwnListen, l, None) => {
@@ -507,12 +353,10 @@ impl Rosenpass {
         };
 
         Self {
-            keypair: Some(Keypair {
-                public_key: "/path/to/rp-public-key".into(),
-                secret_key: "/path/to/rp-secret-key".into(),
-            }),
+            public_key: "/path/to/rp-public-key".into(),
+            secret_key: "/path/to/rp-secret-key".into(),
             peers: vec![peer],
-            ..Self::new(None)
+            ..Self::new("", "")
         }
     }
 }
@@ -525,117 +369,12 @@ impl Default for Verbosity {
 
 #[cfg(test)]
 mod test {
+    use std::net::IpAddr;
 
     use super::*;
-    use std::{borrow::Borrow, net::IpAddr};
-
-    fn toml_des<S: Borrow<str>>(s: S) -> Result<toml::Table, toml::de::Error> {
-        toml::from_str(s.borrow())
-    }
-
-    fn toml_ser<S: Serialize>(s: S) -> Result<toml::Table, toml::ser::Error> {
-        toml::Table::try_from(s)
-    }
-
-    fn assert_toml<L: Serialize, R: Borrow<str>>(l: L, r: R, info: &str) -> anyhow::Result<()> {
-        fn lines_prepend(prefix: &str, s: &str) -> anyhow::Result<String> {
-            use std::fmt::Write;
-
-            let mut buf = String::new();
-            for line in s.lines() {
-                writeln!(&mut buf, "{prefix}{line}")?;
-            }
-            Ok(buf)
-        }
-
-        let l = toml_ser(l)?;
-        let r = toml_des(r.borrow())?;
-        ensure!(
-            l == r,
-            "{}{}TOML value mismatch.\n  Have:\n{}\n  Expected:\n{}",
-            info,
-            if info.is_empty() { "" } else { ": " },
-            lines_prepend("    ", &toml::to_string_pretty(&l)?)?,
-            lines_prepend("    ", &toml::to_string_pretty(&r)?)?
-        );
-        Ok(())
-    }
-
-    fn assert_toml_round<'de, L: Serialize + Deserialize<'de>, R: Borrow<str>>(
-        l: L,
-        r: R,
-    ) -> anyhow::Result<()> {
-        let l = toml_ser(l)?;
-        assert_toml(&l, r.borrow(), "Straight deserialization")?;
-
-        let l: L = l.try_into().unwrap();
-        let l = toml_ser(l).unwrap();
-        assert_toml(l, r.borrow(), "Roundtrip deserialization")?;
-
-        Ok(())
-    }
 
     fn split_str(s: &str) -> Vec<String> {
-        s.split(' ').map(|s| s.to_string()).collect()
-    }
-
-    #[test]
-    fn toml_serialization() -> anyhow::Result<()> {
-        #[cfg(feature = "experiment_api")]
-        assert_toml_round(
-            Rosenpass::empty(),
-            r#"
-            listen = []
-            verbosity = "Quiet"
-            peers = []
-
-            [api]
-            listen_path = []
-            listen_fd = []
-            stream_fd = []
-        "#,
-        )?;
-
-        #[cfg(not(feature = "experiment_api"))]
-        assert_toml_round(
-            Rosenpass::empty(),
-            r#"
-            listen = []
-            verbosity = "Quiet"
-            peers = []
-        "#,
-        )?;
-
-        #[cfg(feature = "experiment_api")]
-        assert_toml_round(
-            Rosenpass::from_sk_pk("/my/sk", "/my/pk"),
-            r#"
-            public_key = "/my/pk"
-            secret_key = "/my/sk"
-            listen = []
-            verbosity = "Quiet"
-            peers = []
-
-            [api]
-            listen_path = []
-            listen_fd = []
-            stream_fd = []
-        "#,
-        )?;
-
-        #[cfg(not(feature = "experiment_api"))]
-        assert_toml_round(
-            Rosenpass::from_sk_pk("/my/sk", "/my/pk"),
-            r#"
-            public_key = "/my/pk"
-            secret_key = "/my/sk"
-            listen = []
-            verbosity = "Quiet"
-            peers = []
-        "#,
-        )?;
-
-        Ok(())
+        s.split(" ").map(|s| s.to_string()).collect()
     }
 
     #[test]
@@ -648,10 +387,8 @@ mod test {
 
         let config = Rosenpass::parse_args(args).unwrap();
 
-        assert_eq!(
-            config.keypair,
-            Some(Keypair::new("/my/public-key", "/my/secret-key"))
-        );
+        assert_eq!(config.public_key, PathBuf::from("/my/public-key"));
+        assert_eq!(config.secret_key, PathBuf::from("/my/secret-key"));
         assert_eq!(config.verbosity, Verbosity::Verbose);
         assert_eq!(
             &config.listen,
@@ -680,10 +417,8 @@ mod test {
 
         let config = Rosenpass::parse_args(args).unwrap();
 
-        assert_eq!(
-            config.keypair,
-            Some(Keypair::new("/my/public-key", "/my/secret-key"))
-        );
+        assert_eq!(config.public_key, PathBuf::from("/my/public-key"));
+        assert_eq!(config.secret_key, PathBuf::from("/my/secret-key"));
         assert_eq!(config.verbosity, Verbosity::Verbose);
         assert!(&config.listen.is_empty());
         assert_eq!(
@@ -707,67 +442,3 @@ mod test {
         )
     }
 }
-
-pub mod util {
-    use std::path::PathBuf;
-    /// takes a path that can potentially start with a `~` and resolves that `~` to the user's home directory
-    ///
-    /// ## Example
-    /// ```
-    /// use rosenpass::config::util::resolve_path_with_tilde;
-    /// std::env::set_var("HOME","/home/dummy");
-    /// let mut path = std::path::PathBuf::from("~/foo.toml");
-    /// resolve_path_with_tilde(&mut path);
-    /// assert!(path == std::path::PathBuf::from("/home/dummy/foo.toml"));
-    /// ```
-    pub fn resolve_path_with_tilde(path: &mut PathBuf) {
-        if let Some(first_segment) = path.iter().next() {
-            if !path.has_root() && first_segment == "~" {
-                let home_dir = home::home_dir().unwrap_or_else(|| {
-                    log::error!("config file contains \"~\" but can not determine home diretory");
-                    std::process::exit(1);
-                });
-                let orig_path = path.clone();
-                path.clear();
-                path.push(home_dir);
-                for segment in orig_path.iter().skip(1) {
-                    path.push(segment);
-                }
-            }
-        }
-    }
-
-    #[cfg(test)]
-    mod test {
-        use super::*;
-        #[test]
-        fn test_resolve_path_with_tilde() {
-            let test = |path_str: &str, resolved: &str| {
-                let mut path = PathBuf::from(path_str);
-                resolve_path_with_tilde(&mut path);
-                assert!(
-                    path == PathBuf::from(resolved),
-                    "Path {:?} has been resolved to {:?} but should have been resolved to {:?}.",
-                    path_str,
-                    path,
-                    resolved
-                );
-            };
-            // set environment because otherwise the test result would depend on the system running this
-            std::env::set_var("USER", "dummy");
-            std::env::set_var("HOME", "/home/dummy");
-
-            // should resolve
-            test("~/foo.toml", "/home/dummy/foo.toml");
-            test("~//foo", "/home/dummy/foo");
-            test("~/../other_user/foo", "/home/dummy/../other_user/foo");
-
-            // should _not_ resolve
-            test("~foo/bar", "~foo/bar");
-            test(".~/foo", ".~/foo");
-            test("/~/foo.toml", "/~/foo.toml");
-            test(r"~\foo", r"~\foo");
-            test(r"C:\~\foo.toml", r"C:\~\foo.toml");
-        }
-    }
-}

rosenpass/src/hash_domains.rs

@@ -31,8 +31,6 @@ pub fn protocol() -> Result<HashDomain> {
 
 hash_domain_ns!(protocol, mac, "mac");
 hash_domain_ns!(protocol, cookie, "cookie");
-hash_domain_ns!(protocol, cookie_value, "cookie-value");
-hash_domain_ns!(protocol, cookie_key, "cookie-key");
 hash_domain_ns!(protocol, peerid, "peer id");
 hash_domain_ns!(protocol, biscuit_ad, "biscuit additional data");
 hash_domain_ns!(protocol, ckinit, "chaining key init");

rosenpass/src/lib.rs

@@ -1,5 +1,5 @@
-#[cfg(feature = "experiment_api")]
-pub mod api;
+use rosenpass_lenses::LenseError;
+
 pub mod app_server;
 pub mod cli;
 pub mod config;
@@ -13,8 +13,12 @@ pub enum RosenpassError {
     BufferSizeMismatch,
     #[error("invalid message type")]
     InvalidMessageType(u8),
-    #[error("invalid API message type")]
-    InvalidApiMessageType(u128),
-    #[error("could not parse API message")]
-    InvalidApiMessage,
+}
+
+impl From<LenseError> for RosenpassError {
+    fn from(value: LenseError) -> Self {
+        match value {
+            LenseError::BufferSizeMismatch => RosenpassError::BufferSizeMismatch,
+        }
+    }
 }

rosenpass/src/main.rs

@@ -1,44 +1,21 @@
-use clap::Parser;
 use log::error;
-use rosenpass::cli::CliArgs;
+use rosenpass::cli::Cli;
+use rosenpass_util::attempt;
 use std::process::exit;
 
 /// Catches errors, prints them through the logger, then exits
 pub fn main() {
-    // parse CLI arguments
-    let args = CliArgs::parse();
+    env_logger::init();
 
-    {
-        use rosenpass_secret_memory as SM;
-        #[cfg(feature = "experiment_memfd_secret")]
-        SM::secret_policy_try_use_memfd_secrets();
-        #[cfg(not(feature = "experiment_memfd_secret"))]
-        SM::secret_policy_use_only_malloc_secrets();
-    }
+    let res = attempt!({
+        rosenpass_sodium::init()?;
+        Cli::run()
+    });
 
-    // init logging
-    {
-        let mut log_builder = env_logger::Builder::from_default_env(); // sets log level filter from environment (or defaults)
-        if let Some(level) = args.get_log_level() {
-            log::debug!("setting log level to {:?} (set via CLI parameter)", level);
-            log_builder.filter_level(level); // set log level filter from CLI args if available
-        }
-        log_builder.init();
-
-        // // check the effectiveness of the log level filter with the following lines:
-        // use log::{debug, error, info, trace, warn};
-        // trace!("trace dummy");
-        // debug!("debug dummy");
-        // info!("info dummy");
-        // warn!("warn dummy");
-        // error!("error dummy");
-    }
-
-    let broker_interface = args.get_broker_interface();
-    match args.run(broker_interface, None) {
+    match res {
         Ok(_) => {}
         Err(e) => {
-            error!("{e:?}");
+            error!("{e}");
             exit(1);
         }
     }

rosenpass/src/msgs.rs

@@ -6,128 +6,129 @@
 //! always serialized instance of the data in question. This is closely related
 //! to the concept of lenses in function programming; more on that here:
 //! [https://sinusoid.es/misc/lager/lenses.pdf](https://sinusoid.es/misc/lager/lenses.pdf)
-//! To achieve this we utilize the zerocopy library.
 //!
-use std::mem::size_of;
-use zerocopy::{AsBytes, FromBytes, FromZeroes};
+//! # Example
+//!
+//! The following example uses the [`lense` macro](rosenpass_lenses::lense) to create a lense that
+//! might be useful when dealing with UDP headers.
+//!
+//! ```
+//! use rosenpass_lenses::{lense, LenseView};
+//! use rosenpass::RosenpassError;
+//! # fn main() -> Result<(), RosenpassError> {
+//!
+//! lense! {UdpDatagramHeader :=
+//!     source_port: 2,
+//!     dest_port: 2,
+//!     length: 2,
+//!     checksum: 2
+//! }
+//!
+//! let mut buf = [0u8; 8];
+//!
+//! // read-only lense, no check of size:
+//! let lense = UdpDatagramHeader(&buf);
+//! assert_eq!(lense.checksum(), &[0, 0]);
+//!
+//! // mutable lense, runtime check of size
+//! let mut lense = buf.as_mut().udp_datagram_header()?;
+//! lense.source_port_mut().copy_from_slice(&53u16.to_be_bytes()); // some DNS, anyone?
+//!
+//! // the original buffer is still available
+//! assert_eq!(buf, [0, 53, 0, 0, 0, 0, 0, 0]);
+//!
+//! // read-only lense, runtime check of size
+//! let lense = buf.as_ref().udp_datagram_header()?;
+//! assert_eq!(lense.source_port(), &[0, 53]);
+//! # Ok(())
+//! # }
+//! ```
 
 use super::RosenpassError;
 use rosenpass_cipher_traits::Kem;
 use rosenpass_ciphers::kem::{EphemeralKem, StaticKem};
 use rosenpass_ciphers::{aead, xaead, KEY_LEN};
-pub const MSG_SIZE_LEN: usize = 1;
-pub const RESERVED_LEN: usize = 3;
-pub const MAC_SIZE: usize = 16;
-pub const COOKIE_SIZE: usize = 16;
-pub const SID_LEN: usize = 4;
+use rosenpass_lenses::{lense, LenseView};
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct Envelope<M: AsBytes + FromBytes> {
+// Macro magic ////////////////////////////////////////////////////////////////
+
+lense! { Envelope<M> :=
     /// [MsgType] of this message
-    pub msg_type: u8,
+    msg_type: 1,
     /// Reserved for future use
-    pub reserved: [u8; 3],
+    reserved: 3,
     /// The actual Paylod
-    pub payload: M,
+    payload: M::LEN,
     /// Message Authentication Code (mac) over all bytes until (exclusive)
     /// `mac` itself
-    pub mac: [u8; 16],
+    mac: 16,
     /// Currently unused, TODO: do something with this
-    pub cookie: [u8; 16],
+    cookie: 16
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct InitHello {
+lense! { InitHello :=
     /// Randomly generated connection id
-    pub sidi: [u8; 4],
+    sidi: 4,
     /// Kyber 512 Ephemeral Public Key
-    pub epki: [u8; EphemeralKem::PK_LEN],
+    epki: EphemeralKem::PK_LEN,
     /// Classic McEliece Ciphertext
-    pub sctr: [u8; StaticKem::CT_LEN],
+    sctr: StaticKem::CT_LEN,
     /// Encryped: 16 byte hash of McEliece initiator static key
-    pub pidic: [u8; aead::TAG_LEN + 32],
+    pidic: aead::TAG_LEN + 32,
     /// Encrypted TAI64N Time Stamp (against replay attacks)
-    pub auth: [u8; aead::TAG_LEN],
+    auth: aead::TAG_LEN
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct RespHello {
+lense! { RespHello :=
     /// Randomly generated connection id
-    pub sidr: [u8; 4],
+    sidr: 4,
     /// Copied from InitHello
-    pub sidi: [u8; 4],
+    sidi: 4,
     /// Kyber 512 Ephemeral Ciphertext
-    pub ecti: [u8; EphemeralKem::CT_LEN],
+    ecti: EphemeralKem::CT_LEN,
     /// Classic McEliece Ciphertext
-    pub scti: [u8; StaticKem::CT_LEN],
+    scti: StaticKem::CT_LEN,
     /// Empty encrypted message (just an auth tag)
-    pub auth: [u8; aead::TAG_LEN],
+    auth: aead::TAG_LEN,
     /// Responders handshake state in encrypted form
-    pub biscuit: [u8; BISCUIT_CT_LEN],
+    biscuit: BISCUIT_CT_LEN
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct InitConf {
+lense! { InitConf :=
     /// Copied from InitHello
-    pub sidi: [u8; 4],
+    sidi: 4,
     /// Copied from RespHello
-    pub sidr: [u8; 4],
+    sidr: 4,
     /// Responders handshake state in encrypted form
-    pub biscuit: [u8; BISCUIT_CT_LEN],
+    biscuit: BISCUIT_CT_LEN,
     /// Empty encrypted message (just an auth tag)
-    pub auth: [u8; aead::TAG_LEN],
+    auth: aead::TAG_LEN
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct EmptyData {
+lense! { EmptyData :=
     /// Copied from RespHello
-    pub sid: [u8; 4],
+    sid: 4,
     /// Nonce
-    pub ctr: [u8; 8],
+    ctr: 8,
     /// Empty encrypted message (just an auth tag)
-    pub auth: [u8; aead::TAG_LEN],
+    auth: aead::TAG_LEN
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct Biscuit {
+lense! { Biscuit :=
     /// H(spki) – Ident ifies the initiator
-    pub pidi: [u8; KEY_LEN],
+    pidi: KEY_LEN,
     /// The biscuit number (replay protection)
-    pub biscuit_no: [u8; 12],
+    biscuit_no: 12,
     /// Chaining key
-    pub ck: [u8; KEY_LEN],
+    ck: KEY_LEN
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct DataMsg {
-    pub dummy: [u8; 4],
+lense! { DataMsg :=
+    dummy: 4
 }
 
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct CookieReplyInner {
-    /// [MsgType] of this message
-    pub msg_type: u8,
-    /// Reserved for future use
-    pub reserved: [u8; 3],
-    /// Session ID of the sender (initiator)
-    pub sid: [u8; 4],
-    /// Encrypted cookie with authenticated initiator `mac`
-    pub cookie_encrypted: [u8; xaead::NONCE_LEN + COOKIE_SIZE + xaead::TAG_LEN],
-}
-
-#[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes)]
-pub struct CookieReply {
-    pub inner: CookieReplyInner,
-    pub padding: [u8; size_of::<Envelope<InitHello>>() - size_of::<CookieReplyInner>()],
+lense! { CookieReply :=
+    dummy: 4
 }
 
 // Traits /////////////////////////////////////////////////////////////////////
@@ -176,14 +177,8 @@ impl TryFrom<u8> for MsgType {
     }
 }
 
-impl From<MsgType> for u8 {
-    fn from(val: MsgType) -> Self {
-        val as u8
-    }
-}
-
 /// length in bytes of an unencrypted Biscuit (plain text)
-pub const BISCUIT_PT_LEN: usize = size_of::<Biscuit>();
+pub const BISCUIT_PT_LEN: usize = Biscuit::<()>::LEN;
 
 /// Length in bytes of an encrypted Biscuit (cipher text)
 pub const BISCUIT_CT_LEN: usize = BISCUIT_PT_LEN + xaead::NONCE_LEN + xaead::TAG_LEN;

rosenpass/src/protocol/build_crypto_server.rs

@@ -1,127 +0,0 @@
-use rosenpass_util::{
-    build::Build,
-    mem::{DiscardResultExt, SwapWithDefaultExt},
-    result::ensure_or,
-};
-use thiserror::Error;
-
-use super::{CryptoServer, PeerPtr, SPk, SSk, SymKey};
-
-#[derive(Debug, Clone)]
-pub struct Keypair {
-    pub sk: SSk,
-    pub pk: SPk,
-}
-
-// TODO: We need a named tuple derive
-impl Keypair {
-    pub fn new(sk: SSk, pk: SPk) -> Self {
-        Self { sk, pk }
-    }
-
-    pub fn zero() -> Self {
-        Self::new(SSk::zero(), SPk::zero())
-    }
-
-    pub fn random() -> Self {
-        Self::new(SSk::random(), SPk::random())
-    }
-
-    pub fn from_parts(parts: (SSk, SPk)) -> Self {
-        Self::new(parts.0, parts.1)
-    }
-
-    pub fn into_parts(self) -> (SSk, SPk) {
-        (self.sk, self.pk)
-    }
-}
-
-#[derive(Error, Debug)]
-#[error("PSK already set in BuildCryptoServer")]
-pub struct PskAlreadySet;
-
-#[derive(Error, Debug)]
-#[error("Keypair already set in BuildCryptoServer")]
-pub struct KeypairAlreadySet;
-
-#[derive(Error, Debug)]
-#[error("Can not construct CryptoServer: Missing keypair")]
-pub struct MissingKeypair;
-
-#[derive(Debug, Default)]
-pub struct BuildCryptoServer {
-    pub keypair: Option<Keypair>,
-    pub peers: Vec<PeerParams>,
-}
-
-impl Build<CryptoServer> for BuildCryptoServer {
-    type Error = anyhow::Error;
-
-    fn build(self) -> Result<CryptoServer, Self::Error> {
-        let Some(Keypair { sk, pk }) = self.keypair else {
-            return Err(MissingKeypair)?;
-        };
-
-        let mut srv = CryptoServer::new(sk, pk);
-
-        for (idx, PeerParams { psk, pk }) in self.peers.into_iter().enumerate() {
-            let PeerPtr(idx2) = srv.add_peer(psk, pk)?;
-            assert!(idx == idx2, "Peer id changed during CryptoServer construction from {idx} to {idx2}. This is a developer error.")
-        }
-
-        Ok(srv)
-    }
-}
-
-#[derive(Debug)]
-pub struct PeerParams {
-    pub psk: Option<SymKey>,
-    pub pk: SPk,
-}
-
-impl BuildCryptoServer {
-    pub fn new(keypair: Option<Keypair>, peers: Vec<PeerParams>) -> Self {
-        Self { keypair, peers }
-    }
-
-    pub fn empty() -> Self {
-        Self::new(None, Vec::new())
-    }
-
-    pub fn from_parts(parts: (Option<Keypair>, Vec<PeerParams>)) -> Self {
-        Self {
-            keypair: parts.0,
-            peers: parts.1,
-        }
-    }
-
-    pub fn take_parts(&mut self) -> (Option<Keypair>, Vec<PeerParams>) {
-        (self.keypair.take(), self.peers.swap_with_default())
-    }
-
-    pub fn into_parts(mut self) -> (Option<Keypair>, Vec<PeerParams>) {
-        self.take_parts()
-    }
-
-    pub fn with_keypair(&mut self, keypair: Keypair) -> Result<&mut Self, KeypairAlreadySet> {
-        ensure_or(self.keypair.is_none(), KeypairAlreadySet)?;
-        self.keypair.insert(keypair).discard_result();
-        Ok(self)
-    }
-
-    pub fn with_added_peer(&mut self, psk: Option<SymKey>, pk: SPk) -> &mut Self {
-        // TODO: Check here already whether peer was already added
-        self.peers.push(PeerParams { psk, pk });
-        self
-    }
-
-    pub fn add_peer(&mut self, psk: Option<SymKey>, pk: SPk) -> PeerPtr {
-        let id = PeerPtr(self.peers.len());
-        self.with_added_peer(psk, pk);
-        id
-    }
-
-    pub fn emancipate(&mut self) -> Self {
-        Self::from_parts(self.take_parts())
-    }
-}