Merge branch 'main' into feat/improved-memfd-allocation

.ci/boot_race/a.toml

@@ -1,14 +0,0 @@
-public_key = "rp-a-public-key"
-secret_key = "rp-a-secret-key"
-listen = ["127.0.0.1:9999"]
-verbosity = "Verbose"
-
-[api]
-listen_path = []
-listen_fd = []
-stream_fd = []
-
-[[peers]]
-public_key = "rp-b-public-key"
-endpoint = "127.0.0.1:9998"
-key_out = "rp-b-key-out.txt"

.ci/boot_race/b.toml

@@ -1,14 +0,0 @@
-public_key = "rp-b-public-key"
-secret_key = "rp-b-secret-key"
-listen = ["127.0.0.1:9998"]
-verbosity = "Verbose"
-
-[api]
-listen_path = []
-listen_fd = []
-stream_fd = []
-
-[[peers]]
-public_key = "rp-a-public-key"
-endpoint = "127.0.0.1:9999"
-key_out = "rp-a-key-out.txt"

.ci/boot_race/run.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-iterations="$1"
-sleep_time="$2"
-config_a="$3"
-config_b="$4"
-
-PWD="$(pwd)"
-EXEC="$PWD/target/release/rosenpass"
-
-i=0
-while [ "$i" -ne "$iterations" ]; do
-	echo "=> Iteration $i"
-
-	# flush the PSK files
-	echo "A" >rp-a-key-out.txt
-	echo "B" >rp-b-key-out.txt
-
-	# start the two instances
-	echo "Starting instance A"
-	"$EXEC" exchange-config "$config_a" &
-	PID_A=$!
-	sleep "$sleep_time"
-	echo "Starting instance B"
-	"$EXEC" exchange-config "$config_b" &
-	PID_B=$!
-
-	# give the key exchange some time to complete
-	sleep 3
-
-	# kill the instances
-	kill $PID_A
-	kill $PID_B
-
-	# compare the keys
-	if cmp -s rp-a-key-out.txt rp-b-key-out.txt; then
-		echo "Keys match"
-	else
-		echo "::warning title=Key Exchange Race Condition::The key exchange resulted in different keys. Delay was ${sleep_time}s."
-		# TODO: set this to 1 when the race condition is fixed
-		exit 0
-	fi
-
-	# give the instances some time to shut down
-	sleep 2
-
-	i=$((i + 1))
-done

.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

.github/dependabot.yml

@@ -4,7 +4,3 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/doc-upload.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Clone rosenpass-website repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           repository: rosenpass/rosenpass-website
           ref: main

.github/workflows/nix.yaml

@@ -6,11 +6,6 @@ on:
   push:
     branches:
       - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   i686-linux---default:
     name: Build i686-linux.default
@@ -19,11 +14,11 @@ jobs:
     needs:
       - i686-linux---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -35,11 +30,11 @@ jobs:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -52,11 +47,11 @@ jobs:
     needs:
       - i686-linux---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -67,11 +62,11 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -84,11 +79,11 @@ jobs:
     needs:
       - x86_64-darwin---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -103,11 +98,11 @@ jobs:
       - x86_64-darwin---rp
       - x86_64-darwin---rosenpass-oci-image
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -119,11 +114,11 @@ jobs:
       - macos-13
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -135,11 +130,11 @@ jobs:
       - macos-13
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -152,11 +147,11 @@ jobs:
     needs:
       - x86_64-darwin---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -167,11 +162,11 @@ jobs:
     runs-on:
       - macos-13
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -184,11 +179,11 @@ jobs:
     needs:
       - x86_64-linux---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -201,11 +196,11 @@ jobs:
     needs:
       - x86_64-linux---proverif-patched
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -217,11 +212,11 @@ jobs:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -236,51 +231,51 @@ jobs:
       - x86_64-linux---rosenpass-static-oci-image
       - x86_64-linux---rp-static
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           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@v4
-  #     - uses: cachix/install-nix-action@v30
-  #       with:
-  #         nix_path: nixpkgs=channel:nixos-unstable
-  #         extra_nix_config: |
-  #           system = aarch64-linux
-  #     - uses: cachix/cachix-action@v15
-  #       with:
-  #         name: rosenpass
-  #         authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-  #     - name: Build
-  #       run: nix build .#packages.aarch64-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:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -295,13 +290,13 @@ jobs:
       - 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@v4
-      - uses: cachix/install-nix-action@v30
+      - 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@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -316,13 +311,13 @@ jobs:
       - 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@v4
-      - uses: cachix/install-nix-action@v30
+      - 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@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -335,11 +330,11 @@ jobs:
     needs:
       - x86_64-linux---rosenpass
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -355,13 +350,13 @@ jobs:
       - 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@v4
-      - uses: cachix/install-nix-action@v30
+      - 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@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -373,11 +368,11 @@ jobs:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -389,11 +384,11 @@ jobs:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -406,11 +401,11 @@ jobs:
     needs:
       - x86_64-linux---rosenpass-static
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -422,11 +417,11 @@ jobs:
       - ubuntu-latest
     needs: []
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -437,11 +432,11 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -452,11 +447,11 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/main' }}
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -465,7 +460,7 @@ jobs:
       - name: Build
         run: nix build .#packages.x86_64-linux.whitepaper --print-build-logs
       - name: Deploy PDF artifacts
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: result/

.github/workflows/qc.yaml

@@ -4,10 +4,6 @@ on:
   push:
     branches: [main]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 permissions:
   checks: write
   contents: read
@@ -16,8 +12,8 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actionsx/prettier@v3
+      - uses: actions/checkout@v3
+      - uses: actionsx/prettier@v2
         with:
           args: --check .
 
@@ -25,7 +21,7 @@ jobs:
     name: Shellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
 
@@ -33,15 +29,15 @@ jobs:
     name: Rust Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - 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@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -61,14 +57,16 @@ jobs:
     steps:
       - name: Install mandoc
         run: sudo apt-get install -y mandoc
-      - uses: actions/checkout@v4
+      - 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:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -76,8 +74,8 @@ jobs:
   cargo-clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -95,8 +93,8 @@ jobs:
   cargo-doc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -112,15 +110,10 @@ jobs:
       - 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@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -138,8 +131,8 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -148,10 +141,10 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v21
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -160,8 +153,8 @@ jobs:
   cargo-fuzz:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/bin/
@@ -193,20 +186,17 @@ jobs:
   codecov:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: rustup default nightly
+      - uses: actions/checkout@v3
       - run: rustup component add llvm-tools-preview
       - run: |
           cargo install cargo-llvm-cov || true
-          cargo install grcov || true
-          ./coverage_report.sh
+          cargo llvm-cov --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@v5
+        uses: codecov/codecov-action@v4.0.1
         with:
-          files: ./target/grcov/lcov
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./coverage.lcov
           verbose: true
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/regressions.yml

@@ -1,37 +0,0 @@
-name: Regressions
-on:
-  pull_request:
-  push:
-    branches: [main]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  checks: write
-  contents: read
-
-jobs:
-  multi-peer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - 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 ]
-
-  boot-race:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - run: cargo build --bin rosenpass --release
-      - run: chmod +x .ci/boot_race/run.sh
-      - run: cargo run --release --bin rosenpass gen-keys .ci/boot_race/a.toml
-      - run: cargo run --release --bin rosenpass gen-keys .ci/boot_race/b.toml
-      - run: .ci/boot_race/run.sh 5 2 .ci/boot_race/a.toml .ci/boot_race/b.toml
-      - run: .ci/boot_race/run.sh 5 1 .ci/boot_race/a.toml .ci/boot_race/b.toml
-      - run: .ci/boot_race/run.sh 5 0 .ci/boot_race/a.toml .ci/boot_race/b.toml

.github/workflows/release.yaml

@@ -11,18 +11,18 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build release
         run: nix build .#release-package --print-build-logs
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           draft: ${{ contains(github.ref_name, 'rc') }}
           prerelease: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') }}
@@ -32,18 +32,18 @@ jobs:
     runs-on:
       - macos-13
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build release
         run: nix build .#release-package --print-build-logs
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           draft: ${{ contains(github.ref_name, 'rc') }}
           prerelease: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') }}
@@ -53,18 +53,18 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v30
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v22
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v12
         with:
           name: rosenpass
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
       - name: Build release
         run: nix build .#release-package --print-build-logs
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           draft: ${{ contains(github.ref_name, 'rc') }}
           prerelease: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') }}

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

.prettierignore

@@ -1,5 +1,4 @@
 .direnv/
-flake.lock
 papers/whitepaper.md
-src/usage.md
 target/
+src/usage.md

CONTRIBUTING.md

@@ -1,41 +0,0 @@
-# Contributing to Rosenpass
-
-## Common operations
-
-### Apply code formatting
-
-Format rust code:
-
-```bash
-cargo fmt
-```
-
-Format rust code in markdown files:
-
-```bash
-./format_rust_code.sh --mode fix
-```
-
-### Spawn a development environment with nix
-
-```bash
-nix develop .#fullEnv
-```
-
-You need to [install this nix package manager](https://wiki.archlinux.org/title/Nix) first.
-
-### Run our test
-
-Make sure to increase the stack size available; some of our cryptography operations require a lot of stack memory.
-
-```bash
-RUST_MIN_STACK=8388608 cargo test --workspace --all-features
-```
-
-### Generate coverage reports
-
-Keep in mind that many of Rosenpass' tests are doctests, so to get an accurate read on our code coverage, you have to include doctests:
-
-```bash
-./coverage_report.sh
-```

Cargo.toml

@@ -32,28 +32,24 @@ rosenpass-secret-memory = { path = "secret-memory" }
 rosenpass-oqs = { path = "oqs" }
 rosenpass-wireguard-broker = { path = "wireguard-broker" }
 doc-comment = "0.3.3"
-base64ct = { version = "1.6.0", default-features = false }
+base64ct = {version = "1.6.0", default-features=false}
 zeroize = "1.8.1"
 memoffset = "0.9.1"
-thiserror = "1.0.69"
+thiserror = "1.0.61"
 paste = "1.0.15"
 env_logger = "0.10.2"
 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",
-] }
+memsec = { git="https://github.com/rosenpass/memsec.git" ,rev="aceb9baee8aec6844125bd6612f92e9a281373df", features = [ "alloc_ext", ] }
 rand = "0.8.5"
 typenum = "1.17.0"
-log = { version = "0.4.22" }
-clap = { version = "4.5.23", features = ["derive"] }
-clap_mangen = "0.2.24"
-clap_complete = "4.5.40"
-serde = { version = "1.0.216", features = ["derive"] }
-arbitrary = { version = "1.4.1", features = ["derive"] }
-anyhow = { version = "1.0.94", features = ["backtrace", "std"] }
-mio = { version = "1.0.3", features = ["net", "os-poll"] }
+log = { version = "0.4.21" }
+clap = { version = "4.5.7", features = ["derive"] }
+serde = { version = "1.0.203", features = ["derive"] }
+arbitrary = { version = "1.3.2", features = ["derive"] }
+anyhow = { version = "1.0.86", features = ["backtrace", "std"] }
+mio = { version = "0.8.11", features = ["net", "os-poll"] }
 oqs-sys = { version = "0.9.1", default-features = false, features = [
     'classic_mceliece',
     'kyber',
@@ -63,31 +59,24 @@ chacha20poly1305 = { version = "0.10.1", default-features = false, features = [
     "std",
     "heapless",
 ] }
-zerocopy = { version = "0.7.35", features = ["derive"] }
+zerocopy = { version = "0.7.34", features = ["derive"] }
 home = "0.5.9"
-derive_builder = "0.20.1"
-tokio = { version = "1.42", features = ["macros", "rt-multi-thread"] }
-postcard = { version = "1.1.1", 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" }
-signal-hook = "0.3.17"
+derive_builder = "0.20.0"
+tokio = { version = "1.38", features = ["macros", "rt-multi-thread"] }
+postcard= {version = "1.0.8", features = ["alloc"]}
 
 #Dev dependencies
-serial_test = "3.2.0"
+serial_test = "3.1.1"
 tempfile = "3"
-stacker = "0.1.17"
+stacker = "0.1.15"
 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"] }
+procspawn = {version = "1.0.0", features= ["test-support"]}
 
 
 #Broker dependencies (might need cleanup or changes)
-wireguard-uapi = { version = "3.0.0", features = ["xplatform"] }
+wireguard-uapi = "3.0.0"
 command-fds = "0.2.3"
-rustix = { version = "0.38.42", features = ["net", "fs", "process"] }
+rustix = { version = "0.38.27", features = ["net"] }

cipher-traits/Cargo.toml

@@ -10,8 +10,3 @@ repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
 [dependencies]
-
-[dev-dependencies]
-rosenpass-oqs = { workspace = true }
-rosenpass-secret-memory = { workspace = true }
-anyhow = {workspace = true}

cipher-traits/readme.md

@@ -2,4 +2,4 @@
 
 Rosenpass internal library providing traits for cryptographic primitives.
 
-This is an internal library; no guarantee is made about its API at this point in time.
+This is an internal library; not guarantee is made about its API at this point in time.

cipher-traits/src/kem.rs

@@ -5,128 +5,12 @@
 //!
 //! Conceptually KEMs are akin to public-key encryption, but instead of encrypting
 //! arbitrary data, KEMs are limited to the transmission of keys, randomly chosen during
+//!
 //! encapsulation.
-//!
-//! The [Kem] Trait describes the basic API offered by a Key Encapsulation
-//! Mechanism. Two implementations for it are provided:
-//! [Kyber512](../../rosenpass_oqs/kyber_512/enum.Kyber512.html) and
-//! [ClassicMceliece460896](../../rosenpass_oqs/classic_mceliece_460896/enum.ClassicMceliece460896.html).
-//!
-//! An example where Alice generates a keypair and gives her public key to Bob, for Bob to
-//! encapsulate a symmetric key and Alice to decapsulate it would look as follows.
-//! In the example, we are using Kyber512, but any KEM that correctly implements the [Kem]
-//! trait could be used as well.
-//!```rust
-//! use rosenpass_cipher_traits::Kem;
-//! use rosenpass_oqs::Kyber512;
-//! # use rosenpass_secret_memory::{secret_policy_use_only_malloc_secrets, Secret};
-//!
-//! type MyKem = Kyber512;
-//! secret_policy_use_only_malloc_secrets();
-//! let mut alice_sk: Secret<{ MyKem::SK_LEN }> = Secret::zero();
-//! let mut alice_pk: [u8; MyKem::PK_LEN] = [0; MyKem::PK_LEN];
-//! MyKem::keygen(alice_sk.secret_mut(), &mut alice_pk)?;
-//!
-//! let mut bob_shk: Secret<{ MyKem::SHK_LEN }> = Secret::zero();
-//! let mut bob_ct: [u8; MyKem::CT_LEN] = [0; MyKem::CT_LEN];
-//! MyKem::encaps(bob_shk.secret_mut(), &mut bob_ct, &mut alice_pk)?;
-//!
-//! let mut alice_shk: Secret<{ MyKem::SHK_LEN }> = Secret::zero();
-//! MyKem::decaps(alice_shk.secret_mut(), alice_sk.secret_mut(), &mut bob_ct)?;
-//!
-//! # assert_eq!(alice_shk.secret(), bob_shk.secret());
-//! # Ok::<(), anyhow::Error>(())
-//!```
-//!
-//! Implementing the [Kem]-trait for a KEM is easy. Mostly, you must format the KEM's
-//! keys, and ciphertext as `u8` slices. Below, we provide an example for how the trait can
-//! be implemented using a **HORRIBLY INSECURE** DummyKem that only uses static values for keys
-//! and ciphertexts as an example.  
-//!```rust
-//!# use rosenpass_cipher_traits::Kem;
-//!
-//! struct DummyKem {}
-//! impl Kem for DummyKem {
-//!
-//!     // For this DummyKem, using String for errors is sufficient.
-//!     type Error = String;
-//!
-//!     // For this DummyKem, we will use a single `u8` for everything
-//!     const SK_LEN: usize = 1;
-//!     const PK_LEN: usize = 1;
-//!     const CT_LEN: usize = 1;
-//!     const SHK_LEN: usize = 1;
-//!
-//!     fn keygen(sk: &mut [u8], pk: &mut [u8]) -> Result<(), Self::Error> {
-//!         if sk.len() != Self::SK_LEN {
-//!             return Err("sk does not have the correct length!".to_string());
-//!         }
-//!         if pk.len() != Self::PK_LEN {
-//!             return Err("pk does not have the correct length!".to_string());
-//!         }
-//!         sk[0] = 42;
-//!         pk[0] = 21;
-//!         Ok(())
-//!     }
-//!
-//!     fn encaps(shk: &mut [u8], ct: &mut [u8], pk: &[u8]) -> Result<(), Self::Error> {
-//!         if pk.len() != Self::PK_LEN {
-//!             return Err("pk does not have the correct length!".to_string());
-//!         }
-//!         if ct.len() != Self::CT_LEN {
-//!             return Err("ct does not have the correct length!".to_string());
-//!         }
-//!         if shk.len() != Self::SHK_LEN {
-//!             return Err("shk does not have the correct length!".to_string());
-//!         }
-//!         if pk[0] != 21 {
-//!             return Err("Invalid public key!".to_string());
-//!         }
-//!         ct[0] = 7;
-//!         shk[0] = 17;
-//!         Ok(())
-//!     }
-//!
-//!     fn decaps(shk: &mut [u8], sk: &[u8], ct: &[u8]) -> Result<(), Self::Error> {
-//!         if sk.len() != Self::SK_LEN {
-//!             return Err("sk does not have the correct length!".to_string());
-//!         }
-//!         if ct.len() != Self::CT_LEN {
-//!             return Err("ct does not have the correct length!".to_string());
-//!         }
-//!         if shk.len() != Self::SHK_LEN {
-//!             return Err("shk does not have the correct length!".to_string());
-//!         }
-//!         if sk[0] != 42 {
-//!             return Err("Invalid public key!".to_string());
-//!         }
-//!         if ct[0] != 7 {
-//!             return Err("Invalid ciphertext!".to_string());
-//!         }
-//!         shk[0] = 17;
-//!         Ok(())
-//!     }
-//! }
-//! # use rosenpass_secret_memory::{secret_policy_use_only_malloc_secrets, Secret};
-//! #
-//! # type MyKem = DummyKem;
-//! # secret_policy_use_only_malloc_secrets();
-//! # let mut alice_sk: Secret<{ MyKem::SK_LEN }> = Secret::zero();
-//! # let mut alice_pk: [u8; MyKem::PK_LEN] = [0; MyKem::PK_LEN];
-//! # MyKem::keygen(alice_sk.secret_mut(), &mut alice_pk)?;
-//!
-//! # let mut bob_shk: Secret<{ MyKem::SHK_LEN }> = Secret::zero();
-//! # let mut bob_ct: [u8; MyKem::CT_LEN] = [0; MyKem::CT_LEN];
-//! # MyKem::encaps(bob_shk.secret_mut(), &mut bob_ct, &mut alice_pk)?;
-//! #
-//! # let mut alice_shk: Secret<{ MyKem::SHK_LEN }> = Secret::zero();
-//! # MyKem::decaps(alice_shk.secret_mut(), alice_sk.secret_mut(), &mut bob_ct)?;
-//! #
-//! # assert_eq!(alice_shk.secret(), bob_shk.secret());
-//! #
-//! # Ok::<(), String>(())
-//!```
-//!
+//! 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
 ///

ciphers/Cargo.toml

@@ -9,9 +9,6 @@ homepage = "https://rosenpass.eu/"
 repository = "https://github.com/rosenpass/rosenpass"
 readme = "readme.md"
 
-[features]
-experiment_libcrux = ["dep:libcrux"]
-
 [dependencies]
 anyhow = { workspace = true }
 rosenpass-to = { workspace = true }
@@ -23,4 +20,3 @@ static_assertions = { workspace = true }
 zeroize = { workspace = true }
 chacha20poly1305 = { workspace = true }
 blake2 = { workspace = true }
-libcrux = { workspace = true, optional = true }

ciphers/src/hash_domain.rs

@@ -2,192 +2,100 @@ use anyhow::Result;
 use rosenpass_secret_memory::Secret;
 use rosenpass_to::To;
 
-use crate::keyed_hash as hash;
+use crate::subtle::incorrect_hmac_blake2b as hash;
 
 pub use hash::KEY_LEN;
 
-///
-///```rust
-/// # use rosenpass_ciphers::hash_domain::{HashDomain, HashDomainNamespace, SecretHashDomain, SecretHashDomainNamespace};
-/// use rosenpass_secret_memory::Secret;
-/// # rosenpass_secret_memory::secret_policy_use_only_malloc_secrets();
-///
-/// const PROTOCOL_IDENTIFIER: &str = "MY_PROTOCOL:IDENTIFIER";
-/// // create use once hash domain for the protocol identifier
-/// let mut hash_domain = HashDomain::zero();
-/// hash_domain = hash_domain.mix(PROTOCOL_IDENTIFIER.as_bytes())?;
-/// // upgrade to reusable hash domain
-/// let hash_domain_namespace: HashDomainNamespace = hash_domain.dup();
-/// // derive new key
-/// let key_identifier = "my_key_identifier";
-/// let key = hash_domain_namespace.mix(key_identifier.as_bytes())?.into_value();
-/// // derive a new key based on a secret
-/// const MY_SECRET_LEN: usize = 21;
-/// let my_secret_bytes = "my super duper secret".as_bytes();
-/// let my_secret: Secret<21> = Secret::from_slice("my super duper secret".as_bytes());
-/// let secret_hash_domain: SecretHashDomain = hash_domain_namespace.mix_secret(my_secret)?;
-/// // derive a new key based on the secret key
-/// let new_key_identifier = "my_new_key_identifier".as_bytes();
-/// let new_key = secret_hash_domain.mix(new_key_identifier)?.into_secret();
-///
-/// # Ok::<(), anyhow::Error>(())
-///```
-///
-
 // TODO Use a proper Dec interface
-/// A use-once hash domain for a specified key that can be used directly.
-/// The key must consist of [KEY_LEN] many bytes. If the key must remain secret,
-/// use [SecretHashDomain] instead.
 #[derive(Clone, Debug)]
 pub struct HashDomain([u8; KEY_LEN]);
-/// A reusable hash domain for a namespace identified by the key.
-/// The key must consist of [KEY_LEN] many bytes. If the key must remain secret,
-/// use [SecretHashDomainNamespace] instead.
 #[derive(Clone, Debug)]
 pub struct HashDomainNamespace([u8; KEY_LEN]);
-/// A use-once hash domain for a specified key that can be used directly
-/// by wrapping it in [Secret]. The key must consist of [KEY_LEN] many bytes.
 #[derive(Clone, Debug)]
 pub struct SecretHashDomain(Secret<KEY_LEN>);
-/// A reusable secure hash domain for a namespace identified by the key and that keeps the key secure
-/// by wrapping it in [Secret]. The key must consist of [KEY_LEN] many bytes.
 #[derive(Clone, Debug)]
 pub struct SecretHashDomainNamespace(Secret<KEY_LEN>);
 
 impl HashDomain {
-    /// Creates a nw [HashDomain] initialized with a all-zeros key.
     pub fn zero() -> Self {
         Self([0u8; KEY_LEN])
     }
 
-    /// Turns this [HashDomain] into a [HashDomainNamespace], keeping the key.
     pub fn dup(self) -> HashDomainNamespace {
         HashDomainNamespace(self.0)
     }
 
-    /// Turns this [HashDomain] into a [SecretHashDomain] by wrapping the key into a [Secret]
-    /// and creating a new [SecretHashDomain] from it.
     pub fn turn_secret(self) -> SecretHashDomain {
         SecretHashDomain(Secret::from_slice(&self.0))
     }
 
     // TODO: Protocol! Use domain separation to ensure that
-    /// Creates a new [HashDomain] by mixing in a new key `v`. Specifically,
-    /// it evaluates [hash::hash] with this HashDomain's key as the key and `v`
-    /// as the `data` and uses the result as the key for the new [HashDomain].
-    ///
     pub fn mix(self, v: &[u8]) -> Result<Self> {
         Ok(Self(hash::hash(&self.0, v).collect::<[u8; KEY_LEN]>()?))
     }
 
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`
-    /// by calling [SecretHashDomain::invoke_primitive] with this
-    /// [HashDomain]'s key as `k` and `v` as `d`.
     pub fn mix_secret<const N: usize>(self, v: Secret<N>) -> Result<SecretHashDomain> {
         SecretHashDomain::invoke_primitive(&self.0, v.secret())
     }
 
-    /// Gets the key of this [HashDomain].
     pub fn into_value(self) -> [u8; KEY_LEN] {
         self.0
     }
 }
 
 impl HashDomainNamespace {
-    /// Creates a new [HashDomain] by mixing in a new key `v`. Specifically,
-    /// it evaluates [hash::hash] with the key of this HashDomainNamespace key as the key and `v`
-    /// as the `data` and uses the result as the key for the new [HashDomain].
     pub fn mix(&self, v: &[u8]) -> Result<HashDomain> {
         Ok(HashDomain(
             hash::hash(&self.0, v).collect::<[u8; KEY_LEN]>()?,
         ))
     }
 
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`
-    /// by calling [SecretHashDomain::invoke_primitive] with the key of this
-    /// [HashDomainNamespace] as `k` and `v` as `d`.
-    ///
-    /// It requires that `v` consists of exactly [KEY_LEN] many bytes.
     pub fn mix_secret<const N: usize>(&self, v: Secret<N>) -> Result<SecretHashDomain> {
         SecretHashDomain::invoke_primitive(&self.0, v.secret())
     }
 }
 
 impl SecretHashDomain {
-    /// Create a new [SecretHashDomain] with the given key `k` and data `d` by calling
-    /// [hash::hash] with `k` as the `key` and `d` s the `data`, and using the result
-    /// as the content for the new [SecretHashDomain].
-    /// Both `k` and `d` have to be exactly [KEY_LEN] bytes in length.
     pub fn invoke_primitive(k: &[u8], d: &[u8]) -> Result<SecretHashDomain> {
         let mut r = SecretHashDomain(Secret::zero());
         hash::hash(k, d).to(r.0.secret_mut())?;
         Ok(r)
     }
 
-    /// Creates a new [SecretHashDomain] that is initialized with an all zeros key.
     pub fn zero() -> Self {
         Self(Secret::zero())
     }
 
-    /// Turns this [SecretHashDomain] into a [SecretHashDomainNamespace].
     pub fn dup(self) -> SecretHashDomainNamespace {
         SecretHashDomainNamespace(self.0)
     }
 
-    /// Creates a new [SecretHashDomain] from a [Secret] `k`.
-    ///
-    /// It requires that `k` consist of exactly [KEY_LEN] bytes.
     pub fn danger_from_secret(k: Secret<KEY_LEN>) -> Self {
         Self(k)
     }
 
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`. Specifically,
-    /// it evaluates [hash::hash] with this [SecretHashDomain]'s key as the key and `v`
-    /// as the `data` and uses the result as the key for the new [SecretHashDomain].
-    ///
-    /// It requires that `v` consists of exactly [KEY_LEN] many bytes.
     pub fn mix(self, v: &[u8]) -> Result<SecretHashDomain> {
         Self::invoke_primitive(self.0.secret(), v)
     }
 
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`
-    /// by calling [SecretHashDomain::invoke_primitive] with the key of this
-    /// [HashDomainNamespace] as `k` and `v` as `d`.
-    ///
-    /// It requires that `v` consists of exactly [KEY_LEN] many bytes.
     pub fn mix_secret<const N: usize>(self, v: Secret<N>) -> Result<SecretHashDomain> {
         Self::invoke_primitive(self.0.secret(), v.secret())
     }
 
-    /// Get the secret key data from this [SecretHashDomain].
     pub fn into_secret(self) -> Secret<KEY_LEN> {
         self.0
     }
 
-    /// Evaluate [hash::hash] with this [SecretHashDomain]'s data as the `key` and
-    /// `dst` as the `data` and stores the result as the new data for this [SecretHashDomain].
-    ///
-    /// It requires that both `v` and `d` consist of exactly [KEY_LEN] many bytes.
     pub fn into_secret_slice(mut self, v: &[u8], dst: &[u8]) -> Result<()> {
         hash::hash(v, dst).to(self.0.secret_mut())
     }
 }
 
 impl SecretHashDomainNamespace {
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`. Specifically,
-    /// it evaluates [hash::hash] with the key of this HashDomainNamespace key as the key and `v`
-    /// as the `data` and uses the result as the key for the new [HashDomain].
-    ///
-    /// It requires that `v` consists of exactly [KEY_LEN] many bytes.
     pub fn mix(&self, v: &[u8]) -> Result<SecretHashDomain> {
         SecretHashDomain::invoke_primitive(self.0.secret(), v)
     }
 
-    /// Creates a new [SecretHashDomain] by mixing in a new key `v`
-    /// by calling [SecretHashDomain::invoke_primitive] with the key of this
-    /// [HashDomainNamespace] as `k` and `v` as `d`.
-    ///
-    /// It requires that `v` consists of exactly [KEY_LEN] many bytes.
     pub fn mix_secret<const N: usize>(&self, v: Secret<N>) -> Result<SecretHashDomain> {
         SecretHashDomain::invoke_primitive(self.0.secret(), v.secret())
     }
@@ -195,7 +103,6 @@ impl SecretHashDomainNamespace {
     // TODO: This entire API is not very nice; we need this for biscuits, but
     // it might be better to extract a special "biscuit"
     // labeled subkey and reinitialize the chain with this
-    /// Get the secret key data from this [SecretHashDomain].
     pub fn danger_into_secret(self) -> Secret<KEY_LEN> {
         self.0
     }

ciphers/src/lib.rs

@@ -2,36 +2,17 @@ use static_assertions::const_assert;
 
 pub mod subtle;
 
-/// All keyed primitives in this crate use 32 byte keys
 pub const KEY_LEN: usize = 32;
 const_assert!(KEY_LEN == aead::KEY_LEN);
 const_assert!(KEY_LEN == xaead::KEY_LEN);
 const_assert!(KEY_LEN == hash_domain::KEY_LEN);
 
-/// Keyed hashing
-///
-/// This should only be used for implementation details; anything with relevance
-/// to the cryptographic protocol should use the facilities in [hash_domain], (though
-/// hash domain uses this module internally)
-pub mod keyed_hash {
-    pub use crate::subtle::incorrect_hmac_blake2b::{
-        hash, KEY_LEN, KEY_MAX, KEY_MIN, OUT_MAX, OUT_MIN,
-    };
-}
-
 /// Authenticated encryption with associated data
-/// Chacha20poly1305 is used.
 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::{
-        decrypt, encrypt, KEY_LEN, NONCE_LEN, TAG_LEN,
-    };
 }
 
 /// Authenticated encryption with associated data with a constant nonce
-/// XChacha20poly1305 is used.
 pub mod xaead {
     pub use crate::subtle::xchacha20poly1305_ietf::{
         decrypt, encrypt, KEY_LEN, NONCE_LEN, TAG_LEN,
@@ -40,13 +21,6 @@ pub mod xaead {
 
 pub mod hash_domain;
 
-/// This crate includes two key encapsulation mechanisms.
-/// Namely ClassicMceliece460896 (also referred to as `StaticKem` sometimes) and
-/// Kyber512 (also referred to as  `EphemeralKem` sometimes).
-///
-/// See [rosenpass_oqs::ClassicMceliece460896]
-/// and [rosenpass_oqs::Kyber512] for more details on the specific KEMS.
-///
 pub mod kem {
     pub use rosenpass_oqs::ClassicMceliece460896 as StaticKem;
     pub use rosenpass_oqs::Kyber512 as EphemeralKem;

ciphers/src/subtle/blake2b.rs

@@ -9,43 +9,19 @@ use blake2::Blake2bMac;
 use rosenpass_to::{ops::copy_slice, with_destination, To};
 use rosenpass_util::typenum2const;
 
-/// Specify that the used implementation of BLAKE2b is the MAC version of BLAKE2b
-/// with output and key length of 32 bytes (see [Blake2bMac]).
 type Impl = Blake2bMac<U32>;
 
 type KeyLen = <Impl as KeySizeUser>::KeySize;
 type OutLen = <Impl as OutputSizeUser>::OutputSize;
 
-/// The key length for BLAKE2b supported by this API. Currently 32 Bytes.
 const KEY_LEN: usize = typenum2const! { KeyLen };
-/// The output length for BLAKE2b supported by this API. Currently 32 Bytes.
 const OUT_LEN: usize = typenum2const! { OutLen };
 
-/// Minimal key length supported by this API.
 pub const KEY_MIN: usize = KEY_LEN;
-/// maximal key length supported by this API.
 pub const KEY_MAX: usize = KEY_LEN;
-/// minimal output length supported by this API.
 pub const OUT_MIN: usize = OUT_LEN;
-/// maximal output length supported by this API.
 pub const OUT_MAX: usize = OUT_LEN;
 
-/// Hashes the given `data` with the [Blake2bMac] hash function under the given `key`.
-/// The both the length of the output the length of the key 32 bytes (or 256 bits).  
-///
-/// # Examples
-///
-///```rust
-/// # use rosenpass_ciphers::subtle::blake2b::hash;
-/// use rosenpass_to::To;
-/// let zero_key: [u8; 32] = [0; 32];
-/// let data: [u8; 32] = [255; 32];
-/// // buffer for the hash output
-/// let mut hash_data: [u8; 32] = [0u8; 32];  
-///
-/// assert!(hash(&zero_key, &data).to(&mut hash_data).is_ok(), "Hashing has to return OK result");
-///```
-///
 #[inline]
 pub fn hash<'a>(key: &'a [u8], data: &'a [u8]) -> impl To<[u8], anyhow::Result<()>> + 'a {
     with_destination(|out: &mut [u8]| {
@@ -60,6 +36,7 @@ pub fn hash<'a>(key: &'a [u8], data: &'a [u8]) -> impl To<[u8], anyhow::Result<(
         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

@@ -6,39 +6,10 @@ use chacha20poly1305::aead::generic_array::GenericArray;
 use chacha20poly1305::ChaCha20Poly1305 as AeadImpl;
 use chacha20poly1305::{AeadCore, AeadInPlace, KeyInit, KeySizeUser};
 
-/// The key length is 32 bytes or 256 bits.
 pub const KEY_LEN: usize = typenum2const! { <AeadImpl as KeySizeUser>::KeySize };
-/// The  MAC tag length is 16 bytes or 128 bits.
 pub const TAG_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::TagSize };
-/// The nonce length is 12 bytes or 96 bits.
 pub const NONCE_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::NonceSize };
 
-/// Encrypts using ChaCha20Poly1305 as implemented in [RustCrypto](https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305).
-/// `key` MUST be chosen (pseudo-)randomly and `nonce` MOST NOT be reused. The `key` slice MUST have
-/// a length of [KEY_LEN]. The `nonce` slice MUST have a length of [NONCE_LEN]. The last [TAG_LEN] bytes
-/// written in `ciphertext` are the tag guaranteeing integrity. `ciphertext` MUST have a capacity of
-/// `plaintext.len()` + [TAG_LEN].
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::chacha20poly1305_ietf::{encrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-///
-/// const PLAINTEXT_LEN: usize = 43;
-/// let plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(PLAINTEXT_LEN, plaintext.len());
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut ciphertext_buffer = [0u8;PLAINTEXT_LEN + TAG_LEN];
-///
-/// let res: anyhow::Result<()> = encrypt(&mut ciphertext_buffer, key, nonce, additional_data, plaintext);
-/// assert!(res.is_ok());
-/// # let expected_ciphertext: &[u8] = &[239, 104, 148, 202, 120, 32, 77, 27, 246, 206, 226, 17,
-/// # 83, 78, 122, 116, 187, 123, 70, 199, 58, 130, 21, 1, 107, 230, 58, 77, 18, 152, 31, 159, 80,
-/// # 151, 72, 27, 236, 137, 60, 55, 180, 31, 71, 97, 199, 12, 60, 155, 70, 221, 225, 110, 132, 191,
-/// # 8, 114, 85, 4, 25];
-/// # assert_eq!(expected_ciphertext, &ciphertext_buffer);
-///```
 #[inline]
 pub fn encrypt(
     ciphertext: &mut [u8],
@@ -55,33 +26,6 @@ pub fn encrypt(
     Ok(())
 }
 
-/// Decrypts a `ciphertext` and verifies the integrity of the `ciphertext` and the additional data
-/// `ad`. using ChaCha20Poly1305 as implemented in [RustCrypto](https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305).
-///
-/// The `key` slice MUST have a length of [KEY_LEN]. The `nonce` slice MUST have a length of
-/// [NONCE_LEN]. The plaintext buffer must have a capacity of `ciphertext.len()` - [TAG_LEN].
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::chacha20poly1305_ietf::{decrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-/// let ciphertext: &[u8] = &[239, 104, 148, 202, 120, 32, 77, 27, 246, 206, 226, 17,
-/// 83, 78, 122, 116, 187, 123, 70, 199, 58, 130, 21, 1, 107, 230, 58, 77, 18, 152, 31, 159, 80,
-/// 151, 72, 27, 236, 137, 60, 55, 180, 31, 71, 97, 199, 12, 60, 155, 70, 221, 225, 110, 132, 191,
-/// 8, 114, 85, 4, 25]; // this is the ciphertext generated by the example for the encryption
-/// const PLAINTEXT_LEN: usize = 43;
-/// assert_eq!(PLAINTEXT_LEN + TAG_LEN, ciphertext.len());
-///
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut plaintext_buffer = [0u8; PLAINTEXT_LEN];
-///
-/// let res: anyhow::Result<()> = decrypt(&mut plaintext_buffer, key, nonce, additional_data, ciphertext);
-/// assert!(res.is_ok());
-/// let expected_plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(expected_plaintext, plaintext_buffer);
-///
-///```
 #[inline]
 pub fn decrypt(
     plaintext: &mut [u8],

ciphers/src/subtle/chacha20poly1305_ietf_libcrux.rs

@@ -1,117 +0,0 @@
-use rosenpass_to::ops::copy_slice;
-use rosenpass_to::To;
-
-use zeroize::Zeroize;
-
-/// The key length is 32 bytes or 256 bits.
-pub const KEY_LEN: usize = 32; // Grrrr! Libcrux, please provide me these constants.
-/// The  MAC tag length is 16 bytes or 128 bits.
-pub const TAG_LEN: usize = 16;
-/// The nonce length is 12 bytes or 96 bits.
-pub const NONCE_LEN: usize = 12;
-
-/// Encrypts using ChaCha20Poly1305 as implemented in [libcrux](https://github.com/cryspen/libcrux).
-/// Key and nonce MUST be chosen (pseudo-)randomly. The `key` slice MUST have a length of
-/// [KEY_LEN]. The `nonce` slice MUST have a length of [NONCE_LEN]. The last [TAG_LEN] bytes
-/// written in `ciphertext` are the tag guaranteeing integrity. `ciphertext` MUST have a capacity of
-/// `plaintext.len()` + [TAG_LEN].
-///  
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::chacha20poly1305_ietf_libcrux::{encrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-///
-/// const PLAINTEXT_LEN: usize = 43;
-/// let plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(PLAINTEXT_LEN, plaintext.len());
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut ciphertext_buffer = [0u8; PLAINTEXT_LEN + TAG_LEN];
-///
-/// let res: anyhow::Result<()> = encrypt(&mut ciphertext_buffer, key, nonce, additional_data, plaintext);
-/// assert!(res.is_ok());
-/// # let expected_ciphertext: &[u8] = &[239, 104, 148, 202, 120, 32, 77, 27, 246, 206, 226, 17,
-/// # 83, 78, 122, 116, 187, 123, 70, 199, 58, 130, 21, 1, 107, 230, 58, 77, 18, 152, 31, 159, 80,
-/// # 151, 72, 27, 236, 137, 60, 55, 180, 31, 71, 97, 199, 12, 60, 155, 70, 221, 225, 110, 132, 191,
-/// # 8, 114, 85, 4, 25];
-/// # assert_eq!(expected_ciphertext, &ciphertext_buffer);
-///```
-///
-#[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(())
-}
-
-/// Decrypts a `ciphertext` and verifies the integrity of the `ciphertext` and the additional data
-/// `ad`. using ChaCha20Poly1305 as implemented in [libcrux](https://github.com/cryspen/libcrux).
-///
-/// The `key` slice MUST have a length of [KEY_LEN]. The `nonce` slice MUST have a length of
-/// [NONCE_LEN]. The plaintext buffer must have a capacity of `ciphertext.len()` - [TAG_LEN].
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::chacha20poly1305_ietf_libcrux::{decrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-/// let ciphertext: &[u8] = &[239, 104, 148, 202, 120, 32, 77, 27, 246, 206, 226, 17,
-/// 83, 78, 122, 116, 187, 123, 70, 199, 58, 130, 21, 1, 107, 230, 58, 77, 18, 152, 31, 159, 80,
-/// 151, 72, 27, 236, 137, 60, 55, 180, 31, 71, 97, 199, 12, 60, 155, 70, 221, 225, 110, 132, 191,
-/// 8, 114, 85, 4, 25]; // this is the ciphertext generated by the example for the encryption
-/// const PLAINTEXT_LEN: usize = 43;
-/// assert_eq!(PLAINTEXT_LEN + TAG_LEN, ciphertext.len());
-///
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut plaintext_buffer = [0u8; PLAINTEXT_LEN];
-///
-/// let res: anyhow::Result<()> = decrypt(&mut plaintext_buffer, key, nonce, additional_data, ciphertext);
-/// assert!(res.is_ok());
-/// let expected_plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(expected_plaintext, plaintext_buffer);
-///
-///```
-#[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

@@ -6,15 +6,10 @@ use rosenpass_to::{ops::copy_slice, with_destination, To};
 
 use crate::subtle::blake2b;
 
-/// The key length, 32 bytes or 256 bits.
 pub const KEY_LEN: usize = 32;
-/// The minimal key length, identical to [KEY_LEN]
 pub const KEY_MIN: usize = KEY_LEN;
-/// The maximal key length, identical to [KEY_LEN]
 pub const KEY_MAX: usize = KEY_LEN;
-/// The minimal output length, see [blake2b::OUT_MIN]
 pub const OUT_MIN: usize = blake2b::OUT_MIN;
-/// The maximal output length, see [blake2b::OUT_MAX]
 pub const OUT_MAX: usize = blake2b::OUT_MAX;
 
 /// This is a woefully incorrect implementation of hmac_blake2b.
@@ -24,22 +19,6 @@ pub const OUT_MAX: usize = blake2b::OUT_MAX;
 ///
 /// This will be replaced, likely by Kekkac at some point soon.
 /// <https://github.com/rosenpass/rosenpass/pull/145>
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::incorrect_hmac_blake2b::hash;
-/// use rosenpass_to::To;
-/// let key: [u8; 32] = [0; 32];
-/// let data: [u8; 32] = [255; 32];
-/// // buffer for the hash output
-/// let mut hash_data: [u8; 32] = [0u8; 32];
-///
-/// assert!(hash(&key, &data).to(&mut hash_data).is_ok(), "Hashing has to return OK result");
-/// # let expected_hash: &[u8] = &[5, 152, 135, 141, 151, 106, 147, 8, 220, 95, 38, 66, 29, 33, 3,
-/// 104, 250, 114, 131, 119, 27, 56, 59, 44, 11, 67, 230, 113, 112, 20, 80, 103];
-/// # assert_eq!(hash_data, expected_hash);
-///```
-///
 #[inline]
 pub fn hash<'a>(key: &'a [u8], data: &'a [u8]) -> impl To<[u8], anyhow::Result<()>> + 'a {
     const IPAD: [u8; KEY_LEN] = [0x36u8; KEY_LEN];

ciphers/src/subtle/mod.rs

@@ -1,13 +1,4 @@
-/// This module provides the following cryptographic schemes:
-/// - [blake2b]: The blake2b hash function
-/// - [chacha20poly1305_ietf]: The Chacha20Poly1305 AEAD as implemented in [RustCrypto](https://crates.io/crates/chacha20poly1305) (only used when the feature `experiment_libcrux` is disabled).
-/// - [chacha20poly1305_ietf_libcrux]: The Chacha20Poly1305 AEAD as implemented in [libcrux](https://github.com/cryspen/libcrux) (only used when the feature `experiment_libcrux` is enabled).
-/// - [incorrect_hmac_blake2b]: An (incorrect) hmac based on [blake2b].
-/// - [xchacha20poly1305_ietf] The Chacha20Poly1305 AEAD as implemented in [RustCrypto](https://crates.io/crates/chacha20poly1305)
 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

@@ -6,41 +6,10 @@ use chacha20poly1305::aead::generic_array::GenericArray;
 use chacha20poly1305::XChaCha20Poly1305 as AeadImpl;
 use chacha20poly1305::{AeadCore, AeadInPlace, KeyInit, KeySizeUser};
 
-/// The key length is 32 bytes or 256 bits.
 pub const KEY_LEN: usize = typenum2const! { <AeadImpl as KeySizeUser>::KeySize };
-/// The  MAC tag length is 16 bytes or 128 bits.
 pub const TAG_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::TagSize };
-/// The nonce length is 24 bytes or 192 bits.
 pub const NONCE_LEN: usize = typenum2const! { <AeadImpl as AeadCore>::NonceSize };
 
-/// Encrypts using XChaCha20Poly1305 as implemented in [RustCrypto](https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305).
-/// `key` and `nonce` MUST be chosen (pseudo-)randomly. The `key` slice MUST have a length of
-/// [KEY_LEN]. The `nonce` slice MUST have a length of [NONCE_LEN].
-/// In contrast to [chacha20poly1305_ietf::encrypt](crate::subtle::chacha20poly1305_ietf::encrypt) and
-/// [chacha20poly1305_ietf_libcrux::encrypt](crate::subtle::chacha20poly1305_ietf_libcrux::encrypt),
-/// `nonce` is also written into `ciphertext` and therefore ciphertext MUST have a length
-/// of at least [NONCE_LEN] + `plaintext.len()` + [TAG_LEN].
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::xchacha20poly1305_ietf::{encrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-/// const PLAINTEXT_LEN: usize = 43;
-/// let plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(PLAINTEXT_LEN, plaintext.len());
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut ciphertext_buffer = [0u8; NONCE_LEN + PLAINTEXT_LEN + TAG_LEN];
-///
-///
-/// let res: anyhow::Result<()> = encrypt(&mut ciphertext_buffer, key, nonce, additional_data, plaintext);
-/// # assert!(res.is_ok());
-/// # let expected_ciphertext: &[u8] = &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-/// # 0, 0, 0, 0, 8, 241, 229, 253, 200, 81, 248, 30, 183, 149, 134, 168, 149, 87, 109, 49, 159, 108,
-/// # 206, 89, 51, 232, 232, 197, 163, 253, 254, 208, 73, 76, 253, 13, 247, 162, 133, 184, 177, 44,
-/// # 73, 138, 176, 193, 61, 248, 61, 183, 164, 192, 214, 168, 4, 1, 62, 243, 36, 48, 149, 164, 6];
-/// # assert_eq!(expected_ciphertext, &ciphertext_buffer);
-///```
 #[inline]
 pub fn encrypt(
     ciphertext: &mut [u8],
@@ -59,38 +28,6 @@ pub fn encrypt(
     Ok(())
 }
 
-/// Decrypts a `ciphertext` and verifies the integrity of the `ciphertext` and the additional data
-/// `ad`. using XChaCha20Poly1305 as implemented in [RustCrypto](https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305).
-///
-/// The `key` slice MUST have a length of [KEY_LEN]. The `nonce` slice MUST have a length of
-/// [NONCE_LEN]. The plaintext buffer must have a capacity of `ciphertext.len()` - [TAG_LEN] - [NONCE_LEN].
-///
-/// In contrast to [chacha20poly1305_ietf::decrypt](crate::subtle::chacha20poly1305_ietf::decrypt) and
-/// [chacha20poly1305_ietf_libcrux::decrypt](crate::subtle::chacha20poly1305_ietf_libcrux::decrypt),
-/// `ciperhtext` MUST include the as it is not given otherwise.
-///
-/// # Examples
-///```rust
-/// # use rosenpass_ciphers::subtle::xchacha20poly1305_ietf::{decrypt, TAG_LEN, KEY_LEN, NONCE_LEN};
-/// let ciphertext: &[u8] = &[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-/// # 0, 0, 0, 0, 8, 241, 229, 253, 200, 81, 248, 30, 183, 149, 134, 168, 149, 87, 109, 49, 159, 108,
-/// # 206, 89, 51, 232, 232, 197, 163, 253, 254, 208, 73, 76, 253, 13, 247, 162, 133, 184, 177, 44,
-/// # 73, 138, 176, 193, 61, 248, 61, 183, 164, 192, 214, 168, 4, 1, 62, 243, 36, 48, 149, 164, 6];
-/// // this is the ciphertext generated by the example for the encryption
-/// const PLAINTEXT_LEN: usize = 43;
-/// assert_eq!(PLAINTEXT_LEN + TAG_LEN + NONCE_LEN, ciphertext.len());
-///
-/// let key: &[u8] = &[0u8; KEY_LEN]; // THIS IS NOT A SECURE KEY
-/// let nonce: &[u8] = &[0u8; NONCE_LEN]; // THIS IS NOT A SECURE NONCE
-/// let additional_data: &[u8] = "the encrypted message is very important".as_bytes();
-/// let mut plaintext_buffer = [0u8; PLAINTEXT_LEN];
-///
-/// let res: anyhow::Result<()> = decrypt(&mut plaintext_buffer, key, additional_data, ciphertext);
-/// assert!(res.is_ok());
-/// let expected_plaintext = "post-quantum cryptography is very important".as_bytes();
-/// assert_eq!(expected_plaintext, plaintext_buffer);
-///
-///```
 #[inline]
 pub fn decrypt(
     plaintext: &mut [u8],

constant-time/Cargo.toml

@@ -20,6 +20,3 @@ memsec = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.5"
-
-[lints.rust]
-unexpected_cfgs = { level = "allow", check-cfg = ['cfg(coverage)'] }

constant-time/src/compare.rs

@@ -1,30 +1,7 @@
-//! Constant-time comparison
-
 use core::ptr;
 
-/// Little endian memcmp version of [quinier/memsec](https://github.com/quininer/memsec/blob/bbc647967ff6d20d6dccf1c85f5d9037fcadd3b0/src/lib.rs#L30)
-///
-/// # Panic & Safety
-///
-/// Both input arrays must be at least of the indicated length.
-///
-/// See [std::ptr::read_volatile] on safety.
-///
-/// # Examples
-/// ```
-/// let a = [1, 2, 3, 4];
-/// let b = [1, 2, 3, 4];
-/// let c = [1, 2, 2, 5];
-/// let d = [1, 2, 2, 4];
-///
-/// unsafe {
-///     use rosenpass_constant_time::memcmp_le;
-///     assert_eq!(memcmp_le(a.as_ptr(), b.as_ptr(), 4), 0);
-///     assert!(memcmp_le(a.as_ptr(), c.as_ptr(), 4) < 0);
-///     assert!(memcmp_le(a.as_ptr(), d.as_ptr(), 4) > 0);
-///     assert_eq!(memcmp_le(a.as_ptr(), b.as_ptr(), 2), 0);
-/// }
-/// ```
+/// 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;
@@ -36,16 +13,6 @@ pub unsafe fn memcmp_le(b1: *const u8, b2: *const u8, len: usize) -> i32 {
     ((res - 1) >> 8) + (res >> 8) + 1
 }
 
-#[test]
-pub fn memcmp_le_test() {
-    // use rosenpass_constant_time::memcmp_le;
-    let a = [0, 1, 0, 0];
-    let b = [0, 0, 0, 1];
-    assert_eq!(-1, unsafe { memcmp_le(a.as_ptr(), b.as_ptr(), 4) });
-    assert_eq!(0, unsafe { memcmp_le(a.as_ptr(), a.as_ptr(), 4) });
-    assert_eq!(1, unsafe { memcmp_le(b.as_ptr(), a.as_ptr(), 4) });
-}
-
 /// compares two slices of memory content and returns an integer indicating the relationship between
 /// the slices
 ///
@@ -65,50 +32,8 @@ pub fn memcmp_le_test() {
 /// ## Tests
 /// For discussion on how to ensure the constant-time execution of this function, see
 /// <https://github.com/rosenpass/rosenpass/issues/232>
-///
-/// # Examples
-///
-/// ```rust
-/// use rosenpass_constant_time::compare;
-/// let a = [0, 1, 0, 0];
-/// let b = [0, 0, 0, 1];
-/// assert_eq!(-1, compare(&a, &b));
-/// assert_eq!(0, compare(&a, &a));
-/// assert_eq!(1, compare(&b, &a));
-/// ```
-///
-/// # Panic
-///
-/// This function will panic if the input arrays are of different lengths.
-///
-/// ```should_panic
-/// use rosenpass_constant_time::compare;
-/// let a = [0, 1, 0];
-/// let b = [0, 0, 0, 1];
-/// compare(&a, &b);
-/// ```
 #[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()) }
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::compare::memcmp_le;
-
-    #[test]
-    fn memcmp_le_test() {
-        let a = [1, 2, 3, 4];
-        let b = [1, 2, 3, 4];
-        let c = [1, 2, 2, 5];
-        let d = [1, 2, 2, 4];
-
-        unsafe {
-            assert_eq!(memcmp_le(a.as_ptr(), b.as_ptr(), 4), 0);
-            assert!(memcmp_le(a.as_ptr(), c.as_ptr(), 4) < 0);
-            assert!(memcmp_le(a.as_ptr(), d.as_ptr(), 4) > 0);
-            assert_eq!(memcmp_le(a.as_ptr(), b.as_ptr(), 2), 0);
-        }
-    }
-}

constant-time/src/increment.rs

@@ -1,21 +1,11 @@
-//! Incrementing numbers
-
 use core::hint::black_box;
 
 /// Interpret the given slice as a little-endian unsigned integer
 /// and increment that integer.
 ///
 /// # Leaks
-/// This function may leak timing information in the following ways:
-///
-/// - The function execution time is linearly proportional to the input length
-/// - The number of carry operations that occur may affect timing slightly
-/// - Memory access patterns are sequential and predictable
-///
-/// The carry operation timing variation is mitigated through the use of black_box,
-/// but the linear scaling with input size is inherent to the operation.
-/// These timing characteristics are generally considered acceptable for most
-/// cryptographic counter implementations.
+/// 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

constant-time/src/lib.rs

@@ -1,5 +1,3 @@
-#![warn(missing_docs)]
-#![warn(clippy::missing_docs_in_private_items)]
 //! constant-time implementations of some primitives
 //!
 //! Rosenpass internal library providing basic constant-time operations.
@@ -7,32 +5,6 @@
 //! ## TODO
 //! Figure out methodology to ensure that code is actually constant time, see
 //! <https://github.com/rosenpass/rosenpass/issues/232>
-//!
-//! # Examples
-//!
-//! ```rust
-//! use rosenpass_constant_time::{memcmp, compare};
-//!
-//! let a = [1, 2, 3, 4];
-//! let b = [1, 2, 3, 4];
-//! let c = [1, 2, 3, 5];
-//!
-//! // Compare for equality
-//! assert!(memcmp(&a, &b));
-//! assert!(!memcmp(&a, &c));
-//!
-//! // Compare lexicographically
-//! assert_eq!(compare(&a, &c), -1); // a < c
-//! assert_eq!(compare(&c, &a), 1);  // c > a
-//! assert_eq!(compare(&a, &b), 0);  // a == b
-//! ```
-//!
-//! # Security Notes
-//!
-//! While these functions aim to be constant-time, they may leak timing information in some cases:
-//!
-//! - Length mismatches between inputs are immediately detectable
-//! - Execution time scales linearly with input size
 
 mod compare;
 mod increment;
@@ -40,7 +12,6 @@ mod memcmp;
 mod xor;
 
 pub use compare::compare;
-pub use compare::memcmp_le;
 pub use increment::increment;
 pub use memcmp::memcmp;
 pub use xor::xor;

constant-time/src/memcmp.rs

@@ -1,5 +1,3 @@
-//! memcmp
-
 /// compares two sclices of memory content and returns whether they are equal
 ///
 /// ## Leaks
@@ -10,27 +8,17 @@
 /// The execution time of the function grows approx. linear with the length of the input. This is
 /// considered safe.
 ///
-/// ## Examples
+/// ## Tests
+/// [`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.
 ///
-/// ```rust
-/// use rosenpass_constant_time::memcmp;
-/// let a = [0, 0, 0, 0];
-/// let b = [0, 0, 0, 1];
-/// let c = [0, 0, 0];
-/// assert!(memcmp(&a, &a));
-/// assert!(!memcmp(&a, &b));
-/// assert!(!memcmp(&a, &c));
-/// ```
+/// For discussion on how to (further) ensure the constant-time execution of this function,
+/// see <https://github.com/rosenpass/rosenpass/issues/232>
 #[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::*;
@@ -113,10 +101,9 @@ mod tests {
         // Pearson correlation
         let correlation = cv / (sd_x * sd_y);
         println!("correlation: {:.6?}", correlation);
-        #[cfg(not(coverage))]
         assert!(
             correlation.abs() < 0.01,
             "execution time correlates with result"
-        );
+        )
     }
 }

constant-time/src/xor.rs

@@ -1,27 +1,14 @@
-//! xor
-
 use core::hint::black_box;
 use rosenpass_to::{with_destination, To};
 
 /// Xors the source into the destination
 ///
-/// Performs a constant-time XOR operation between two byte slices
-///
-/// Takes a source slice and XORs it with the destination slice in-place using the
-/// rosenpass_to trait for destination management.
-///
 /// # Panics
 /// If source and destination are of different sizes.
 ///
 /// # Leaks
-/// This function may leak timing information in the following ways:
-///
-/// - The function execution time is linearly proportional to the input length
-/// - Length mismatches between source and destination are immediately detectable via panic
-/// - Memory access patterns follow a predictable sequential pattern
-///
-/// These leaks are generally considered acceptable in most cryptographic contexts
-/// as they don't reveal information about the actual content being XORed.
+/// 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

coverage_report.sh

@@ -1,45 +0,0 @@
-#! /usr/bin/env bash
-
-set -e -o pipefail
-
-OUTPUT_DIR="target/grcov"
-
-log() {
-  echo >&2 "$@"
-}
-
-exc() {
-  echo '$' "$@"
-  "$@"
-}
-
-main() {
-  exc cd "$(dirname "$0")"
-
-  local open="0"
-  if [[ "$1" == "--open" ]]; then
-    open="1"
-  fi
-
-  exc cargo llvm-cov --all-features --workspace --doctests --branch
-
-  exc cp -rv target/llvm-cov-target/doctestbins target/llvm-cov-target/debug/deps/doctestbins
-  exc rm -rf "${OUTPUT_DIR}"
-  exc mkdir -p "${OUTPUT_DIR}"
-  exc grcov target/llvm-cov-target/ --llvm  -s . --branch \
-    --binary-path ./target/llvm-cov-target/debug/deps \
-    --ignore-not-existing --ignore '../*' --ignore "/*" \
-    --excl-line '^\s*#\[(derive|repr)\(' \
-    -t lcov,html,markdown -o "${OUTPUT_DIR}"
-
-  if (( "${open}" == 1 )); then
-    xdg-open "${PWD}/${OUTPUT_DIR}/html/index.html"
-  fi
-
-  log ""
-  log "Generated reports in \"${PWD}/${OUTPUT_DIR}\"."
-  log "Open \"${PWD}/${OUTPUT_DIR}/html/index.html\" to view HTML report."
-  log ""
-}
-
-main "$@"

doc/rosenpass.1

@@ -0,0 +1,114 @@
+.Dd $Mdocdate$
+.Dt ROSENPASS 1
+.Os
+.Sh NAME
+.Nm rosenpass
+.Nd builds post-quantum-secure VPNs
+.Sh SYNOPSIS
+.Nm
+.Op COMMAND
+.Op Ar OPTIONS ...
+.Op Ar ARGS ...
+.Sh DESCRIPTION
+.Nm
+performs cryptographic key exchanges that are secure against quantum-computers
+and then outputs the keys.
+These keys can then be passed to various services, such as wireguard or other
+vpn services, as pre-shared-keys to achieve security against attackers with
+quantum computers.
+.Pp
+This is a research project and quantum computers are not thought to become
+practical in fewer than ten years.
+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>
+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!
+.It Ar exchange private-key <file-path> public-key <file-path> [ OPTIONS ] PEERS
+Start a process to exchange keys with the specified peers.
+You should specify at least one peer.
+.Pp
+Its
+.Ar OPTIONS
+are as follows:
+.Bl -tag -width Ds
+.It Ar listen <ip>[:<port>]
+Instructs
+.Nm
+to listen on the specified interface and port.
+By default,
+.Nm
+will listen on all interfaces and select a random port.
+.It Ar verbose
+Extra logging.
+.El
+.El
+.Ss PEER
+Each
+.Ar PEER
+is defined as follows:
+.Qq peer public-key <file-path> [endpoint <ip>[:<port>]] [preshared-key <file-path>] [outfile <file-path>] [wireguard <dev> <peer> <extra_params>]
+.Pp
+Providing a
+.Ar PEER
+instructs
+.Nm
+to exchange keys with the given peer and write the resulting PSK into the given
+output file.
+You must either specify the outfile or wireguard output option.
+.Pp
+The parameters of
+.Ar PEER
+are as follows:
+.Bl -tag -width Ds
+.It Ar endpoint <ip>[:<port>]
+Specifies the address where the peer can be reached.
+This will be automatically updated after the first successful key exchange with
+the peer.
+If this is unspecified, the peer must initiate the connection.
+.It Ar preshared-key <file-path>
+You may specify a pre-shared key which will be mixed into the final secret.
+.It Ar outfile <file-path>
+You may specify a file to write the exchanged keys to.
+If this option is specified,
+.Nm
+will write a notification to standard out every time the key is updated.
+.It Ar wireguard <dev> <peer> <extra_params>
+This allows you to directly specify a wireguard peer to deploy the
+pre-shared-key to.
+You may specify extra parameters you would pass to
+.Qq wg set
+besides the preshared-key parameter which is used by
+.Nm .
+This makes it possible to add peers entirely from
+.Nm .
+.El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr rp 1 ,
+.Xr wg 1
+.Rs
+.%A Karolin Varner
+.%A Benjamin Lipp
+.%A Wanja Zaeske
+.%A Lisa Schmidt
+.%D 2023
+.%T Rosenpass
+.%U https://rosenpass.eu/whitepaper.pdf
+.Re
+.Sh STANDARDS
+This tool is the reference implementation of the Rosenpass protocol, as
+specified within the whitepaper referenced above.
+.Sh AUTHORS
+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 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,17 +2,15 @@
   "nodes": {
     "fenix": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": ["nixpkgs"],
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1728282832,
-        "narHash": "sha256-I7AbcwGggf+CHqpyd/9PiAjpIBGTGx5woYHqtwxaV7I=",
+        "lastModified": 1712298178,
+        "narHash": "sha256-590fpCPXYAkaAeBz/V91GX4/KGzPObdYtqsTWzT6AhI=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "1ec71be1f4b8f3105c5d38da339cb061fefc43f4",
+        "rev": "569b5b5781395da08e7064e825953c548c26af76",
         "type": "github"
       },
       "original": {
@@ -26,11 +24,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -39,18 +37,36 @@
         "type": "github"
       }
     },
+    "naersk": {
+      "inputs": {
+        "nixpkgs": ["nixpkgs"]
+      },
+      "locked": {
+        "lastModified": 1698420672,
+        "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=",
+        "owner": "nix-community",
+        "repo": "naersk",
+        "rev": "aeb58d5e8faead8980a807c840232697982d47b9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "naersk",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728193676,
-        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
+        "lastModified": 1712168706,
+        "narHash": "sha256-XP24tOobf6GGElMd0ux90FEBalUtw6NkBSVh/RlA6ik=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
+        "rev": "1487bdea619e4a7a53a4590c475deabb5a9d1bfb",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -59,17 +75,18 @@
       "inputs": {
         "fenix": "fenix",
         "flake-utils": "flake-utils",
+        "naersk": "naersk",
         "nixpkgs": "nixpkgs"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1728249780,
-        "narHash": "sha256-J269DvCI5dzBmPrXhAAtj566qt0b22TJtF3TIK+tMsI=",
+        "lastModified": 1712156296,
+        "narHash": "sha256-St7ZQrkrr5lmQX9wC1ZJAFxL8W7alswnyZk9d1se3Us=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "2b750da1a1a2c1d2c70896108d7096089842d877",
+        "rev": "8e581ac348e223488622f4d3003cb2bd412bf27e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,8 +1,12 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
 
+    # for quicker rust builds
+    naersk.url = "github:nix-community/naersk";
+    naersk.inputs.nixpkgs.follows = "nixpkgs";
+
     # for rust nightly with llvm-tools-preview
     fenix.url = "github:nix-community/fenix";
     fenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -11,15 +15,6 @@
   outputs = { self, nixpkgs, flake-utils, ... }@inputs:
     nixpkgs.lib.foldl (a: b: nixpkgs.lib.recursiveUpdate a b) { } [
 
-
-      #
-      ### Export the overlay.nix from this flake ###
-      #
-      {
-        overlays.default = import ./overlay.nix;
-      }
-
-
       #
       ### Actual Rosenpass Package and Docker Container Images ###
       #
@@ -35,39 +30,310 @@
       ]
         (system:
           let
+            scoped = (scope: scope.result);
+            lib = nixpkgs.lib;
+
             # normal nixpkgs
             pkgs = import nixpkgs {
               inherit system;
+            };
 
-              # apply our own overlay, overriding/inserting our packages as defined in ./pkgs
-              overlays = [ self.overlays.default ];
+            # parsed Cargo.toml
+            cargoToml = builtins.fromTOML (builtins.readFile ./rosenpass/Cargo.toml);
+
+            # source files relevant for rust
+            src = scoped rec {
+              # File suffices to include
+              extensions = [
+                "lock"
+                "rs"
+                "toml"
+              ];
+              # Files to explicitly include
+              files = [
+                "to/README.md"
+              ];
+
+              src = ./.;
+              filter = (path: type: scoped rec {
+                inherit (lib) any id removePrefix hasSuffix;
+                anyof = (any id);
+
+                basename = baseNameOf (toString path);
+                relative = removePrefix (toString src + "/") (toString path);
+
+                result = anyof [
+                  (type == "directory")
+                  (any (ext: hasSuffix ".${ext}" basename) extensions)
+                  (any (file: file == relative) files)
+                ];
+              });
+
+              result = pkgs.lib.sources.cleanSourceWith { inherit src filter; };
+            };
+
+            # a function to generate a nix derivation for rosenpass against any
+            # given set of nixpkgs
+            rosenpassDerivation = 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" "rosenpass" ];
+                  cargoTestOptions = x: x ++ [ "-p" "rosenpass" ];
+
+                  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"
+                    '');
+                  };
+
+                  # 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"
+                    '');
+                  };
+
+                  # 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 docker image based of rosenpass
+            rosenpassOCI = name: pkgs.dockerTools.buildImage rec {
+              inherit name;
+              copyToRoot = pkgs.buildEnv {
+                name = "image-root";
+                paths = [ self.packages.${system}.${name} ];
+                pathsToLink = [ "/bin" ];
+              };
+              config.Cmd = [ "/bin/rosenpass" ];
             };
           in
-          {
-            packages = {
-              default = pkgs.rosenpass;
-              rosenpass = pkgs.rosenpass;
-              rosenpass-oci-image = pkgs.rosenpass-oci-image;
-              rp = pkgs.rp;
+          rec {
+            packages = rec {
+              default = rosenpass;
+              rosenpass = rosenpassDerivation pkgs;
+              rp = rpDerivation pkgs;
+              rosenpass-oci-image = rosenpassOCI "rosenpass";
 
-              release-package = pkgs.release-package;
-
-              # for good measure, we also offer to cross compile to Linux on Arm
-              aarch64-linux-rosenpass-static =
-                pkgs.pkgsCross.aarch64-multiplatform.pkgsStatic.rosenpass;
-              aarch64-linux-rp-static = pkgs.pkgsCross.aarch64-multiplatform.pkgsStatic.rp;
-            }
-            //
-            # We only offer static builds for linux, as this is not supported on OS X
-            (nixpkgs.lib.attrsets.optionalAttrs pkgs.stdenv.isLinux {
-              rosenpass-static = pkgs.pkgsStatic.rosenpass;
-              rosenpass-static-oci-image = pkgs.pkgsStatic.rosenpass-oci-image;
-              rp-static = pkgs.pkgsStatic.rp;
-            });
+              # derivation for the release
+              release-package =
+                let
+                  version = cargoToml.package.version;
+                  package =
+                    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
+                    else packages.rosenpass-oci-image;
+                in
+                pkgs.runCommandNoCC "lace-result" { }
+                  ''
+                    mkdir {bin,$out}
+                    tar -cvf $out/rosenpass-${system}-${version}.tar \
+                      -C ${package} bin/rosenpass \
+                      -C ${rp} bin/rp
+                    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-oci-image = rosenpassOCI "rosenpass-static";
+            } else { });
           }
         ))
 
-
       #
       ### Linux specifics ###
       #
@@ -75,69 +341,92 @@
         let
           pkgs = import nixpkgs {
             inherit system;
-
-            # apply our own overlay, overriding/inserting our packages as defined in ./pkgs
-            overlays = [ self.overlays.default ];
           };
+          packages = self.packages.${system};
         in
         {
+          #
+          ### Whitepaper ###
+          #
+          packages.whitepaper =
+            let
+              tlsetup = (pkgs.texlive.combine {
+                inherit (pkgs.texlive) scheme-basic acmart amsfonts ccicons
+                  csquotes csvsimple doclicense fancyvrb fontspec gobble
+                  koma-script ifmtarg latexmk lm markdown mathtools minted noto
+                  nunito pgf soul unicode-math lualatex-math paralist
+                  gitinfo2 eso-pic biblatex biblatex-trad biblatex-software
+                  xkeyval xurl xifthen biber;
+              });
+            in
+            pkgs.stdenvNoCC.mkDerivation {
+              name = "whitepaper";
+              src = ./papers;
+              nativeBuildInputs = with pkgs; [
+                ncurses # tput
+                python3Packages.pygments
+                tlsetup # custom tex live scheme
+                which
+              ];
+              buildPhase = ''
+                export HOME=$(mktemp -d)
+                latexmk -r tex/CI.rc
+              '';
+              installPhase = ''
+                mkdir -p $out
+                mv *.pdf readme.md $out/
+              '';
+            };
 
-          #
-          ### Reading materials ###
-          #
-          packages.whitepaper = pkgs.whitepaper;
 
           #
           ### Proof and Proof Tools ###
           #
-          packages.proverif-patched = pkgs.proverif-patched;
-          packages.proof-proverif = pkgs.proof-proverif;
+          packages.proverif-patched = pkgs.proverif.overrideAttrs (old: {
+            postInstall = ''
+              install -D -t $out/lib cryptoverif.pvl
+            '';
+          });
+          packages.proof-proverif = pkgs.stdenv.mkDerivation {
+            name = "rosenpass-proverif-proof";
+            version = "unstable";
+            src = pkgs.lib.sources.sourceByRegex ./. [
+              "analyze.sh"
+              "marzipan(/marzipan.awk)?"
+              "analysis(/.*)?"
+            ];
+            nativeBuildInputs = [ pkgs.proverif pkgs.graphviz ];
+            CRYPTOVERIF_LIB = packages.proverif-patched + "/lib/cryptoverif.pvl";
+            installPhase = ''
+              mkdir -p $out
+              bash analyze.sh -color -html $out
+            '';
+          };
 
 
           #
           ### Devshells ###
           #
           devShells.default = pkgs.mkShell {
-            inherit (pkgs.proof-proverif) CRYPTOVERIF_LIB;
-            inputsFrom = [ pkgs.rosenpass ];
+            inherit (packages.proof-proverif) CRYPTOVERIF_LIB;
+            inputsFrom = [ packages.default ];
             nativeBuildInputs = with pkgs; [
+              cmake # override the fakecmake from the main step above
               cargo-release
               clippy
-              rustfmt
               nodePackages.prettier
               nushell # for the .ci/gen-workflow-files.nu script
-              proverif-patched
-            ];
-          };
-          # TODO: Write this as a patched version of the default environment
-          devShells.fullEnv = pkgs.mkShell {
-            inherit (pkgs.proof-proverif) CRYPTOVERIF_LIB;
-            inputsFrom = [ pkgs.rosenpass ];
-            nativeBuildInputs = with pkgs; [
-              cargo-release
               rustfmt
-              nodePackages.prettier
-              nushell # for the .ci/gen-workflow-files.nu script
-              proverif-patched
-              inputs.fenix.packages.${system}.complete.toolchain
-              pkgs.cargo-llvm-cov
-              pkgs.grcov
+              packages.proverif-patched
             ];
           };
           devShells.coverage = pkgs.mkShell {
-            inputsFrom = [ pkgs.rosenpass ];
-            nativeBuildInputs = [
-              inputs.fenix.packages.${system}.complete.toolchain
-              pkgs.cargo-llvm-cov
-              pkgs.grcov
-            ];
+            inputsFrom = [ packages.default ];
+            nativeBuildInputs = with pkgs; [ inputs.fenix.packages.${system}.complete.toolchain cargo-llvm-cov ];
           };
 
 
           checks = {
-            systemd-rosenpass = pkgs.testers.runNixOSTest ./tests/systemd/rosenpass.nix;
-            systemd-rp = pkgs.testers.runNixOSTest ./tests/systemd/rp.nix;
-
             cargo-fmt = pkgs.runCommand "check-cargo-fmt"
               { inherit (self.devShells.${system}.default) nativeBuildInputs buildInputs; } ''
               cargo fmt --manifest-path=${./.}/Cargo.toml --check --all && touch $out

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
 
@@ -84,4 +81,4 @@ doc = false
 name = "fuzz_vec_secret_alloc_memfdsec_mallocfb"
 path = "fuzz_targets/vec_secret_alloc_memfdsec_mallocfb.rs"
 test = false
-doc = false
+doc = false

fuzz/fuzz_targets/aead_enc_into.rs

@@ -15,7 +15,8 @@ pub struct Input {
 }
 
 fuzz_target!(|input: Input| {
-    let mut ciphertext = vec![0u8; input.plaintext.len() + 16];
+    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/handle_msg.rs

@@ -7,14 +7,14 @@ 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 rosenpass_secret_memory::Secret;
 use std::sync::Once;
 
 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]);
+    let pk = Secret::from_slice(&[0; StaticKem::PK_LEN]);
 
     let mut cs = CryptoServer::new(sk, pk);
     let mut tx_buf = [0; 10240];

fuzz/fuzz_targets/kyber_encaps.rs

@@ -14,7 +14,7 @@ pub struct Input {
 
 fuzz_target!(|input: Input| {
     let mut ciphertext = [0u8; EphemeralKem::CT_LEN];
-    let mut shared_secret = [0u8; EphemeralKem::SHK_LEN];
+    let mut shared_secret = [0u8; EphemeralKem::SK_LEN];
 
     EphemeralKem::encaps(&mut shared_secret, &mut ciphertext, &input.pk).unwrap();
 });

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)

oqs/Cargo.toml

@@ -14,7 +14,3 @@ rosenpass-cipher-traits = { workspace = true }
 rosenpass-util = { workspace = true }
 oqs-sys = { workspace = true }
 paste = { workspace = true }
-
-[dev-dependencies]
-rosenpass-secret-memory = { workspace = true }
-rosenpass-constant-time = { workspace = true }

oqs/src/kem_macro.rs

@@ -1,42 +1,9 @@
-//! Generic helpers for declaring bindings to liboqs kems
-
-/// Generate bindings to a liboqs-provided KEM
 macro_rules! oqs_kem {
     ($name:ident) => { ::paste::paste!{
-        #[doc = "Bindings for ::oqs_sys::kem::" [<"OQS_KEM" _ $name:snake>] "_*"]
         mod [< $name:snake >] {
             use rosenpass_cipher_traits::Kem;
             use rosenpass_util::result::Guaranteed;
 
-            #[doc = "Bindings for ::oqs_sys::kem::" [<"OQS_KEM" _ $name:snake>] "_*"]
-            #[doc = ""]
-            #[doc = "# Examples"]
-            #[doc = ""]
-            #[doc = "```rust"]
-            #[doc = "use std::borrow::{Borrow, BorrowMut};"]
-            #[doc = "use rosenpass_cipher_traits::Kem;"]
-            #[doc = "use rosenpass_oqs::" $name:camel " as MyKem;"]
-            #[doc = "use rosenpass_secret_memory::{Secret, Public};"]
-            #[doc = ""]
-            #[doc = "rosenpass_secret_memory::secret_policy_try_use_memfd_secrets();"]
-            #[doc = ""]
-            #[doc = "// Recipient generates secret key, transfers pk to sender"]
-            #[doc = "let mut sk = Secret::<{ MyKem::SK_LEN }>::zero();"]
-            #[doc = "let mut pk = Public::<{ MyKem::PK_LEN }>::zero();"]
-            #[doc = "MyKem::keygen(sk.secret_mut(), pk.borrow_mut());"]
-            #[doc = ""]
-            #[doc = "// Sender generates ciphertext and local shared key, sends ciphertext to recipient"]
-            #[doc = "let mut shk_enc = Secret::<{ MyKem::SHK_LEN }>::zero();"]
-            #[doc = "let mut ct = Public::<{ MyKem::CT_LEN }>::zero();"]
-            #[doc = "MyKem::encaps(shk_enc.secret_mut(), ct.borrow_mut(), pk.borrow());"]
-            #[doc = ""]
-            #[doc = "// Recipient decapsulates ciphertext"]
-            #[doc = "let mut shk_dec = Secret::<{ MyKem::SHK_LEN }>::zero();"]
-            #[doc = "MyKem::decaps(shk_dec.secret_mut(), sk.secret(), ct.borrow());"]
-            #[doc = ""]
-            #[doc = "// Both parties end up with the same shared key"]
-            #[doc = "assert!(rosenpass_constant_time::compare(shk_enc.secret_mut(), shk_dec.secret_mut()) == 0);"]
-            #[doc = "```"]
             pub enum [< $name:camel >]  {}
 
             /// # Panic & Safety

oqs/src/lib.rs

@@ -1,8 +1,3 @@
-#![warn(missing_docs)]
-#![warn(clippy::missing_docs_in_private_items)]
-//! Bindings for liboqs used in Rosenpass
-
-/// Call into a libOQS function
 macro_rules! oqs_call {
     ($name:path, $($args:expr),*) => {{
         use oqs_sys::common::OQS_STATUS::*;

overlay.nix

@@ -1,39 +0,0 @@
-final: prev: {
-
-
-  #
-  ### Actual rosenpass software ###
-  #
-  rosenpass = final.callPackage ./pkgs/rosenpass.nix { };
-  rosenpass-oci-image = final.callPackage ./pkgs/rosenpass-oci-image.nix { };
-  rp = final.callPackage ./pkgs/rosenpass.nix { package = "rp"; };
-
-  release-package = final.callPackage ./pkgs/release-package.nix { };
-
-  #
-  ### Appendix ###
-  #
-  proverif-patched = prev.proverif.overrideAttrs (old: {
-    postInstall = ''
-      install -D -t $out/lib cryptoverif.pvl
-    '';
-  });
-
-  proof-proverif = final.stdenv.mkDerivation {
-    name = "rosenpass-proverif-proof";
-    version = "unstable";
-    src = final.lib.sources.sourceByRegex ./. [
-      "analyze.sh"
-      "marzipan(/marzipan.awk)?"
-      "analysis(/.*)?"
-    ];
-    nativeBuildInputs = [ final.proverif final.graphviz ];
-    CRYPTOVERIF_LIB = final.proverif-patched + "/lib/cryptoverif.pvl";
-    installPhase = ''
-      mkdir -p $out
-      bash analyze.sh -color -html $out
-    '';
-  };
-
-  whitepaper = final.callPackage ./pkgs/whitepaper.nix { };
-}

papers/whitepaper.md

@@ -2,8 +2,8 @@
 template: rosenpass
 title: Rosenpass
 author:
-- Karolin Varner = Rosenpass e.V., Max Planck Institute for Security and Privacy (MPI-SP)
-- Benjamin Lipp = Rosenpass e.V., Max Planck Institute for Security and Privacy (MPI-SP)
+- Karolin Varner = Independent Researcher
+- Benjamin Lipp = Max Planck Institute for Security and Privacy (MPI-SP)
 - Wanja Zaeske
 - Lisa Schmidt = {Scientific Illustrator – \\url{mullana.de}}
 - Prabhpreet Dua
@@ -383,18 +383,9 @@ fn load_biscuit(nct) {
       "biscuit additional data",
       spkr, sidi, sidr);
     let pt : Biscuit = XAEAD::dec(k, n, ct, ad);
-
     // Find the peer and apply retransmission protection
     lookup_peer(pt.peerid);
-
-    // In December 2024, the InitConf retransmission mechanisim was redesigned
-    // in a backwards-compatible way. See the changelog.
-    // 
-    // -- 2024-11-30, Karolin Varner
-    if (protocol_version!(< "0.3.0")) {
-        // Ensure that the biscuit is used only once
-        assert(pt.biscuit_no <= peer.biscuit_used);
-    }
+    assert(pt.biscuit_no <= peer.biscuit_used);
 
     // Restore the chaining key
     ck ← pt.ck;
@@ -510,7 +501,7 @@ LAST_UNDER_LOAD_WINDOW = 1 //seconds
 
 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 uses less complex form of the same mechanism: The responder never retransmits RespHello, instead the responder generates a new RespHello message if InitHello is retransmitted. Responder confirmation messages of completed handshake (EmptyData) messages are retransmitted by storing the most recent InitConf messages (or their hashes) and caching the associated EmptyData messages. Through this cache, InitConf retransmission is detected and the associated EmptyData message is retransmitted.
+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
 
@@ -524,76 +515,6 @@ When the responder is under load and it recieves an InitConf message, the messag
 
 # Changelog
 
-### 0.3.x
-
-#### 2024-10-30 – InitConf retransmission updates
-
-\vspace{0.5em}
-
-Author: Karolin Varner  
-Issue: [#331](https://github.com/rosenpass/rosenpass/issues/331)  
-PR: [#513](https://github.com/rosenpass/rosenpass/pull/513)  
-
-\vspace{0.5em}
-
-We redesign the InitConf retransmission mechanism to use a hash table. This avoids the need for the InitConf handling code to account for InitConf retransmission specifically and moves the retransmission logic into less-sensitive code.
-
-Previously, we would specifically account for InitConf retransmission in the InitConf handling code by checking the biscuit number: If the biscuit number was higher than any previously seen biscuit number, then this must be a new key-exchange being completed; if the biscuit number was exactly the highest seen biscuit number, then the InitConf message is interpreted as an InitConf retransmission; in this case, an entirely new EmptyData (responder confirmation) message was generated as confirmation that InitConf has been received and that the initiator can now cease opportunistic retransmission of InitConf.
-
-This mechanism was a bit brittle; even leading to a very minor but still relevant security issue, necessitating the release of Rosenpass maintenance version 0.2.2 with a [fix for the problem](https://github.com/rosenpass/rosenpass/pull/329). We had processed the InitConf message, correctly identifying that InitConf was a retransmission, but we failed to pass this information on to the rest of the code base, leading to double emission of the same "hey, we have a new cryptographic session key" even if the `outfile` option was used to integrate Rosenpass into some external application. If this event was used anywhere to reset a nonce, then this could have led to a nonce-misuse, although for the use with WireGuard this is not an issue.
-
-By removing all retransmission handling code from the cryptographic protocol, we are taking structural measures to exclude the possibilities of similar issues.
-
-- In section "Dealing With Package Loss" we replace
-
-    \begin{quote}
-        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.
-    \end{quote}
-
-    by 
-
-    \begin{quote}
-        The responder uses less complex form of the same mechanism: The responder never retransmits RespHello, instead the responder generates a new RespHello message if InitHello is retransmitted. Responder confirmation messages of completed handshake (EmptyData) messages are retransmitted by storing the most recent InitConf messages (or their hashes) and caching the associated EmptyData messages. Through this cache, InitConf retransmission is detected and the associated EmptyData message is retransmitted.
-    \end{quote}
-
-- In function `load_biscuit` we replace
-
-    ``` {=tex}
-    \begin{quote}
-        \begin{minted}{pseudorust}
-        assert(pt.biscuit_no <= peer.biscuit_used);
-        \end{minted}
-    \end{quote}
-    ```
-
-    by
-
-    ``` {=tex}
-    \begin{quote}
-        \begin{minted}{pseudorust}
-        // In December 2024, the InitConf retransmission mechanisim was redesigned
-        // in a backwards-compatible way. See the changelog.
-        // 
-        // -- 2024-11-30, Karolin Varner
-        if (protocol_version!(< "0.3.0")) {
-            // Ensure that the biscuit is used only once
-            assert(pt.biscuit_no <= peer.biscuit_used);
-        }
-        \end{minted}
-    \end{quote}
-    ```
-
-#### 2024-04-16 – Denial of Service Mitigation
-
-\vspace{0.5em}
-
-Author: Prabhpreet Dua  
-Issue: [#137](https://github.com/rosenpass/rosenpass/issues/137)  
-PR: [#142](https://github.com/rosenpass/rosenpass/pull/142)  
-
-\vspace{0.5em}
-
-- Added denial of service mitigation using the WireGuard cookie mechanism
 - Added section "Denial of Service Mitigation and Cookies", and modify "Dealing with Packet Loss" for DoS cookie mechanism
 
 \printbibliography

pkgs/release-package.nix

@@ -1,27 +0,0 @@
-{ lib, stdenvNoCC, runCommandNoCC, pkgsStatic, rosenpass, rosenpass-oci-image, rp } @ args:
-
-let
-  version = rosenpass.version;
-
-  # select static packages on Linux, default packages otherwise
-  package =
-    if stdenvNoCC.hostPlatform.isLinux then
-      pkgsStatic.rosenpass
-    else args.rosenpass;
-  rp =
-    if stdenvNoCC.hostPlatform.isLinux then
-      pkgsStatic.rp
-    else args.rp;
-  oci-image =
-    if stdenvNoCC.hostPlatform.isLinux then
-      pkgsStatic.rosenpass-oci-image
-    else args.rosenpass-oci-image;
-in
-runCommandNoCC "lace-result" { } ''
-  mkdir {bin,$out}
-  tar -cvf $out/rosenpass-${stdenvNoCC.hostPlatform.system}-${version}.tar \
-    -C ${package} bin/rosenpass lib/systemd \
-    -C ${rp} bin/rp
-  cp ${oci-image} \
-    $out/rosenpass-oci-image-${stdenvNoCC.hostPlatform.system}-${version}.tar.gz
-''

pkgs/rosenpass-oci-image.nix

@@ -1,11 +0,0 @@
-{ dockerTools, buildEnv, rosenpass }:
-
-dockerTools.buildImage {
-  name = rosenpass.name + "-oci";
-  copyToRoot = buildEnv {
-    name = "image-root";
-    paths = [ rosenpass ];
-    pathsToLink = [ "/bin" ];
-  };
-  config.Cmd = [ "/bin/rosenpass" ];
-}

pkgs/rosenpass.nix

@@ -1,87 +0,0 @@
-{ lib, stdenv, rustPlatform, cmake, mandoc, removeReferencesTo, bash, package ? "rosenpass" }:
-
-let
-  # whether we want to build a statically linked binary
-  isStatic = stdenv.targetPlatform.isStatic;
-
-  scoped = (scope: scope.result);
-
-  # source files relevant for rust
-  src = scoped rec {
-    # File suffices to include
-    extensions = [
-      "lock"
-      "rs"
-      "service"
-      "target"
-      "toml"
-    ];
-    # Files to explicitly include
-    files = [
-      "to/README.md"
-    ];
-
-    src = ../.;
-    filter = (path: type: scoped rec {
-      inherit (lib) any id removePrefix hasSuffix;
-      anyof = (any id);
-
-      basename = baseNameOf (toString path);
-      relative = removePrefix (toString src + "/") (toString path);
-
-      result = anyof [
-        (type == "directory")
-        (any (ext: hasSuffix ".${ext}" basename) extensions)
-        (any (file: file == relative) files)
-      ];
-    });
-
-    result = lib.sources.cleanSourceWith { inherit src filter; };
-  };
-
-  # parsed Cargo.toml
-  cargoToml = builtins.fromTOML (builtins.readFile (src + "/rosenpass/Cargo.toml"));
-in
-rustPlatform.buildRustPackage {
-  name = cargoToml.package.name;
-  version = cargoToml.package.version;
-  inherit src;
-
-  cargoBuildOptions = [ "--package" package ];
-  cargoTestOptions = [ "--package" package ];
-
-  doCheck = true;
-
-  cargoLock = {
-    lockFile = src + "/Cargo.lock";
-    outputHashes = {
-      "memsec-0.6.3" = "sha256-4ri+IEqLd77cLcul3lZrmpDKj4cwuYJ8oPRAiQNGeLw=";
-      "uds-0.4.2" = "sha256-qlxr/iJt2AV4WryePIvqm/8/MK/iqtzegztNliR93W8=";
-    };
-  };
-
-  nativeBuildInputs = [
-    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 = [ bash ];
-
-  hardeningDisable = lib.optional isStatic "fortify";
-
-  postInstall = ''
-    mkdir -p $out/lib/systemd/system
-    install systemd/rosenpass@.service $out/lib/systemd/system
-    install systemd/rp@.service $out/lib/systemd/system
-    install systemd/rosenpass.target $out/lib/systemd/system
-  '';
-
-  meta = {
-    inherit (cargoToml.package) description homepage;
-    license = with lib.licenses; [ mit asl20 ];
-    maintainers = [ lib.maintainers.wucke13 ];
-    platforms = lib.platforms.all;
-  };
-}

pkgs/whitepaper.nix

@@ -1,29 +0,0 @@
-{ stdenvNoCC, texlive, ncurses, python3Packages, which }:
-
-let
-  customTexLiveSetup = (texlive.combine {
-    inherit (texlive) acmart amsfonts biber biblatex biblatex-software
-      biblatex-trad ccicons csquotes csvsimple doclicense eso-pic fancyvrb
-      fontspec gitinfo2 gobble ifmtarg koma-script latexmk lm lualatex-math
-      markdown mathtools minted noto nunito paralist pgf scheme-basic soul
-      unicode-math upquote xifthen xkeyval xurl;
-  });
-in
-stdenvNoCC.mkDerivation {
-  name = "whitepaper";
-  src = ../papers;
-  nativeBuildInputs = [
-    ncurses # tput
-    python3Packages.pygments
-    customTexLiveSetup # custom tex live scheme
-    which
-  ];
-  buildPhase = ''
-    export HOME=$(mktemp -d)
-    latexmk -r tex/CI.rc
-  '';
-  installPhase = ''
-    mkdir -p $out
-    mv *.pdf readme.md $out/
-  '';
-}

readme.md

@@ -23,12 +23,6 @@ rosenpass help
 
 Follow [quick start instructions](https://rosenpass.eu/#start) to get a VPN up and running.
 
-## Contributing
-
-Contributions are generally welcome. Join our [Matrix Chat](https://matrix.to/#/#rosenpass:matrix.org) if you are looking for guidance on how to contribute or for people to collaborate with.
-
-We also have a – as of now, very minimal – [contributors guide](CONTRIBUTING.md).
-
 ## 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.
@@ -72,8 +66,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

@@ -1,6 +1,6 @@
 [package]
 name = "rosenpass"
-version = "0.3.0-dev"
+version = "0.2.1"
 authors = ["Karolin Varner <karo@cupdev.net>", "wucke13 <wucke13@gmail.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -13,19 +13,6 @@ readme = "readme.md"
 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
@@ -47,22 +34,12 @@ env_logger = { workspace = true }
 serde = { workspace = true }
 toml = { workspace = true }
 clap = { workspace = true }
-clap_complete = { workspace = true }
-clap_mangen = { 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, optional = true }
-uds = { workspace = true, optional = true, features = ["mio_1xx"] }
-signal-hook = { workspace = true, optional = true }
+derive_builder = {workspace = true}
+rosenpass-wireguard-broker = {workspace = true}
 
 [build-dependencies]
 anyhow = { workspace = true }
@@ -71,26 +48,9 @@ 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 }
+serial_test = {workspace = true}
+procspawn = {workspace = true}
 
 [features]
-default = []
-experiment_memfd_secret = ["rosenpass-wireguard-broker/experiment_memfd_secret"]
-experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"]
-experiment_api = [
-    "hex-literal",
-    "uds",
-    "command-fds",
-    "rustix",
-    "rosenpass-util/experiment_file_descriptor_passing",
-    "rosenpass-wireguard-broker/experiment_api",
-]
-internal_signal_handling_for_coverage_reports = ["signal-hook"]
-internal_testing = []
-internal_bin_gen_ipc_msg_types = ["hex", "heck"]
-
-[lints.rust]
-unexpected_cfgs = { level = "allow", check-cfg = ['cfg(coverage)'] }
+enable_broker_api = ["rosenpass-wireguard-broker/enable_broker_api"]
+enable_memfd_alloc = []

rosenpass/benches/handshake.rs

@@ -1,6 +1,5 @@
 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;
@@ -41,7 +40,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))
 }
 

rosenpass/build.rs

@@ -0,0 +1,52 @@
+use anyhow::bail;
+use anyhow::Result;
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+use std::process::Command;
+
+/// Invokes a troff compiler to compile a manual page
+fn render_man(compiler: &str, man: &str) -> Result<String> {
+    let out = Command::new(compiler).args(["-Tascii", man]).output()?;
+    if !out.status.success() {
+        bail!("{} returned an error", compiler);
+    }
+
+    Ok(String::from_utf8(out.stdout)?)
+}
+
+/// Generates the manual page
+fn generate_man() -> String {
+    // This function is purposely stupid and redundant
+
+    let man = render_man("mandoc", "./doc/rosenpass.1");
+    if let Ok(man) = man {
+        return man;
+    }
+
+    let man = render_man("groff", "./doc/rosenpass.1");
+    if let Ok(man) = man {
+        return man;
+    }
+
+    "Cannot render manual page. Please visit https://rosenpass.eu/docs/manuals/\n".into()
+}
+
+fn man() {
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    let man = generate_man();
+    let path = out_dir.join("rosenpass.1.ascii");
+
+    let mut file = File::create(&path).unwrap();
+    file.write_all(man.as_bytes()).unwrap();
+
+    println!("cargo:rustc-env=ROSENPASS_MAN={}", path.display());
+}
+
+fn main() {
+    // For now, rerun the build script on every time, as the build script
+    // is not very expensive right now.
+    println!("cargo:rerun-if-changed=./");
+    man();
+}

rosenpass/src/api/api_handler.rs

@@ -1,341 +0,0 @@
-// Note: This is business logic; tested through the integration tests in
-// rosenpass/tests/
-
-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};
-
-/// Stores the state of the API handler.
-///
-/// This is used in the context [ApiHandlerContext]; [ApiHandlerContext] exposes both
-/// the [AppServer] and the API handler state.
-///
-/// [ApiHandlerContext] is what actually contains the API handler functions.
-#[derive(Debug)]
-pub struct ApiHandler {
-    _dummy: (),
-}
-
-impl ApiHandler {
-    /// Construct an [Self]
-    #[allow(clippy::new_without_default)]
-    pub fn new() -> Self {
-        Self { _dummy: () }
-    }
-}
-
-/// The implementation of the API requires both access to its own state [ApiHandler] and to the
-/// [AppServer] the API is supposed to operate on.
-///
-/// This trait provides both; it implements a pattern to allow for multiple - **potentially
-/// overlapping** mutable references to be passed to the API handler functions.
-///
-/// This relatively complex scheme is chosen to appease the borrow checker: We want flexibility
-/// with regard to where the [ApiHandler] is stored and we need a mutable reference to
-/// [ApiHandler]. We also need a mutable reference to [AppServer]. Achieving this by using the
-/// direct method would be impossible because the [ApiHandler] is actually stored somewhere inside
-/// [AppServer]. The borrow checker does not allow this.
-///
-/// What we have instead is – in practice – a reference to [AppServer] and a function (as part of
-/// the trait) that extracts an [ApiHandler] reference from [AppServer], which is allowed by the
-/// borrow checker. A benefit of the use of a trait here is that we could, if desired, also store
-/// the [ApiHandler] outside [AppServer]. It really depends on the trait.
-pub trait ApiHandlerContext {
-    /// Retrieve the [ApiHandler]
-    fn api_handler(&self) -> &ApiHandler;
-    /// Retrieve the [AppServer]
-    fn app_server(&self) -> &AppServer;
-    /// Retrieve the [ApiHandler]
-    fn api_handler_mut(&mut self) -> &mut ApiHandler;
-    /// Retrieve the [AppServer]
-    fn app_server_mut(&mut self) -> &mut AppServer;
-}
-
-/// This is the Error raised by [ApiServer::supply_keypair]; it contains both
-/// the underlying error message as well as the status value
-/// returned by the API.
-///
-/// [ApiServer::supply_keypair] generally constructs a [Self] by using one of the
-/// utility functions [SupplyKeypairErrorExt].
-#[derive(thiserror::Error, Debug)]
-#[error("Error in SupplyKeypair")]
-struct SupplyKeypairError {
-    /// The status code communicated via the Rosenpass API
-    status: u128,
-    /// The underlying error that caused the Rosenpass API level Error
-    #[source]
-    cause: anyhow::Error,
-}
-
-trait SupplyKeypairErrorExt<T> {
-    /// Imbue any Error (that can be represented as [anyhow::Error]) with
-    /// an arbitrary error code
-    fn e_custom(self, status: u128) -> Result<T, SupplyKeypairError>;
-    /// Imbue any Error (that can be represented as [anyhow::Error]) with
-    /// the [supply_keypair_response_status::INTERNAL_ERROR] error code
-    fn einternal(self) -> Result<T, SupplyKeypairError>;
-    /// Imbue any Error (that can be represented as [anyhow::Error]) with
-    /// the [supply_keypair_response_status::KEYPAIR_ALREADY_SUPPLIED] error code
-    fn ealready_supplied(self) -> Result<T, SupplyKeypairError>;
-    /// Imbue any Error (that can be represented as [anyhow::Error]) with
-    /// the [supply_keypair_response_status::INVALID_REQUEST] error code
-    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,353 +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;
-    // TODO: This is not actually part of the API. Remove.
-    pub const INTERNAL_ERROR: u128 = 2;
-    pub const INVALID_REQUEST: u128 = 3;
-    /// TODO: Deprectaed, remove
-    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,159 +0,0 @@
-use super::{ByteSliceRefExt, Message, PingRequest, PingResponse, RequestRef, RequestResponsePair};
-use std::{collections::VecDeque, os::fd::OwnedFd};
-use zerocopy::{ByteSlice, ByteSliceMut};
-
-pub trait Server {
-    /// This implements the handler for the [crate::api::RequestMsgType::Ping] API message
-    ///
-    /// It merely takes a buffer and returns that same buffer.
-    fn ping(
-        &mut self,
-        req: &PingRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut PingResponse,
-    ) -> anyhow::Result<()>;
-
-    /// Supply the cryptographic server keypair through file descriptor passing in the API
-    ///
-    /// This implements the handler for the [crate::api::RequestMsgType::SupplyKeypair] API message.
-    ///
-    /// # File descriptors
-    ///
-    /// 1. The secret key (size must match exactly); the file descriptor must be backed by either
-    ///    of
-    ///     - file-system file
-    ///     - [memfd](https://man.archlinux.org/man/memfd.2.en)
-    ///     - [memfd_secret](https://man.archlinux.org/man/memfd.2.en)
-    /// 2. The public key (size must match exactly); the file descriptor must be backed by either
-    ///    of
-    ///     - file-system file
-    ///     - [memfd](https://man.archlinux.org/man/memfd.2.en)
-    ///     - [memfd_secret](https://man.archlinux.org/man/memfd.2.en)
-    ///
-    /// # API Return Status
-    ///
-    /// 1. [crate::api::supply_keypair_response_status::OK] - Indicates success
-    /// 2. [crate::api::supply_keypair_response_status::KEYPAIR_ALREADY_SUPPLIED] – The endpoint was used but
-    ///    the server already has server keys
-    /// 3. [crate::api::supply_keypair_response_status::INVALID_REQUEST]  – Malformed request; could be:
-    ///     - Missing file descriptors for public key
-    ///     - File descriptors contain data of invalid length
-    ///     - Invalid file descriptor type
-    ///
-    /// # Description
-    ///
-    /// At startup, if no server keys are specified in the rosenpass configuration, and if the API
-    /// is enabled, the Rosenpass process waits for server keys to be supplied to the API. Before
-    /// then, any messages for the rosenpass cryptographic protocol are ignored and dropped – all
-    /// cryptographic operations require access to the server keys.
-    ///
-    /// Both private and public keys are specified through file descriptors and both are read from
-    /// their respective file descriptors into process memory. A file descriptor based transport is
-    /// used because of the excessive size of Classic McEliece public keys (100kb and up).
-    ///
-    /// The file descriptors for the keys need not be backed by a file on disk. You can supply a
-    /// [memfd](https://man.archlinux.org/man/memfd.2.en) or [memfd_secret](https://man.archlinux.org/man/memfd_secret.2.en)
-    /// backed file descriptor if the server keys are not backed by a file system file.
-    fn supply_keypair(
-        &mut self,
-        req: &super::SupplyKeypairRequest,
-        req_fds: &mut VecDeque<OwnedFd>,
-        res: &mut super::SupplyKeypairResponse,
-    ) -> anyhow::Result<()>;
-
-    /// Supply a new UDP listen socket through file descriptor passing via the API
-    ///
-    /// This implements the handler for the [crate::api::RequestMsgType::AddListenSocket] API message.
-    ///
-    /// # File descriptors
-    ///
-    /// 1. The listen socket; must be backed by a UDP network listen socket
-    ///
-    /// # API Return Status
-    ///
-    /// 1. [crate::api::add_listen_socket_response_status::OK] - Indicates success
-    /// 2. [add_listen_socket_response_status::INVALID_REQUEST] – Malformed request; could be:
-    ///     - Missing file descriptors for public key
-    ///     - Invalid file descriptor type
-    /// 3. [crate::api::add_listen_socket_response_status::INTERNAL_ERROR] – Some other, non-fatal error
-    ///    occured. Check the logs on log
-    ///
-    /// # Description
-    ///
-    /// This endpoint allows you to supply a UDP listen socket; it will be used to perform
-    /// cryptographic key exchanges via the Rosenpass protocol.
-    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, PartialEq, Eq)]
-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 should_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().should_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,11 +0,0 @@
-//! The bulk code relating to the Rosenpass unix socket API
-
-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,6 +1,5 @@
 use anyhow::bail;
 
-use anyhow::Context;
 use anyhow::Result;
 use derive_builder::Builder;
 use log::{error, info, warn};
@@ -8,14 +7,7 @@ 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;
@@ -23,12 +15,8 @@ use zerocopy::AsBytes;
 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::net::Ipv4Addr;
 use std::net::Ipv6Addr;
 use std::net::SocketAddr;
@@ -40,7 +28,6 @@ use std::slice;
 use std::time::Duration;
 use std::time::Instant;
 
-use crate::protocol::BuildCryptoServer;
 use crate::protocol::HostIdentification;
 use crate::{
     config::Verbosity,
@@ -76,7 +63,7 @@ pub struct MioTokenDispenser {
 }
 
 impl MioTokenDispenser {
-    pub fn dispense(&mut self) -> Token {
+    fn dispense(&mut self) -> Token {
         let r = self.counter;
         self.counter += 1;
         Token(r)
@@ -85,7 +72,7 @@ impl MioTokenDispenser {
 
 #[derive(Debug, Default)]
 pub struct BrokerStore {
-    pub store: HashMap<
+    store: HashMap<
         Public<BROKER_ID_BYTES>,
         Box<dyn WireguardBrokerMio<Error = anyhow::Error, MioError = anyhow::Error>>,
     >,
@@ -151,30 +138,15 @@ pub struct AppServerTest {
     pub termination_handler: Option<std::sync::mpsc::Receiver<()>>,
 }
 
-#[derive(Debug, PartialEq, Eq, Copy, Clone)]
-pub enum AppServerIoSource {
-    Socket(usize),
-    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 {
-    #[cfg(feature = "internal_signal_handling_for_coverage_reports")]
-    pub term_signal: terminate::TerminateRequested,
-    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,
@@ -187,8 +159,6 @@ pub struct AppServer {
     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;
@@ -537,14 +507,15 @@ 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 events = mio::Events::with_capacity(20);
         let mut mio_token_dispenser = MioTokenDispenser::default();
 
         // bind each SocketAddr to a socket
@@ -619,32 +590,22 @@ 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();
-            mio_poll
-                .registry()
-                .register(socket, mio_token, Interest::READABLE)?;
-            let prev = io_source_index.insert(mio_token, AppServerIoSource::Socket(idx));
-            assert!(prev.is_none());
+        for socket in sockets.iter_mut() {
+            mio_poll.registry().register(
+                socket,
+                mio_token_dispenser.dispense(),
+                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 {
-            #[cfg(feature = "internal_signal_handling_for_coverage_reports")]
-            term_signal: terminate::TerminateRequested::new()?,
-            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(),
@@ -655,78 +616,48 @@ impl AppServer {
             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);
+            .register(
+                self.mio_poll.registry(),
+                self.mio_token_dispenser.dispense(),
+            )?;
 
         Ok(BrokerStorePtr(ptr))
     }
 
     pub fn unregister_broker(&mut self, ptr: BrokerStorePtr) -> Result<()> {
-        let mut broker = self
-            .brokers
+        //Unregister broker
+        self.brokers
+            .store
+            .get_mut(&ptr.0)
+            .ok_or_else(|| anyhow::anyhow!("Broker not found"))?
+            .unregister(self.mio_poll.registry())?;
+
+        //Remove broker from store
+        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_or_else(|| anyhow::anyhow!("Broker not found"))?;
         Ok(())
     }
 
@@ -738,13 +669,8 @@ impl AppServer {
         broker_peer: Option<BrokerPeer>,
         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()?;
@@ -758,35 +684,18 @@ impl AppServer {
         Ok(AppPeerPtr(pn))
     }
 
-    pub fn event_loop(&mut self) -> anyhow::Result<()> {
+    pub fn listen_loop(&mut self) -> anyhow::Result<()> {
         const INIT_SLEEP: f64 = 0.01;
         const MAX_FAILURES: i32 = 10;
         let mut failure_cnt = 0;
 
         loop {
             let msgs_processed = 0usize;
-            let err = match self.event_loop_without_error_handling() {
+            let err = match self.event_loop() {
                 Ok(()) => return Ok(()),
                 Err(e) => e,
             };
 
-            #[cfg(feature = "internal_signal_handling_for_coverage_reports")]
-            {
-                let terminated_by_signal = err
-                    .downcast_ref::<std::io::Error>()
-                    .filter(|e| e.kind() == std::io::ErrorKind::Interrupted)
-                    .filter(|_| self.term_signal.value())
-                    .is_some();
-                if terminated_by_signal {
-                    log::warn!(
-                        "\
-                        Terminated by signal; this signal handler is correct during coverage testing \
-                        but should be otherwise disabled"
-                    );
-                    return Ok(());
-                }
-            }
-
             // This should not happen…
             failure_cnt = if msgs_processed > 0 {
                 0
@@ -803,7 +712,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;
             }
 
@@ -811,7 +720,7 @@ impl AppServer {
         }
     }
 
-    pub fn event_loop_without_error_handling(&mut self) -> anyhow::Result<()> {
+    pub fn event_loop(&mut self) -> anyhow::Result<()> {
         let (mut rx, mut tx) = (MsgBuf::zero(), MsgBuf::zero());
 
         /// if socket address for peer is known, call closure
@@ -846,31 +755,16 @@ impl AppServer {
                 }
             }
 
-            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
@@ -884,15 +778,12 @@ impl AppServer {
                     );
                 }
 
-                (CryptoSrv::Missing, ReceivedMessage(_, _)) => {}
-                (CryptoSrv::Avail, ReceivedMessage(len, endpoint)) => {
+                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)
-                        }
+                        DoSOperation::Normal => self.crypt.handle_msg(&rx[..len], &mut *tx),
                     };
                     match msg_result {
                         Err(ref e) => {
@@ -920,8 +811,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)?)?;
                             }
                         }
                     }
@@ -937,9 +827,9 @@ impl AppServer {
         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::SocketBoundAddress(socket) => {
+                self.crypt.handle_msg_under_load(rx, &mut *tx, socket)
+            }
             Endpoint::Discovery(_) => {
                 anyhow::bail!("Host-path discovery is not supported under load")
             }
@@ -952,7 +842,7 @@ impl AppServer {
         why: KeyOutputReason,
         key: &SymKey,
     ) -> anyhow::Result<()> {
-        let peerid = peer.lower().get(self.crypto_server()?).pidt()?;
+        let peerid = peer.lower().get(&self.crypt).pidt()?;
 
         if self.verbose() {
             let msg = match why {
@@ -980,14 +870,10 @@ 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()?;
+            );
         }
 
         peer.set_psk(self, key)?;
@@ -998,32 +884,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
@@ -1061,33 +932,22 @@ 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(());
-            }
+        if self.all_sockets_drained {
+            //Non blocked polling
+            self.mio_poll
+                .poll(&mut self.events, Some(Duration::from_secs(0)))?;
 
-            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
+            if self.events.iter().peekable().peek().is_none() {
+                // if there are no events, then add to blocking poll count
+                self.blocking_polls_count += 1;
+                //Execute blocking poll
+                self.mio_poll.poll(&mut self.events, Some(timeout))?;
+            } else {
                 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(())
-        })?;
+        } else {
+            self.unpolled_count += 1;
+        }
 
         if let Some(AppServerTest {
             enable_dos_permanently: true,
@@ -1122,58 +982,26 @@ impl AppServer {
             }
         }
 
-        // 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(SocketBoundEndpoint::new(
+                            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()),
             }
         }
 
@@ -1185,172 +1013,6 @@ impl AppServer {
             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)>> {
-        match io_source {
-            AppServerIoSource::Socket(idx) => self
-                .try_recv_from_listen_socket(buf, idx)
-                .substitute_for_ioerr_wouldblock(None)?
-                .ok(),
-
-            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) => {
-                use crate::api::mio::MioManagerContext;
-
-                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
-    }
-}
-
-/// These signal handlers are used exclusively used during coverage testing
-/// to ensure that the llvm-cov can produce reports during integration tests
-/// with multiple processes where subprocesses are terminated via kill(2).
-///
-/// llvm-cov does not support producing coverage reports when the process exits
-/// through a signal, so this is necessary.
-///
-/// The functionality of exiting gracefully upon reception of a terminating signal
-/// is desired for the production variant of Rosenpass, but we should make sure
-/// to use a higher quality implementation; in particular, we should use signalfd(2).
-///
-#[cfg(feature = "internal_signal_handling_for_coverage_reports")]
-mod terminate {
-    use signal_hook::flag::register as sig_register;
-    use std::sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    };
-
-    /// Automatically register a signal handler for common termination signals;
-    /// whether one of these signals was issued can be polled using [Self::value].
-    ///
-    /// The signal handler is not removed when this struct goes out of scope.
-    #[derive(Debug)]
-    pub struct TerminateRequested {
-        value: Arc<AtomicBool>,
-    }
-
-    impl TerminateRequested {
-        /// Register signal handlers watching for common termination signals
-        pub fn new() -> anyhow::Result<Self> {
-            let value = Arc::new(AtomicBool::new(false));
-            for sig in signal_hook::consts::TERM_SIGNALS.iter().copied() {
-                sig_register(sig, Arc::clone(&value))?;
-            }
-            Ok(Self { value })
-        }
-
-        /// Check whether a termination signal has been set
-        pub fn value(&self) -> bool {
-            self.value.load(Ordering::Relaxed)
-        }
-    }
 }

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

@@ -1,97 +0,0 @@
-use anyhow::{Context, Result};
-use heck::ToShoutySnakeCase;
-
-use rosenpass_ciphers::{hash_domain::HashDomain, KEY_LEN};
-
-/// Recursively calculate a concrete hash value for an API message type
-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()),
-    }
-}
-
-/// Print a hash literal for pasting into the Rosenpass source code
-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(())
-}
-
-/// Tree of domain separators where each leaf represents
-/// an API message ID
-#[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(&[])
-    }
-}
-
-/// Helper for generating hash-based message IDs for the IPC API
-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,18 +1,15 @@
-//! Contains the code used to parse command line parameters for rosenpass.
-//!
-//! [CliArgs::run] is called by the rosenpass main function and contains the
-//! bulk of our boostrapping code while the main function just sets up the basic environment
-
-use anyhow::{bail, ensure, Context};
+use anyhow::{bail, ensure};
 use clap::{Parser, Subcommand};
 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_secret_memory::{
+    secret_policy_try_use_memfd_secrets, secret_policy_use_only_malloc_secrets,
+};
+use rosenpass_util::file::{LoadValue, LoadValueB64};
 use rosenpass_wireguard_broker::brokers::native_unix::{
     NativeUnixBroker, NativeUnixBrokerConfigBaseBuilder, NativeUnixBrokerConfigBaseBuilderError,
 };
-use std::ops::DerefMut;
 use std::path::PathBuf;
 
 use crate::app_server::AppServerTest;
@@ -21,109 +18,27 @@ 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::net::{socketpair, AddressFamily, SocketFlags, SocketType},
-    std::os::fd::AsRawFd,
-    std::os::unix::net,
-    std::process::Command,
-    std::thread,
-};
-
-/// How to reach a WireGuard PSK Broker
-#[derive(Debug)]
-pub enum BrokerInterface {
-    /// The PSK Broker is listening on a unix socket at the given path
-    Socket(PathBuf),
-    /// The PSK Broker broker is already connected to this process; a
-    /// unix socket stream can be reached at the given file descriptor.
-    ///
-    /// This is generally used with file descriptor passing.
-    FileDescriptor(i32),
-    /// Create a socketpair(3p), spawn the PSK broker process from within rosenpass,
-    /// and hand one end of the socketpair to the broker process via file
-    /// descriptor passing to the subprocess
-    SocketPair,
-}
-
-/// Command line arguments to the Rosenpass binary.
-///
-/// Used for parsing with [clap].
+/// struct holding all CLI arguments for `clap` crate to parse
 #[derive(Parser, Debug)]
-#[command(author, version, about, long_about, arg_required_else_help = true)]
+#[command(author, version, about, long_about)]
 pub struct CliArgs {
-    /// Lowest log level to show
+    /// 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"
+    /// 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"
+    /// 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>,
-
-    /// File descriptor of the `wireguard_psk` 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,
-
-    /// The subcommand to be invoked
     #[command(subcommand)]
-    pub command: Option<CliCommand>,
-
-    /// Generate man pages for the CLI
-    ///
-    /// This option is used to generate man pages for Rosenpass in the specified
-    /// directory and exit.
-    #[clap(long, value_name = "out_dir")]
-    pub generate_manpage: Option<PathBuf>,
-
-    /// Generate completion file for a shell
-    ///
-    /// This option is used to generate completion files for the specified shell
-    #[clap(long, value_name = "shell")]
-    pub print_completions: Option<clap_complete::Shell>,
+    pub command: CliCommand,
 }
 
 impl CliArgs {
-    /// Apply the command line parameters to the Rosenpass configuration struct
-    ///
-    /// Generally the flow of control here is that all the command line parameters
-    /// are merged into the configuration file to avoid much code duplication.
-    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
     ///
@@ -135,57 +50,32 @@ impl CliArgs {
             return Some(log::LevelFilter::Info);
         }
         if self.quiet {
-            return Some(log::LevelFilter::Warn);
+            return Some(log::LevelFilter::Error);
         }
         if let Some(level_filter) = self.log_level {
             return Some(level_filter);
         }
         None
     }
-
-    /// Return the WireGuard PSK broker interface configured.
-    ///
-    /// Returns `None` if the `experiment_api` feature is disabled.
-
-    #[cfg(feature = "experiment_api")]
-    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
-        }
-    }
-
-    /// Return the WireGuard PSK broker interface configured.
-    ///
-    /// Returns `None` if the `experiment_api` feature is disabled.
-    #[cfg(not(feature = "experiment_api"))]
-    pub fn get_broker_interface(&self) -> Option<BrokerInterface> {
-        None
-    }
 }
 
 /// represents a command specified via CLI
 #[derive(Subcommand, Debug)]
 pub enum CliCommand {
-    /// Start Rosenpass key exchanges based on a configuration file
+    /// Start Rosenpass in server mode and carry on with the key exchange
     ///
-    /// This will parse the configuration file and perform key exchanges with
-    /// the specified peers. If a peer's endpoint is specified, this Rosenpass
-    /// instance will try to initiate a key exchange with the peer; otherwise,
-    /// only initiation attempts from other peers will be responded to.
+    /// This will parse the configuration file and perform the key exchange
+    /// with the specified peers. If a peer's endpoint is specified, this
+    /// Rosenpass instance will try to initiate a key exchange with the peer,
+    /// otherwise only initiation attempts from the peer will be responded to.
     ExchangeConfig { config_file: PathBuf },
 
-    /// Start Rosenpass key exchanges based on command line arguments
+    /// Start in daemon mode, performing key exchanges
     ///
-    /// The configuration is read from the command line. The `peer` token always
-    /// separates multiple peers, e.g., if the token `peer` appears in the
-    /// WIREGUARD_EXTRA_ARGS, it is not put into the WireGuard arguments but
-    /// instead a new peer is created.
+    /// The configuration is read from the command line. The `peer` token
+    /// always separates multiple peers, e. g. if the token `peer` appears
+    /// in the WIREGUARD_EXTRA_ARGS it is not put into the WireGuard arguments
+    /// but instead a new peer is created.
     /* Explanation: `first_arg` and `rest_of_args` are combined into one
      * `Vec<String>`. They are only used to trick clap into displaying some
      * guidance on the CLI usage.
@@ -214,10 +104,7 @@ pub enum CliCommand {
         config_file: Option<PathBuf>,
     },
 
-    /// Generate a demo config file for Rosenpass
-    ///
-    /// The generated config file will contain a single peer and all common
-    /// options.
+    /// Generate a demo config file
     GenConfig {
         config_file: PathBuf,
 
@@ -226,19 +113,19 @@ pub enum CliCommand {
         force: bool,
     },
 
-    /// Generate secret & public key for Rosenpass
+    /// Generate the keys mentioned in a configFile
     ///
-    /// Generates secret & public key to their destination. If a config file is
-    /// provided then the key file destination is taken from there, otherwise
-    /// the destination is taken from the CLI arguments.
+    /// Generates secret- & public-key to their destination. If a config file
+    /// is provided then the key file destination is taken from there.
+    /// Otherwise the
     GenKeys {
         config_file: Option<PathBuf>,
 
-        /// Where to write public key to
+        /// where to write public-key to
         #[clap(short, long)]
         public_key: Option<PathBuf>,
 
-        /// Where to write secret key to
+        /// where to write secret-key to
         #[clap(short, long)]
         secret_key: Option<PathBuf>,
 
@@ -247,59 +134,67 @@ pub enum CliCommand {
         force: bool,
     },
 
-    /// Validate a configuration file
-    ///
-    /// This command will validate the configuration file and print any errors
-    /// it finds. If the configuration file is valid, it will print a success.
-    /// Defined secret & public keys are checked for existence and validity.
-    Validate { config_files: Vec<PathBuf> },
-
-    /// DEPRECATED - use the gen-keys command instead
+    /// Deprecated - use gen-keys instead
     #[allow(rustdoc::broken_intra_doc_links)]
     #[allow(rustdoc::invalid_html_tags)]
-    #[command(hide = true)]
     Keygen {
-        // NOTE yes, the legacy keygen argument initially really accepted
-        // "private-key", not "secret-key"!
+        // 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> },
+
+    /// Show the rosenpass manpage
+    // TODO make this the default, but only after the manpage has been adjusted once the CLI stabilizes
+    Man,
 }
 
-impl CliArgs {
-    /// Run Rosenpass with the given command line parameters
+impl CliCommand {
+    /// runs the command specified via CLI
     ///
-    /// This contains the bulk of our startup logic with
-    /// the main function just setting up the basic environment
-    /// and then calling this function.
-    pub fn run(
-        self,
-        broker_interface: Option<BrokerInterface>,
-        test_helpers: Option<AppServerTest>,
-    ) -> anyhow::Result<()> {
-        // TODO: This method consumes the [`CliCommand`] value. It might be wise to use a reference...
+    /// ## TODO
+    /// - This method consumes the [`CliCommand`] value. It might be wise to use a reference...
+    pub fn run(self, test_helpers: Option<AppServerTest>) -> anyhow::Result<()> {
+        //Specify secret policy
+
+        #[cfg(feature = "enable_memfd_alloc")]
+        secret_policy_try_use_memfd_secrets();
+        #[cfg(not(feature = "enable_memfd_alloc"))]
+        secret_policy_use_only_malloc_secrets();
+
         use CliCommand::*;
-        match &self.command {
-            Some(GenConfig { config_file, force }) => {
+        match self {
+            Man => {
+                let man_cmd = std::process::Command::new("man")
+                    .args(["1", "rosenpass"])
+                    .status();
+
+                if !(man_cmd.is_ok() && man_cmd.unwrap().success()) {
+                    println!(include_str!(env!("ROSENPASS_MAN")));
+                }
+            }
+            GenConfig { config_file, force } => {
                 ensure!(
-                    *force || !config_file.exists(),
+                    force || !config_file.exists(),
                     "config file {config_file:?} already exists"
                 );
 
-                std::fs::write(config_file, config::EXAMPLE_CONFIG)?;
+                config::Rosenpass::example_config().store(config_file)?;
             }
 
             // Deprecated - use gen-keys instead
-            Some(Keygen { args }) => {
+            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();
+                let mut args = args.into_iter();
                 loop {
-                    match (args.next().map(|x| x.as_str()), args.next()) {
+                    match (args.next().as_deref(), args.next()) {
                         (Some("private-key"), Some(opt)) | (Some("secret-key"), Some(opt)) => {
                             secret_key = Some(opt.into());
                         }
@@ -323,12 +218,12 @@ impl CliArgs {
                 generate_and_save_keypair(secret_key.unwrap(), public_key.unwrap())?;
             }
 
-            Some(GenKeys {
+            GenKeys {
                 config_file,
                 public_key,
                 secret_key,
                 force,
-            }) => {
+            } => {
                 // figure out where the key file is specified, in the config file or directly as flag?
                 let (pkf, skf) = match (config_file, public_key, secret_key) {
                     (Some(config_file), _, _) => {
@@ -338,13 +233,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")
                     }
@@ -354,14 +246,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() {
@@ -372,93 +262,72 @@ impl CliArgs {
                 generate_and_save_keypair(skf, pkf)?;
             }
 
-            Some(ExchangeConfig { config_file }) => {
+            ExchangeConfig { config_file } => {
                 ensure!(
                     config_file.exists(),
                     "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, test_helpers)?;
             }
 
-            Some(Exchange {
+            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, test_helpers)?;
             }
 
-            Some(Validate { config_files }) => {
+            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"),
-                                Err(err) => eprintln!("{file:?} contains logical errors: '{err}'"),
+                                Err(_) => eprintln!("{file:?} contains logical errors"),
                             }
                         }
                         Err(e) => eprintln!("{file:?} is not valid: {e}"),
                     }
                 }
             }
-
-            &None => {} // calp print help if no command is given
         }
 
         Ok(())
     }
 
-    /// Used by [Self::run] to start the Rosenpass key exchange server
     fn event_loop(
         config: config::Rosenpass,
-        broker_interface: Option<BrokerInterface>,
         test_helpers: Option<AppServerTest>,
     ) -> anyhow::Result<()> {
         const MAX_PSK_SIZE: usize = 1000;
-
         // 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)?;
+        let broker_store_ptr = srv.register_broker(Box::new(NativeUnixBroker::new()))?;
 
         fn cfg_err_map(e: NativeUnixBrokerConfigBaseBuilderError) -> anyhow::Error {
             anyhow::Error::msg(format!("NativeUnixBrokerConfigBaseBuilderError: {:?}", e))
@@ -495,132 +364,13 @@ impl CliArgs {
 
         srv.event_loop()
     }
-
-    /// Create the WireGuard PSK broker to be used by
-    /// [crate::app_server::AppServer].
-    ///
-    /// If the `experiment_api`
-    /// feature flag is set, then this communicates with a PSK broker
-    /// running in a different process as configured via
-    /// the `psk_broker_path`, `psk_broker_fd`, and `psk_broker_spawn`
-    /// fields.
-    ///
-    /// If the `experiment_api`
-    /// feature flag is not set, then this returns a [NativeUnixBroker],
-    /// sending pre-shared keys directly to WireGuard from within this
-    /// process.
-    #[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()))
-        }
-    }
-
-    /// Create the WireGuard PSK broker to be used by
-    /// [crate::app_server::AppServer].
-    ///
-    /// If the `experiment_api`
-    /// feature flag is set, then this communicates with a PSK broker
-    /// running in a different process as configured via
-    /// the `psk_broker_path`, `psk_broker_fd`, and `psk_broker_spawn`
-    /// fields.
-    ///
-    /// If the `experiment_api`
-    /// feature flag is not set, then this returns a [NativeUnixBroker],
-    /// sending pre-shared keys directly to WireGuard from within this
-    /// process.
-    #[cfg(not(feature = "experiment_api"))]
-    fn create_broker(
-        _broker_interface: Option<BrokerInterface>,
-    ) -> Result<Box<NativeUnixBroker>, anyhow::Error> {
-        Ok(Box::new(NativeUnixBroker::new()))
-    }
-
-    /// Used by [Self::create_broker] if the `experiment_api` is configured
-    /// to set up the connection with the PSK broker process as configured
-    /// via the `psk_broker_path`, `psk_broker_fd`, and `psk_broker_spawn`
-    /// fields.
-    #[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
-pub fn generate_and_save_keypair(secret_key: PathBuf, public_key: PathBuf) -> anyhow::Result<()> {
+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())?;
+    StaticKem::keygen(ssk.secret_mut(), spk.secret_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

@@ -4,11 +4,9 @@
 //! [`Rosenpass`] which holds such a configuration.
 //!
 //! ## TODO
-//! - TODO: support `~` in <https://github.com/rosenpass/rosenpass/issues/237>
-//! - TODO: provide tooling to create config file from shell <https://github.com/rosenpass/rosenpass/issues/247>
+//! - 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 crate::protocol::{SPk, SSk};
-use rosenpass_util::file::LoadValue;
 use std::{
     collections::HashSet,
     fs,
@@ -21,39 +19,18 @@ use anyhow::{bail, ensure};
 use rosenpass_util::file::{fopen_w, Visibility};
 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(),
-    }
-}
-
-/// Configuration for the Rosenpass key exchange
-///
-/// i.e. configuration for the `rosenpass exchange` and `rosenpass exchange-config` commands
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[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>,
+    /// path to the public key file
+    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,
+    /// path to the secret key file
+    pub secret_key: PathBuf,
 
     /// list of [`SocketAddr`] to listen on
     ///
     /// Examples:
-    ///
-    /// - `0.0.0.0:123` – Listen on any interface using IPv4, port 123
-    /// - `[::1]:1234` – Listen on IPv6 localhost, port 1234
-    /// - `[::]:4476` – Listen on any IPv4 or IPv6 interface, port 4476
+    /// - `0.0.0.0:123`
     pub listen: Vec<SocketAddr>,
 
     /// log verbosity
@@ -75,99 +52,61 @@ pub struct Rosenpass {
     pub config_file_path: PathBuf,
 }
 
-/// Public key and secret key locations.
-#[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 {
-    /// Construct a keypair from its fields
-    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,
-        }
-    }
-}
-
-/// Level of verbosity for [crate::app_server::AppServer]
-///
-/// The value of the field [crate::app_server::AppServer::verbosity]. See the field documentation
-/// for details.
-///
-/// - TODO: replace this type with [`log::LevelFilter`], also see <https://github.com/rosenpass/rosenpass/pull/246>
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Copy, Clone)]
+/// ## TODO
+/// - replace this type with [`log::LevelFilter`], also see <https://github.com/rosenpass/rosenpass/pull/246>
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Verbosity {
     Quiet,
     Verbose,
 }
 
-/// Configuration data for a single Rosenpass peer
+/// ## 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,
 
-    /// The hostname and port to connect to
-    ///
-    /// Can be a
-    ///
-    /// - hostname and port, e.g. `localhost:8876` or `rosenpass.eu:1427`
-    /// - IPv4 address and port, e.g. `1.2.3.4:7764`
-    /// - IPv6 address and port, e.g. `[fe80::24]:7890`
+    /// ## TODO
+    /// - documentation
     pub endpoint: Option<String>,
 
-    /// path to the pre-shared key shared with the peer
+    /// 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>,
 
-    /// If this field is set to a path, the Rosenpass will write the exchanged symmetric keys
-    /// to the given file and write a notification to standard out to let the calling application
-    /// know that a new key was exchanged
+    /// ## TODO
+    /// - documentation
     #[serde(default)]
     pub key_out: Option<PathBuf>,
 
-    /// Information for supplying exchanged keys directly to WireGuard
+    /// ## TODO
+    /// - documentation
+    /// - make this field only available on binary builds, not on library builds <https://github.com/rosenpass/rosenpass/issues/249>
     #[serde(flatten)]
     pub wg: Option<WireGuard>,
 }
 
-/// Information for supplying exchanged keys directly to WireGuard
+/// ## TODO
+/// - documentation
 #[derive(Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct WireGuard {
-    /// Name of the WireGuard interface to supply with pre-shared keys generated by the Rosenpass
-    /// key exchange
+    /// ## TODO
+    /// - documentation
     pub device: String,
 
-    /// WireGuard public key of the peer to supply with pre-shared keys
+    /// ## TODO
+    /// - documentation
     pub peer: String,
 
-    /// Extra parameters passed to the `wg` command
+    /// ## TODO
+    /// - documentation
     #[serde(default)]
     pub extra_params: Vec<String>,
 }
 
-impl Default for Rosenpass {
-    /// Generate an empty configuration
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_new.rs")]
-    #[doc = "```"]
-    fn default() -> Self {
-        Self::empty()
-    }
-}
-
 impl Rosenpass {
     /// load configuration from a TOML file
     ///
@@ -175,25 +114,16 @@ impl Rosenpass {
     /// checked whether they even exist.
     ///
     /// ## TODO
-    ///
     /// - consider using a different algorithm to determine home directory – the below one may
     ///   behave unexpectedly on Windows
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_store.rs")]
-    #[doc = "```"]
     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);
-        }
+        resolve_path_with_tilde(&mut config.public_key);
+        resolve_path_with_tilde(&mut config.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 {
@@ -211,13 +141,7 @@ impl Rosenpass {
         Ok(config)
     }
 
-    /// Encode a configuration object as toml and write it to a file
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_store.rs")]
-    #[doc = "```"]
+    /// Write a config to a file
     pub fn store<P: AsRef<Path>>(&self, p: P) -> anyhow::Result<()> {
         let serialized_config =
             toml::to_string_pretty(&self).expect("unable to serialize the default config");
@@ -226,12 +150,6 @@ impl Rosenpass {
     }
 
     /// Commit the configuration to where it came from, overwriting the original file
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_store.rs")]
-    #[doc = "```"]
     pub fn commit(&self) -> anyhow::Result<()> {
         let mut f = fopen_w(&self.config_file_path, Visibility::Public)?;
         f.write_all(toml::to_string_pretty(&self)?.as_bytes())?;
@@ -239,51 +157,25 @@ impl Rosenpass {
         self.store(&self.config_file_path)
     }
 
-    /// Apply the configuration in this object to the given [crate::app_server::AppServer]
-    pub fn apply_to_app_server(&self, _srv: &mut AppServer) -> anyhow::Result<()> {
-        #[cfg(feature = "experiment_api")]
-        self.api.apply_to_app_server(_srv)?;
-        Ok(())
-    }
-
-    /// Check that the configuration is sound, ensuring
-    /// for instance that the referenced files exist
+    /// Validate a configuration
     ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_validate.rs")]
-    #[doc = "```"]
+    /// ## 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. Consider running `rosenpass gen-keys` to generate a new keypair.",
-                keypair.public_key
-            );
+        // check the public key file exists
+        ensure!(
+            self.public_key.is_file(),
+            "could not find public-key file {:?}: no such file",
+            self.public_key
+        );
 
-            // check the public-key file is a valid key
-            ensure!(
-                SPk::load(&keypair.public_key).is_ok(),
-                "could not load public-key file {:?}: invalid key",
-                keypair.public_key
-            );
-
-            // check the secret-key file exists
-            ensure!(
-                keypair.secret_key.is_file(),
-                "could not find secret-key file {:?}: no such file. Consider running `rosenpass gen-keys` to generate a new keypair.",
-                keypair.secret_key
-            );
-
-            // check the secret-key file is a valid key
-            ensure!(
-                SSk::load(&keypair.secret_key).is_ok(),
-                "could not load public-key file {:?}: invalid key",
-                keypair.secret_key
-            );
-        }
+        // check the secret-key file exists
+        ensure!(
+            self.secret_key.is_file(),
+            "could not find secret-key file {:?}: no such file",
+            self.secret_key
+        );
 
         for (i, peer) in self.peers.iter().enumerate() {
             // check peer's public-key file exists
@@ -293,13 +185,6 @@ impl Rosenpass {
                 peer.public_key
             );
 
-            // check peer's public-key file is a valid key
-            ensure!(
-                SPk::load(&peer.public_key).is_ok(),
-                "peer {i} public-key file {:?} is invalid",
-                peer.public_key
-            );
-
             // check endpoint is usable
             if let Some(addr) = peer.endpoint.as_ref() {
                 ensure!(
@@ -309,95 +194,18 @@ impl Rosenpass {
                 );
             }
 
-            // check if `key_out` or `device` and `peer` are defined
-            if peer.key_out.is_none() {
-                if let Some(wg) = &peer.wg {
-                    if wg.device.is_empty() || wg.peer.is_empty() {
-                        ensure!(
-                            false,
-                            "peer {i} has neither `key_out` nor valid wireguard config defined"
-                        );
-                    }
-                } else {
-                    ensure!(
-                        false,
-                        "peer {i} has neither `key_out` nor valid wireguard config defined"
-                    );
-                }
-            }
+            // TODO warn if neither out_key nor exchange_command is defined
         }
 
         Ok(())
     }
 
-    /// Check that the configuration is useful given the feature set Rosenpass was compiled with
-    /// and the configuration values.
-    ///
-    /// This was introduced when we introduced a unix-socket API feature allowing the server
-    /// keypair to be supplied via the API; in this process we also made [Self::keypair] optional.
-    /// With respect to this particular feature, this function ensures that [Self::keypair] is set
-    /// when Rosenpass is compiles without the `experiment_api` flag. When `experiment_api` is
-    /// used, the function ensures that [Self::keypair] is only `None`, if the Rosenpass API is
-    /// enabled in the configuration.
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_validate.rs")]
-    #[doc = "```"]
-    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(())
-    }
-
-    /// Produce an empty confuguration
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_new.rs")]
-    #[doc = "```"]
-    pub fn empty() -> Self {
-        Self::new(None)
-    }
-
-    /// Produce configuration from the keypair
-    ///
-    /// Shorthand for calling [Self::new] with Some([Keypair]::new(sk, pk)).
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_new.rs")]
-    #[doc = "```"]
-    pub fn from_sk_pk<Sk: AsRef<Path>, Pk: AsRef<Path>>(sk: Sk, pk: Pk) -> Self {
-        Self::new(Some(Keypair::new(pk, sk)))
-    }
-
-    /// Initialize a minimal configuration with the [Self::keypair] field supplied
-    /// as a parameter
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_new.rs")]
-    #[doc = "```"]
-    pub fn new(keypair: Option<Keypair>) -> Self {
+    /// Creates a new configuration
+    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(),
@@ -405,14 +213,6 @@ impl Rosenpass {
     }
 
     /// Add IPv4 __and__ IPv6 IF_ANY address to the listen interfaces
-    ///
-    /// I.e. listen on any interface.
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_add_if_any.rs")]
-    #[doc = "```"]
     pub fn add_if_any(&mut self, port: u16) {
         let ipv4_any = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), port));
         let ipv6_any = SocketAddr::V6(SocketAddrV6::new(
@@ -425,22 +225,10 @@ impl Rosenpass {
         self.listen.push(ipv6_any);
     }
 
-    /// Parser for the old, IP style grammar.
-    ///
-    /// See out manual page rosenpass-exchange(1) on details about the grammar.
-    ///
-    /// This function parses the grammar and turns it into an instance of the configuration
-    /// struct.
-    ///
-    /// TODO: the grammar is undecidable, what do we do here?
-    ///
-    /// # Examples
-    ///
-    #[doc = "```ignore"]
-    #[doc = include_str!("../tests/config_Rosenpass_parse_args_simple.rs")]
-    #[doc = "```"]
+    /// 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 {
@@ -501,7 +289,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) => {
@@ -509,7 +297,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) => {
@@ -628,146 +416,72 @@ impl Rosenpass {
     }
 }
 
+impl Rosenpass {
+    /// Generate an example configuration
+    pub fn example_config() -> Self {
+        let peer = RosenpassPeer {
+            public_key: "/path/to/rp-peer-public-key".into(),
+            endpoint: Some("my-peer.test:9999".into()),
+            key_out: Some("/path/to/rp-key-out.txt".into()),
+            pre_shared_key: Some("additional pre shared key".into()),
+            wg: Some(WireGuard {
+                device: "wirgeguard device e.g. wg0".into(),
+                peer: "wireguard public key".into(),
+                extra_params: vec!["passed to".into(), "wg set".into()],
+            }),
+        };
+
+        Self {
+            public_key: "/path/to/rp-public-key".into(),
+            secret_key: "/path/to/rp-secret-key".into(),
+            peers: vec![peer],
+            ..Self::new("", "")
+        }
+    }
+}
+
 impl Default for Verbosity {
-    /// Self::Quiet
     fn default() -> Self {
         Self::Quiet
     }
 }
 
-/// Example configuration generated by the command `rosenpass gen-config <TOML-FILE>`.
-pub static EXAMPLE_CONFIG: &str = r###"public_key = "/path/to/rp-public-key"
-secret_key = "/path/to/rp-secret-key"
-listen = []
-verbosity = "Verbose"
-
-[[peers]]
-# Commented out fields are optional
-public_key = "/path/to/rp-peer-public-key"
-endpoint = "127.0.0.1:9998"
-# pre_shared_key = "/path/to/preshared-key"
-
-# Choose to store the key in a file via `key_out` or pass it to WireGuard by
-# defining `device` and `peer`. You may choose to do both.
-key_out = "/path/to/rp-key-out.txt" # path to store the key
-# device = "wg0" # WireGuard interface
-#peer = "RULdRAtUw7SFfVfGD..." # WireGuard public key
-# extra_params = [] # passed to WireGuard `wg set`
-"###;
-
 #[cfg(test)]
 mod test {
-
     use super::*;
-    use std::borrow::Borrow;
-
-    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(())
-    }
+    use std::net::IpAddr;
 
     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 = []
+    fn test_simple_cli_parse() {
+        let args = split_str(
+            "public-key /my/public-key secret-key /my/secret-key verbose \
+                listen 0.0.0.0:9999 peer public-key /peer/public-key endpoint \
+                peer.test:9999 outfile /peer/rp-out",
+        );
 
-            [api]
-            listen_path = []
-            listen_fd = []
-            stream_fd = []
-        "#,
-        )?;
+        let config = Rosenpass::parse_args(args).unwrap();
 
-        #[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(())
+        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,
+            &vec![SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 9999)]
+        );
+        assert_eq!(
+            config.peers,
+            vec![RosenpassPeer {
+                public_key: PathBuf::from("/peer/public-key"),
+                endpoint: Some("peer.test:9999".into()),
+                pre_shared_key: None,
+                key_out: Some(PathBuf::from("/peer/rp-out")),
+                ..Default::default()
+            }]
+        )
     }
 
     #[test]
@@ -781,10 +495,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!(

rosenpass/src/hash_domains.rs

@@ -1,68 +1,13 @@
 //! Pseudo Random Functions (PRFs) with a tree-like label scheme which
-//! ensures their uniqueness.
-//!
-//! This ensures [domain separation](https://en.wikipedia.org/wiki/Domain_separation) is used
-//! across the Rosenpass protocol.
-//!
-//! There is a chart containing all hash domains used in Rosenpass in the
-//! [whitepaper](https://rosenpass.eu/whitepaper.pdf) ([/papers/whitepaper.md] in this repository).
-//!
-//! # Tutorial
-//!
-//! ```
-//! use rosenpass::{hash_domain, hash_domain_ns};
-//! use rosenpass::hash_domains::protocol;
-//!
-//! // Declaring a custom hash domain
-//! hash_domain_ns!(protocol, custom_domain, "my custom hash domain label");
-//!
-//! // Declaring a custom hashers
-//! hash_domain_ns!(custom_domain, hashers, "hashers");
-//! hash_domain_ns!(hashers, hasher1, "1");
-//! hash_domain_ns!(hashers, hasher2, "2");
-//!
-//! // Declaring specific domain separators
-//! hash_domain_ns!(custom_domain, domain_separators, "domain separators");
-//! hash_domain!(domain_separators, sep1, "1");
-//! hash_domain!(domain_separators, sep2, "2");
-//!
-//! // Generating values under hasher1 with both domain separators
-//! let h1 = hasher1()?.mix(b"some data")?.dup();
-//! let h1v1 = h1.mix(&sep1()?)?.mix(b"More data")?.into_value();
-//! let h1v2 = h1.mix(&sep2()?)?.mix(b"More data")?.into_value();
-//!
-//! // Generating values under hasher2 with both domain separators
-//! let h2 = hasher2()?.mix(b"some data")?.dup();
-//! let h2v1 = h2.mix(&sep1()?)?.mix(b"More data")?.into_value();
-//! let h2v2 = h2.mix(&sep2()?)?.mix(b"More data")?.into_value();
-//!
-//! // All of the domain separators are now different, random strings
-//! let values = [h1v1, h1v2, h2v1, h2v2];
-//! for i in 0..values.len() {
-//!     for j in (i+1)..values.len() {
-//!         assert_ne!(values[i], values[j]);
-//!     }
-//! }
-//!
-//! Ok::<(), anyhow::Error>(())
-//! ```
+//! ensures their uniqueness
 
 use anyhow::Result;
-use rosenpass_ciphers::hash_domain::HashDomain;
+use rosenpass_ciphers::{hash_domain::HashDomain, KEY_LEN};
 
-/// Declare a hash function
-///
-/// # Examples
-///
-/// See the source file for details about how this is used concretely.
-///
-/// See the [module](self) documentation on how to use the hash domains in general
 // TODO Use labels that can serve as identifiers
-#[macro_export]
 macro_rules! hash_domain_ns {
-    ($(#[$($attrss:tt)*])* $base:ident, $name:ident, $($lbl:expr),+ ) => {
-        $(#[$($attrss)*])*
-        pub fn $name() -> ::anyhow::Result<::rosenpass_ciphers::hash_domain::HashDomain> {
+    ($base:ident, $name:ident, $($lbl:expr),* ) => {
+        pub fn $name() -> Result<HashDomain> {
             let t = $base()?;
             $( let t = t.mix($lbl.as_bytes())?; )*
             Ok(t)
@@ -70,18 +15,9 @@ macro_rules! hash_domain_ns {
     }
 }
 
-/// Declare a concrete hash value
-///
-/// # Examples
-///
-/// See the source file for details about how this is used concretely.
-///
-/// See the [module](self) documentation on how to use the hash domains in general
-#[macro_export]
 macro_rules! hash_domain {
-    ($(#[$($attrss:tt)*])* $base:ident, $name:ident, $($lbl:expr),+ ) => {
-        $(#[$($attrss)*])*
-        pub fn $name() -> ::anyhow::Result<[u8; ::rosenpass_ciphers::KEY_LEN]> {
+    ($base:ident, $name:ident, $($lbl:expr),* ) => {
+        pub fn $name() -> Result<[u8; KEY_LEN]> {
             let t = $base()?;
             $( let t = t.mix($lbl.as_bytes())?; )*
             Ok(t.into_value())
@@ -89,227 +25,24 @@ macro_rules! hash_domain {
     }
 }
 
-/// The hash domain containing the protocol string.
-///
-/// This serves as a global [domain separator](https://en.wikipedia.org/wiki/Domain_separation)
-/// used in various places in the rosenpass protocol.
-///
-/// This is generally used to create further hash-domains for specific purposes. See
-///
-/// # Examples
-///
-/// See the source file for details about how this is used concretely.
-///
-/// See the [module](self) documentation on how to use the hash domains in general
 pub fn protocol() -> Result<HashDomain> {
     HashDomain::zero().mix("Rosenpass v1 mceliece460896 Kyber512 ChaChaPoly1305 BLAKE2s".as_bytes())
 }
 
-hash_domain_ns!(
-    /// Hash domain based on [protocol] for calculating [crate::msgs::Envelope::mac].
-    ///
-    /// # Examples
-    ///
-    /// See the source of [crate::msgs::Envelope::seal] and [crate::msgs::Envelope::check_seal] 
-    /// to figure out how this is concretely used.
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, mac, "mac");
-hash_domain_ns!(
-    /// Hash domain based on [protocol] involved in calculating [crate::msgs::Envelope::cookie].
-    ///
-    /// # Examples
-    ///
-    /// See the source of [crate::msgs::Envelope::seal_cookie],
-    /// [crate::protocol::CryptoServer::handle_msg_under_load], and
-    /// [crate::protocol::CryptoServer::handle_cookie_reply]
-    /// to figure out how this is concretely used.
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, cookie, "cookie");
-hash_domain_ns!(
-    /// Hash domain based on [protocol] involved in calculating [crate::msgs::Envelope::cookie].
-    ///
-    /// # Examples
-    ///
-    /// See the source of [crate::msgs::Envelope::seal_cookie],
-    /// [crate::protocol::CryptoServer::handle_msg_under_load], and
-    /// [crate::protocol::CryptoServer::handle_cookie_reply]
-    /// to figure out how this is concretely used.
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, cookie_value, "cookie-value");
-hash_domain_ns!(
-    /// Hash domain based on [protocol] involved in calculating [crate::msgs::Envelope::cookie].
-    ///
-    /// # Examples
-    ///
-    /// See the source of [crate::msgs::Envelope::seal_cookie],
-    /// [crate::protocol::CryptoServer::handle_msg_under_load], and
-    /// [crate::protocol::CryptoServer::handle_cookie_reply]
-    /// to figure out how this is concretely used.
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, cookie_key, "cookie-key");
-hash_domain_ns!(
-    /// Hash domain based on [protocol] for calculating the peer id as transmitted (encrypted)
-    /// in [crate::msgs::InitHello::pidic].
-    ///
-    /// # Examples
-    ///
-    /// See the source of [crate::protocol::CryptoServer::pidm] and
-    /// [crate::protocol::Peer::pidt]
-    /// to figure out how this is concretely used.
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, peerid, "peer id");
-hash_domain_ns!(
-    /// Hash domain based on [protocol] for calculating the additional data
-    /// during [crate::msgs::Biscuit] encryption, storing the biscuit into
-    /// [crate::msgs::RespHello::biscuit].
-    ///
-    /// # Examples
-    ///
-    /// To understand how the biscuit is used, it is best to read
-    /// the code of [crate::protocol::HandshakeState::store_biscuit] and
-    /// [crate::protocol::HandshakeState::load_biscuit]
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, biscuit_ad, "biscuit additional data");
-hash_domain_ns!(
-    /// This hash domain begins our actual handshake procedure, initializing the
-    /// chaining key [crate::protocol::HandshakeState::ck]. 
-    ///
-    /// # Examples
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, ckinit, "chaining key init");
-hash_domain_ns!(
-    /// Namespace for chaining key usage domain separators.
-    ///
-    /// During the execution of the Rosenpass protocol, we use the chaining key for multiple
-    /// purposes, so to make sure that we have unique value domains, we mix a domain separator
-    /// into the chaining key before using it for any particular purpose.
-    ///
-    /// We could use the full domain separation strings, but using a hash value here is nice
-    /// because it does not lead to any constraints about domain separator format and we can
-    /// even allow third parties to define their own separators by claiming a namespace.
-    ///
-    /// # Examples
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    protocol, _ckextract, "chaining key extract");
+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");
+hash_domain_ns!(protocol, _ckextract, "chaining key extract");
 
-hash_domain!(
-    /// Used to mix in further values into the chaining key during the handshake.
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _ckextract, mix, "mix");
-hash_domain!(
-    /// Chaining key domain separator for generating encryption keys that can
-    /// encrypt parts of the handshake.
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// Encryption of data during the handshake happens in
-    /// [crate::protocol::HandshakeState::encrypt_and_mix] and decryption happens in
-    /// [crate::protocol::HandshakeState::decrypt_and_mix]. See their source code
-    /// for details.
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _ckextract, hs_enc, "handshake encryption");
-hash_domain!(
-    /// Chaining key domain separator for live data encryption.
-    /// Live data encryption is only used to send confirmation of handshake
-    /// done in [crate::msgs::EmptyData].
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// This domain separator finds use in [crate::protocol::HandshakeState::enter_live].
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _ckextract, ini_enc, "initiator handshake encryption");
-hash_domain!(
-    /// Chaining key domain separator for live data encryption.
-    /// Live data encryption is only used to send confirmation of handshake
-    /// done in [crate::msgs::EmptyData].
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// This domain separator finds use in [crate::protocol::HandshakeState::enter_live].
-    /// Check out its source code!
-    ///
-    /// To understand how the chaining key is used, study
-    /// [crate::protocol::HandshakeState], especially [crate::protocol::HandshakeState::init]
-    /// and [crate::protocol::HandshakeState::mix].
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _ckextract, res_enc, "responder handshake encryption");
+hash_domain!(_ckextract, mix, "mix");
+hash_domain!(_ckextract, hs_enc, "handshake encryption");
+hash_domain!(_ckextract, ini_enc, "initiator handshake encryption");
+hash_domain!(_ckextract, res_enc, "responder handshake encryption");
 
-hash_domain_ns!(
-    /// Chaining key domain separator for any usage specific purposes.
-    ///
-    /// We do recommend that third parties base their specific domain separators
-    /// on a internet domain and/or mix in much more specific information.
-    ///
-    /// We only really use this to derive a output key for wireguard; see [osk].
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _ckextract, _user, "user");
-hash_domain_ns!(
-    /// Chaining key domain separator for any rosenpass specific purposes.
-    ///
-    /// We only really use this to derive a output key for wireguard; see [osk].
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _user, _rp, "rosenpass.eu");
-hash_domain!(
-    /// Chaining key domain separator for deriving the key sent to WireGuard.
-    ///
-    /// See [_ckextract].
-    ///
-    /// # Examples
-    ///
-    /// This domain separator finds use in [crate::protocol::CryptoServer::osk].
-    /// Check out its source code!
-    ///
-    /// See the [module](self) documentation on how to use the hash domains in general.
-    _rp, osk, "wireguard psk");
+hash_domain_ns!(_ckextract, _user, "user");
+hash_domain_ns!(_user, _rp, "rosenpass.eu");
+hash_domain!(_rp, osk, "wireguard psk");

rosenpass/src/lib.rs

@@ -1,20 +1,3 @@
-//! This is the central rosenpass crate implementing the rosenpass protocol.
-//!
-//! - [crate::app_server] contains the business logic of rosenpass, handling networking
-//! - [crate::cli] contains the cli parsing logic and contains quite a bit of startup logic; the
-//!   main function quickly hands over to [crate::cli::CliArgs::run] which contains quite a bit
-//!   of our startup logic
-//! - [crate::config] has the code to parse and generate configuration files
-//! - [crate::hash_domains] lists the different hash function domains used in the Rosenpass
-//!   protocol
-//! - [crate::msgs] provides declarations of the Rosenpass protocol network messages and facilities
-//!   to parse those messages through the [::zerocopy] crate
-//! - [crate::protocol] this is where the bulk of our code lives; this module contains the actual
-//!   cryptographic protocol logic
-//! - crate::api implements the Rosenpass unix socket API, if feature "experiment_api" is active
-
-#[cfg(feature = "experiment_api")]
-pub mod api;
 pub mod app_server;
 pub mod cli;
 pub mod config;
@@ -22,25 +5,10 @@ pub mod hash_domains;
 pub mod msgs;
 pub mod protocol;
 
-/// Error types used in diverse places across Rosenpass
 #[derive(thiserror::Error, Debug)]
 pub enum RosenpassError {
-    /// Usually indicates that parsing a struct through the
-    /// [::zerocopy] crate failed
     #[error("buffer size mismatch")]
     BufferSizeMismatch,
-    /// Mostly raised by the `TryFrom<u8>` implementation for [crate::msgs::MsgType]
-    /// to indicate that a message type is not defined
     #[error("invalid message type")]
-    InvalidMessageType(
-        /// The message type that could not be parsed
-        u8,
-    ),
-    /// Raised by the `TryFrom<RawMsgType>` (crate::api::RawMsgType) implementation for crate::api::RequestMsgType
-    /// and crate::api::RequestMsgType to indicate that a message type is not defined
-    #[error("invalid API message type")]
-    InvalidApiMessageType(
-        /// The message type that could not be parsed
-        u128,
-    ),
+    InvalidMessageType(u8),
 }

rosenpass/src/main.rs

@@ -1,64 +1,13 @@
-//! For the main function
-
-use clap::CommandFactory;
 use clap::Parser;
-use clap_mangen::roff::{roman, Roff};
 use log::error;
 use rosenpass::cli::CliArgs;
 use std::process::exit;
 
-/// Printing custom man sections when generating the man page
-fn print_custom_man_section(section: &str, text: &str, file: &mut std::fs::File) {
-    let mut roff = Roff::default();
-    roff.control("SH", [section]);
-    roff.text([roman(text)]);
-    let _ = roff.to_writer(file);
-}
-
 /// Catches errors, prints them through the logger, then exits
-///
-/// The bulk of the command line logic is handled inside [crate::cli::CliArgs::run].
 pub fn main() {
     // parse CLI arguments
     let args = CliArgs::parse();
 
-    if let Some(shell) = args.print_completions {
-        let mut cmd = CliArgs::command();
-        clap_complete::generate(shell, &mut cmd, "rosenpass", &mut std::io::stdout());
-        return;
-    }
-
-    if let Some(out_dir) = args.generate_manpage {
-        std::fs::create_dir_all(&out_dir).expect("Failed to create man pages directory");
-
-        let cmd = CliArgs::command();
-        let man = clap_mangen::Man::new(cmd.clone());
-        let _ = clap_mangen::generate_to(cmd, &out_dir);
-
-        let file_path = out_dir.join("rosenpass.1");
-        let mut file = std::fs::File::create(file_path).expect("Failed to create man page file");
-
-        let _ = man.render_title(&mut file);
-        let _ = man.render_name_section(&mut file);
-        let _ = man.render_synopsis_section(&mut file);
-        let _ = man.render_subcommands_section(&mut file);
-        let _ = man.render_options_section(&mut file);
-        print_custom_man_section("EXIT STATUS", EXIT_STATUS_MAN, &mut file);
-        print_custom_man_section("SEE ALSO", SEE_ALSO_MAN, &mut file);
-        print_custom_man_section("STANDARDS", STANDARDS_MAN, &mut file);
-        print_custom_man_section("AUTHORS", AUTHORS_MAN, &mut file);
-        print_custom_man_section("BUGS", BUGS_MAN, &mut file);
-        return;
-    }
-
-    {
-        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();
-    }
-
     // init logging
     {
         let mut log_builder = env_logger::Builder::from_default_env(); // sets log level filter from environment (or defaults)
@@ -77,36 +26,11 @@ pub fn main() {
         // error!("error dummy");
     }
 
-    let broker_interface = args.get_broker_interface();
-    match args.run(broker_interface, None) {
+    match args.command.run(None) {
         Ok(_) => {}
         Err(e) => {
-            error!("{e:?}");
+            error!("{e}");
             exit(1);
         }
     }
 }
-
-/// Custom main page section: Exit Status
-static EXIT_STATUS_MAN: &str = r"
-The rosenpass utility exits 0 on success, and >0 if an error occurs.";
-
-/// Custom main page section: See also.
-static SEE_ALSO_MAN: &str = r"
-rp(1), wg(1)
-
-Karolin Varner, Benjamin Lipp, Wanja Zaeske, and Lisa Schmidt, Rosenpass, https://rosenpass.eu/whitepaper.pdf, 2023.";
-
-/// Custom main page section: Standards.
-static STANDARDS_MAN: &str = r"
-This tool is the reference implementation of the Rosenpass protocol, as
-specified within the whitepaper referenced above.";
-
-/// Custom main page section: Authors.
-static AUTHORS_MAN: &str = r"
-Rosenpass was created by Karolin Varner, Benjamin Lipp, Wanja Zaeske, Marei
-Peischl, Stephan Ajuvo, and Lisa Schmidt.";
-
-/// Custom main page section: Bugs.
-static BUGS_MAN: &str = r"
-The bugs are tracked at https://github.com/rosenpass/rosenpass/issues.";

rosenpass/src/msgs.rs

@@ -9,75 +9,20 @@
 //! To achieve this we utilize the zerocopy library.
 //!
 use std::mem::size_of;
-use std::u8;
 use zerocopy::{AsBytes, FromBytes, FromZeroes};
 
 use super::RosenpassError;
 use rosenpass_cipher_traits::Kem;
 use rosenpass_ciphers::kem::{EphemeralKem, StaticKem};
 use rosenpass_ciphers::{aead, xaead, KEY_LEN};
-
-/// Length of a session ID such as [InitHello::sidi]
-pub const SESSION_ID_LEN: usize = 4;
-/// Length of a biscuit ID; i.e. size of the value in [Biscuit::biscuit_no]
-pub const BISCUIT_ID_LEN: usize = 12;
-
-/// TODO: Unused, remove!
-pub const WIRE_ENVELOPE_LEN: usize = 1 + 3 + 16 + 16; // TODO verify this
-
-/// Size required to fit any message in binary form
-pub const MAX_MESSAGE_LEN: usize = 2500; // TODO fix this
-
-/// length in bytes of an unencrypted Biscuit (plain text)
-pub const BISCUIT_PT_LEN: usize = size_of::<Biscuit>();
-
-/// Length in bytes of an encrypted Biscuit (cipher text)
-pub const BISCUIT_CT_LEN: usize = BISCUIT_PT_LEN + xaead::NONCE_LEN + xaead::TAG_LEN;
-
-/// Size of the field [Envelope::mac]
+pub const MSG_SIZE_LEN: usize = 1;
+pub const RESERVED_LEN: usize = 3;
 pub const MAC_SIZE: usize = 16;
-/// Size of the field [Envelope::cookie]
-pub const COOKIE_SIZE: usize = MAC_SIZE;
+pub const COOKIE_SIZE: usize = 16;
+pub const SID_LEN: usize = 4;
 
-/// Type of the mac field in [Envelope]
-pub type MsgEnvelopeMac = [u8; MAC_SIZE];
-
-/// Type of the cookie field in [Envelope]
-pub type MsgEnvelopeCookie = [u8; COOKIE_SIZE];
-
-/// Header and footer included in all our packages,
-/// including a type field.
-///
-/// # Examples
-///
-/// ```
-/// use rosenpass::msgs::{Envelope, InitHello};
-/// use zerocopy::{AsBytes, FromBytes, Ref, FromZeroes};
-/// use memoffset::offset_of;
-///
-/// // Zero-initialization
-/// let mut ih = Envelope::<InitHello>::new_zeroed();
-///
-/// // Edit fields normally
-/// ih.mac[0] = 1;
-///
-/// // Edit as binary
-/// ih.as_bytes_mut()[offset_of!(Envelope<InitHello>, msg_type)] = 23;
-/// assert_eq!(ih.msg_type, 23);;
-///
-/// // Conversion to bytes
-/// let mut ih2 = ih.as_bytes().to_owned();
-///
-/// // Setting msg_type field, again
-/// ih2[0] = 42;
-///
-/// // Zerocopy parsing
-/// let ih3 = Ref::<&mut [u8], Envelope<InitHello>>::new(&mut ih2).unwrap();
-/// assert_ne!(ih.as_bytes(), ih3.as_bytes());
-/// assert_eq!(ih3.msg_type, 42);
-/// ```
 #[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes, Clone)]
+#[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct Envelope<M: AsBytes + FromBytes> {
     /// [MsgType] of this message
     pub msg_type: u8,
@@ -87,45 +32,11 @@ pub struct Envelope<M: AsBytes + FromBytes> {
     pub payload: M,
     /// Message Authentication Code (mac) over all bytes until (exclusive)
     /// `mac` itself
-    pub mac: MsgEnvelopeMac,
+    pub mac: [u8; 16],
     /// Currently unused, TODO: do something with this
-    pub cookie: MsgEnvelopeCookie,
+    pub cookie: [u8; 16],
 }
 
-/// This is the first message sent by the initiator to the responder
-/// during the execution of the Rosenpass protocol.
-///
-/// When transmitted on the wire, this type will generally be wrapped into [Envelope].
-///
-/// # Examples
-///
-/// Check out the code of [crate::protocol::CryptoServer::handle_initiation] (generation on
-/// iniatiator side) and [crate::protocol::CryptoServer::handle_init_hello] (processing on
-/// responder side) to understand how this is used.
-///
-/// [Envelope] contains some extra examples on how to use structures from the [::zerocopy] crate.
-///
-/// ```
-/// use rosenpass::msgs::{Envelope, InitHello};
-/// use zerocopy::{AsBytes, FromBytes, Ref, FromZeroes};
-/// use memoffset::span_of;
-///
-/// // Zero initialization
-/// let mut ih = Envelope::<InitHello>::new_zeroed();
-///
-/// // Conversion to byte representation
-/// let ih = ih.as_bytes_mut();
-///
-/// // Set value on byte representation
-/// ih[span_of!(Envelope<InitHello>, payload)][span_of!(InitHello, sidi)]
-///     .copy_from_slice(&[1,2,3,4]);
-///
-/// // Conversion from bytes
-/// let ih = Ref::<&mut [u8], Envelope<InitHello>>::new(ih).unwrap();
-///
-/// // Check that write above on byte representation was effective
-/// assert_eq!(ih.payload.sidi, [1,2,3,4]);
-/// ```
 #[repr(packed)]
 #[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct InitHello {
@@ -141,40 +52,6 @@ pub struct InitHello {
     pub auth: [u8; aead::TAG_LEN],
 }
 
-/// This is the second message sent by the responder to the initiator
-/// during the execution of the Rosenpass protocol in response to [InitHello].
-///
-/// When transmitted on the wire, this type will generally be wrapped into [Envelope].
-///
-/// # Examples
-///
-/// Check out the code of [crate::protocol::CryptoServer::handle_init_hello] (generation on
-/// responder side) and [crate::protocol::CryptoServer::handle_resp_hello] (processing on
-/// initiator side) to understand how this is used.
-///
-/// [Envelope] contains some extra examples on how to use structures from the [::zerocopy] crate.
-///
-/// ```
-/// use rosenpass::msgs::{Envelope, RespHello};
-/// use zerocopy::{AsBytes, FromBytes, Ref, FromZeroes};
-/// use memoffset::span_of;
-///
-/// // Zero initialization
-/// let mut ih = Envelope::<RespHello>::new_zeroed();
-///
-/// // Conversion to byte representation
-/// let ih = ih.as_bytes_mut();
-///
-/// // Set value on byte representation
-/// ih[span_of!(Envelope<RespHello>, payload)][span_of!(RespHello, sidi)]
-///     .copy_from_slice(&[1,2,3,4]);
-///
-/// // Conversion from bytes
-/// let ih = Ref::<&mut [u8], Envelope<RespHello>>::new(ih).unwrap();
-///
-/// // Check that write above on byte representation was effective
-/// assert_eq!(ih.payload.sidi, [1,2,3,4]);
-/// ```
 #[repr(packed)]
 #[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct RespHello {
@@ -192,42 +69,8 @@ pub struct RespHello {
     pub biscuit: [u8; BISCUIT_CT_LEN],
 }
 
-/// This is the third message sent by the initiator to the responder
-/// during the execution of the Rosenpass protocol in response to [RespHello].
-///
-/// When transmitted on the wire, this type will generally be wrapped into [Envelope].
-///
-/// # Examples
-///
-/// Check out the code of [crate::protocol::CryptoServer::handle_resp_hello] (generation on
-/// initiator side) and [crate::protocol::CryptoServer::handle_init_conf] (processing on
-/// responder side) to understand how this is used.
-///
-/// [Envelope] contains some extra examples on how to use structures from the [::zerocopy] crate.
-///
-/// ```
-/// use rosenpass::msgs::{Envelope, InitConf};
-/// use zerocopy::{AsBytes, FromBytes, Ref, FromZeroes};
-/// use memoffset::span_of;
-///
-/// // Zero initialization
-/// let mut ih = Envelope::<InitConf>::new_zeroed();
-///
-/// // Conversion to byte representation
-/// let ih = ih.as_bytes_mut();
-///
-/// // Set value on byte representation
-/// ih[span_of!(Envelope<InitConf>, payload)][span_of!(InitConf, sidi)]
-///     .copy_from_slice(&[1,2,3,4]);
-///
-/// // Conversion from bytes
-/// let ih = Ref::<&mut [u8], Envelope<InitConf>>::new(ih).unwrap();
-///
-/// // Check that write above on byte representation was effective
-/// assert_eq!(ih.payload.sidi, [1,2,3,4]);
-/// ```
 #[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes, Debug)]
+#[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct InitConf {
     /// Copied from InitHello
     pub sidi: [u8; 4],
@@ -239,53 +82,8 @@ pub struct InitConf {
     pub auth: [u8; aead::TAG_LEN],
 }
 
-/// This is the fourth message sent by the initiator to the responder
-/// during the execution of the Rosenpass protocol in response to [RespHello].
-///
-/// When transmitted on the wire, this type will generally be wrapped into [Envelope].
-///
-/// This message does not serve a cryptographic purpose; it just tells the initiator
-/// to stop package retransmission.
-///
-/// This message should really be called `RespConf`, but when we wrote the protocol,
-/// we initially designed the protocol we still though Rosenpass itself should do
-/// payload transmission at some point so `EmptyData` could have served as a more generic
-/// mechanism.
-///
-/// We might add payload transmission in the future again, but we will treat
-/// it as a protocol extension if we do.
-///
-/// # Examples
-///
-/// Check out the code of [crate::protocol::CryptoServer::handle_init_conf] (generation on
-/// responder side) and [crate::protocol::CryptoServer::handle_resp_conf] (processing on
-/// initiator side) to understand how this is used.
-///
-/// [Envelope] contains some extra examples on how to use structures from the [::zerocopy] crate.
-///
-/// ```
-/// use rosenpass::msgs::{Envelope, EmptyData};
-/// use zerocopy::{AsBytes, FromBytes, Ref, FromZeroes};
-/// use memoffset::span_of;
-///
-/// // Zero initialization
-/// let mut ih = Envelope::<EmptyData>::new_zeroed();
-///
-/// // Conversion to byte representation
-/// let ih = ih.as_bytes_mut();
-///
-/// // Set value on byte representation
-/// ih[span_of!(Envelope<EmptyData>, payload)][span_of!(EmptyData, sid)]
-///     .copy_from_slice(&[1,2,3,4]);
-///
-/// // Conversion from bytes
-/// let ih = Ref::<&mut [u8], Envelope<EmptyData>>::new(ih).unwrap();
-///
-/// // Check that write above on byte representation was effective
-/// assert_eq!(ih.payload.sid, [1,2,3,4]);
-/// ```
 #[repr(packed)]
-#[derive(AsBytes, FromBytes, FromZeroes, Clone, Copy)]
+#[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct EmptyData {
     /// Copied from RespHello
     pub sid: [u8; 4],
@@ -295,22 +93,6 @@ pub struct EmptyData {
     pub auth: [u8; aead::TAG_LEN],
 }
 
-/// Cookie encrypted and sent to the initiator by the responder in [RespHello]
-/// and returned by the initiator in [InitConf].
-///
-/// The encryption key is randomly chosen by the responder and frequently regenerated.
-/// Using this biscuit value in the protocol allows us to make sure that the responder
-/// is mostly stateless until full initiator authentication is achieved, which is needed
-/// to prevent denial of service attacks. See the [whitepaper](https://rosenpass.eu/whitepaper.pdf)
-/// ([/papers/whitepaper.md] in this repository).
-///
-/// # Examples
-///
-/// To understand how the biscuit is used, it is best to read
-/// the code of [crate::protocol::HandshakeState::store_biscuit] and
-/// [crate::protocol::HandshakeState::load_biscuit]
-///
-/// [Envelope] and [InitHello] contain some extra examples on how to use structures from the [::zerocopy] crate.
 #[repr(packed)]
 #[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct Biscuit {
@@ -322,20 +104,12 @@ pub struct Biscuit {
     pub ck: [u8; KEY_LEN],
 }
 
-/// Specialized message for use in the cookie mechanism.
-///
-/// See the [whitepaper](https://rosenpass.eu/whitepaper.pdf) ([/papers/whitepaper.md] in this repository) for details.
-///
-/// Generally used together with [CookieReply] which brings this up to the size
-/// of [InitHello] to avoid amplification Denial of Service attacks.
-///
-/// # Examples
-///
-/// To understand how the biscuit is used, it is best to read
-/// the code of [crate::protocol::CryptoServer::handle_cookie_reply] and
-/// [crate::protocol::CryptoServer::handle_msg_under_load].
-///
-/// [Envelope] and [InitHello] contain some extra examples on how to use structures from the [::zerocopy] crate.
+#[repr(packed)]
+#[derive(AsBytes, FromBytes, FromZeroes)]
+pub struct DataMsg {
+    pub dummy: [u8; 4],
+}
+
 #[repr(packed)]
 #[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct CookieReplyInner {
@@ -349,20 +123,6 @@ pub struct CookieReplyInner {
     pub cookie_encrypted: [u8; xaead::NONCE_LEN + COOKIE_SIZE + xaead::TAG_LEN],
 }
 
-/// Specialized message for use in the cookie mechanism.
-///
-/// This just brings [CookieReplyInner] up to the size
-/// of [InitHello] to avoid amplification Denial of Service attacks.
-///
-/// See the [whitepaper](https://rosenpass.eu/whitepaper.pdf) ([/papers/whitepaper.md] in this repository) for details.
-///
-/// # Examples
-///
-/// To understand how the biscuit is used, it is best to read
-/// the code of [crate::protocol::CryptoServer::handle_cookie_reply] and
-/// [crate::protocol::CryptoServer::handle_msg_under_load].
-///
-/// [Envelope] and [InitHello] contain some extra examples on how to use structures from the [::zerocopy] crate.
 #[repr(packed)]
 #[derive(AsBytes, FromBytes, FromZeroes)]
 pub struct CookieReply {
@@ -370,46 +130,33 @@ pub struct CookieReply {
     pub padding: [u8; size_of::<Envelope<InitHello>>() - size_of::<CookieReplyInner>()],
 }
 
+// Traits /////////////////////////////////////////////////////////////////////
+
+pub trait WireMsg: std::fmt::Debug {
+    const MSG_TYPE: MsgType;
+    const MSG_TYPE_U8: u8 = Self::MSG_TYPE as u8;
+    const BYTES: usize;
+}
+
+// Constants //////////////////////////////////////////////////////////////////
+
+pub const SESSION_ID_LEN: usize = 4;
+pub const BISCUIT_ID_LEN: usize = 12;
+
+pub const WIRE_ENVELOPE_LEN: usize = 1 + 3 + 16 + 16; // TODO verify this
+
+/// Size required to fit any message in binary form
+pub const MAX_MESSAGE_LEN: usize = 2500; // TODO fix this
+
 /// Recognized message types
-///
-/// # Examples
-///
-/// ```
-/// use rosenpass::msgs::MsgType;
-/// use rosenpass::msgs::MsgType as M;
-///
-/// let values = [M::InitHello, M::RespHello, M::InitConf, M::EmptyData, M::CookieReply];
-/// let values_u8 = values.map(|v| -> u8 { v.into() });
-///
-/// // Can be converted to and from u8 using [::std::convert::Into] or [::std::convert::From]
-/// for v in values.iter().copied() {
-///     let v_u8 : u8 = v.into();
-///     let v2 : MsgType = v_u8.try_into()?;
-///     assert_eq!(v, v2);
-/// }
-///
-/// // Converting an unsupported type produces an error
-/// let invalid_values = (u8::MIN..=u8::MAX)
-///     .filter(|v| !values_u8.contains(v));
-/// for v in invalid_values {
-///     let res : Result<MsgType, _> = v.try_into();
-///     assert!(res.is_err());
-/// }
-///
-/// Ok::<(), anyhow::Error>(())
-/// ```
 #[repr(u8)]
 #[derive(Hash, PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy)]
 pub enum MsgType {
-    /// MsgType for [InitHello]
     InitHello = 0x81,
-    /// MsgType for [RespHello]
     RespHello = 0x82,
-    /// MsgType for [InitConf]
     InitConf = 0x83,
-    /// MsgType for [EmptyData]
     EmptyData = 0x84,
-    /// MsgType for [CookieReply]
+    DataMsg = 0x85,
     CookieReply = 0x86,
 }
 
@@ -422,6 +169,7 @@ impl TryFrom<u8> for MsgType {
             0x82 => MsgType::RespHello,
             0x83 => MsgType::InitConf,
             0x84 => MsgType::EmptyData,
+            0x85 => MsgType::DataMsg,
             0x86 => MsgType::CookieReply,
             _ => return Err(RosenpassError::InvalidMessageType(value)),
         })
@@ -434,6 +182,12 @@ impl From<MsgType> for u8 {
     }
 }
 
+/// length in bytes of an unencrypted Biscuit (plain text)
+pub const BISCUIT_PT_LEN: usize = size_of::<Biscuit>();
+
+/// Length in bytes of an encrypted Biscuit (cipher text)
+pub const BISCUIT_CT_LEN: usize = BISCUIT_PT_LEN + xaead::NONCE_LEN + xaead::TAG_LEN;
+
 #[cfg(test)]
 mod test_constants {
     use crate::msgs::{BISCUIT_CT_LEN, BISCUIT_PT_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())
-    }
-}

rosenpass/src/protocol/mod.rs

@@ -1,82 +0,0 @@
-//! Module containing the cryptographic protocol implementation
-//!
-//! # Overview
-//!
-//! The most important types in this module probably are [PollResult]
-//! & [CryptoServer]. Once a [CryptoServer] is created, the server is
-//! provided with new messages via the [CryptoServer::handle_msg] method.
-//! The [CryptoServer::poll] method can be used to let the server work, which
-//! will eventually yield a [PollResult]. Said [PollResult] contains
-//! prescriptive activities to be carried out. [CryptoServer::osk] can than
-//! be used to extract the shared key for two peers, once a key-exchange was
-//! successful.
-//!
-//! TODO explain briefly the role of epki
-//!
-//! # Example Handshake
-//!
-//! This example illustrates a minimal setup for a key-exchange between two
-//! [CryptoServer]s; this is what we use for some testing purposes but it is not
-//! what should be used in a real world application, as timing-based events
-//! are handled by [CryptoServer::poll].
-//!
-//! See [CryptoServer::poll] on how to use crypto server in polling mode for production usage.
-//!
-//! ```
-//! use std::ops::DerefMut;
-//! use rosenpass_secret_memory::policy::*;
-//! use rosenpass_cipher_traits::Kem;
-//! use rosenpass_ciphers::kem::StaticKem;
-//! use rosenpass::{
-//!     protocol::{SSk, SPk, MsgBuf, PeerPtr, CryptoServer, SymKey},
-//! };
-//! # fn main() -> anyhow::Result<()> {
-//! // Set security policy for storing secrets
-//!
-//! secret_policy_try_use_memfd_secrets();
-//!
-//! // initialize secret and public key for peer a ...
-//! let (mut peer_a_sk, mut peer_a_pk) = (SSk::zero(), SPk::zero());
-//! StaticKem::keygen(peer_a_sk.secret_mut(), peer_a_pk.deref_mut())?;
-//!
-//! // ... and for peer b
-//! let (mut peer_b_sk, mut peer_b_pk) = (SSk::zero(), SPk::zero());
-//! StaticKem::keygen(peer_b_sk.secret_mut(), peer_b_pk.deref_mut())?;
-//!
-//! // initialize server and a pre-shared key
-//! let psk = SymKey::random();
-//! let mut a = CryptoServer::new(peer_a_sk, peer_a_pk.clone());
-//! let mut b = CryptoServer::new(peer_b_sk, peer_b_pk.clone());
-//!
-//! // introduce peers to each other
-//! a.add_peer(Some(psk.clone()), peer_b_pk)?;
-//! b.add_peer(Some(psk), peer_a_pk)?;
-//!
-//! // declare buffers for message exchange
-//! let (mut a_buf, mut b_buf) = (MsgBuf::zero(), MsgBuf::zero());
-//!
-//! // let a initiate a handshake
-//! let mut maybe_len = Some(a.initiate_handshake(PeerPtr(0), a_buf.as_mut_slice())?);
-//!
-//! // let a and b communicate
-//! while let Some(len) = maybe_len {
-//!    maybe_len = b.handle_msg(&a_buf[..len], &mut b_buf[..])?.resp;
-//!    std::mem::swap(&mut a, &mut b);
-//!    std::mem::swap(&mut a_buf, &mut b_buf);
-//! }
-//!
-//! // all done! Extract the shared keys and ensure they are identical
-//! let a_key = a.osk(PeerPtr(0))?;
-//! let b_key = b.osk(PeerPtr(0))?;
-//! assert_eq!(a_key.secret(), b_key.secret(),
-//!     "the key exchanged failed to establish a shared secret");
-//! # Ok(())
-//! # }
-//! ```
-
-mod build_crypto_server;
-#[allow(clippy::module_inception)]
-mod protocol;
-
-pub use build_crypto_server::*;
-pub use protocol::*;

rosenpass/tests/api-integration-tests-api-setup.rs

@@ -1,340 +0,0 @@
-use std::{
-    borrow::Borrow,
-    io::{BufRead, BufReader, Write},
-    os::unix::net::UnixStream,
-    process::Stdio,
-    thread::sleep,
-    time::Duration,
-};
-
-use anyhow::{bail, Context};
-use command_fds::{CommandFdExt, FdMapping};
-use hex_literal::hex;
-use rosenpass::api::{
-    self, add_listen_socket_response_status, add_psk_broker_response_status,
-    supply_keypair_response_status,
-};
-use rosenpass_util::{
-    b64::B64Display,
-    file::LoadValueB64,
-    io::IoErrorKind,
-    length_prefix_encoding::{decoder::LengthPrefixDecoder, encoder::LengthPrefixEncoder},
-    mem::{DiscardResultExt, MoveExt},
-    mio::WriteWithFileDescriptors,
-    zerocopy::ZerocopySliceExt,
-};
-use std::os::fd::{AsFd, AsRawFd};
-use tempfile::TempDir;
-use zerocopy::AsBytes;
-
-use rosenpass::protocol::SymKey;
-
-struct KillChild(std::process::Child);
-
-impl Drop for KillChild {
-    fn drop(&mut self) {
-        use rustix::process::{kill_process, Pid, Signal::Term};
-        let pid = Pid::from_child(&self.0);
-        // We seriously need to start handling signals with signalfd, our current signal handling
-        // system is a bit broken; there is probably a few functions that just restart on EINTR
-        // so the signal is absorbed
-        loop {
-            kill_process(pid, Term).discard_result();
-            if self.0.try_wait().unwrap().is_some() {
-                break;
-            }
-        }
-    }
-}
-
-#[test]
-fn api_integration_api_setup() -> anyhow::Result<()> {
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    let dir = TempDir::with_prefix("rosenpass-api-integration-test")?;
-
-    macro_rules! tempfile {
-        ($($lst:expr),+) => {{
-            let mut buf =  dir.path().to_path_buf();
-            $(buf.push($lst);)*
-            buf
-        }}
-    }
-
-    let peer_a_endpoint = "[::1]:0";
-    let peer_a_listen = std::net::UdpSocket::bind(peer_a_endpoint)?;
-    let peer_a_endpoint = format!("{}", peer_a_listen.local_addr()?);
-    let peer_a_keypair = config::Keypair::new(tempfile!("a.pk"), tempfile!("a.sk"));
-
-    let peer_b_osk = tempfile!("b.osk");
-    let peer_b_wg_device = "mock_device";
-    let peer_b_wg_peer_id = hex!(
-        "
-        93 0f ee 77 0c 6b 54 7e  13 5f 13 92 21 97 26 53
-        7d 77 4a 6a 0f 6c eb 1a  dd 6e 5b c4 1b 92 cd 99
-    "
-    );
-
-    use rosenpass::config;
-    let peer_a = config::Rosenpass {
-        config_file_path: tempfile!("a.config"),
-        keypair: None,
-        listen: vec![], // TODO: This could collide by accident
-        verbosity: config::Verbosity::Verbose,
-        api: api::config::ApiConfig {
-            listen_path: vec![tempfile!("a.sock")],
-            listen_fd: vec![],
-            stream_fd: vec![],
-        },
-        peers: vec![config::RosenpassPeer {
-            public_key: tempfile!("b.pk"),
-            key_out: None,
-            endpoint: None,
-            pre_shared_key: None,
-            wg: Some(config::WireGuard {
-                device: peer_b_wg_device.to_string(),
-                peer: format!("{}", peer_b_wg_peer_id.fmt_b64::<8129>()),
-                extra_params: vec![],
-            }),
-        }],
-    };
-
-    let peer_b_keypair = config::Keypair::new(tempfile!("b.pk"), tempfile!("b.sk"));
-    let peer_b = config::Rosenpass {
-        config_file_path: tempfile!("b.config"),
-        keypair: Some(peer_b_keypair.clone()),
-        listen: vec![],
-        verbosity: config::Verbosity::Verbose,
-        api: api::config::ApiConfig {
-            listen_path: vec![tempfile!("b.sock")],
-            listen_fd: vec![],
-            stream_fd: vec![],
-        },
-        peers: vec![config::RosenpassPeer {
-            public_key: tempfile!("a.pk"),
-            key_out: Some(peer_b_osk.clone()),
-            endpoint: Some(peer_a_endpoint.to_owned()),
-            pre_shared_key: None,
-            wg: None,
-        }],
-    };
-
-    // Generate the keys
-    rosenpass::cli::testing::generate_and_save_keypair(
-        peer_a_keypair.secret_key.clone(),
-        peer_a_keypair.public_key.clone(),
-    )?;
-    rosenpass::cli::testing::generate_and_save_keypair(
-        peer_b_keypair.secret_key.clone(),
-        peer_b_keypair.public_key.clone(),
-    )?;
-
-    // Write the configuration files
-    peer_a.commit()?;
-    peer_b.commit()?;
-
-    let (deliberate_fail_api_client, deliberate_fail_api_server) =
-        std::os::unix::net::UnixStream::pair()?;
-    let deliberate_fail_child_fd = 3;
-
-    // Start peer a
-    let _proc_a = KillChild(
-        std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass"))
-            .args(["--api-stream-fd", &deliberate_fail_child_fd.to_string()])
-            .fd_mappings(vec![FdMapping {
-                parent_fd: deliberate_fail_api_server.move_here().as_raw_fd(),
-                child_fd: 3,
-            }])?
-            .args([
-                "exchange-config",
-                peer_a.config_file_path.to_str().context("")?,
-            ])
-            .stdin(Stdio::null())
-            .stdout(Stdio::null())
-            .spawn()?,
-    );
-
-    // Start peer b
-    let mut proc_b = KillChild(
-        std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass"))
-            .args([
-                "exchange-config",
-                peer_b.config_file_path.to_str().context("")?,
-            ])
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .spawn()?,
-    );
-
-    // Acquire stdout
-    let mut out_b = BufReader::new(proc_b.0.stdout.take().context("")?).lines();
-
-    // Now connect to the peers
-    let api_path = peer_a.api.listen_path[0].as_path();
-
-    // Wait for the socket to be created
-    let attempt = 0;
-    while !api_path.exists() {
-        sleep(Duration::from_millis(200));
-        assert!(
-            attempt < 50,
-            "Api failed to be created even after 50 seconds"
-        );
-    }
-
-    let api = UnixStream::connect(api_path)?;
-    let (psk_broker_sock, psk_broker_server_sock) = UnixStream::pair()?;
-
-    // Send AddListenSocket request
-    {
-        let fd = peer_a_listen.as_fd();
-
-        let mut fds = vec![&fd].into();
-        let mut api = WriteWithFileDescriptors::<UnixStream, _, _, _>::new(&api, &mut fds);
-        LengthPrefixEncoder::from_message(api::AddListenSocketRequest::new().as_bytes())
-            .write_all_to_stdio(&mut api)?;
-        assert!(fds.is_empty(), "Failed to write all file descriptors");
-        std::mem::forget(peer_a_listen);
-    }
-
-    // Read response
-    {
-        let mut decoder = LengthPrefixDecoder::new([0u8; api::MAX_RESPONSE_LEN]);
-        let res = decoder.read_all_from_stdio(&api)?;
-        let res = res.zk_parse::<api::AddListenSocketResponse>()?;
-        assert_eq!(
-            *res,
-            api::AddListenSocketResponse::new(add_listen_socket_response_status::OK)
-        );
-    }
-
-    // Deliberately break API connection given via FD; this checks that the
-    // API connections are closed when invalid data is received and it also
-    // implicitly checks that other connections are unaffected
-    {
-        use std::io::ErrorKind as K;
-        let client = deliberate_fail_api_client;
-        let err = loop {
-            if let Err(e) = client.borrow().write(&[0xffu8; 16]) {
-                break e;
-            }
-        };
-        // NotConnected happens on Mac
-        assert!(matches!(
-            err.io_error_kind(),
-            K::ConnectionReset | K::BrokenPipe | K::NotConnected
-        ));
-    }
-
-    // Send SupplyKeypairRequest
-    {
-        use rustix::fs::{open, Mode, OFlags};
-        let sk = open(peer_a_keypair.secret_key, OFlags::RDONLY, Mode::empty())?;
-        let pk = open(peer_a_keypair.public_key, OFlags::RDONLY, Mode::empty())?;
-
-        let mut fds = vec![&sk, &pk].into();
-        let mut api = WriteWithFileDescriptors::<UnixStream, _, _, _>::new(&api, &mut fds);
-        LengthPrefixEncoder::from_message(api::SupplyKeypairRequest::new().as_bytes())
-            .write_all_to_stdio(&mut api)?;
-        assert!(fds.is_empty(), "Failed to write all file descriptors");
-    }
-
-    // Read response
-    {
-        let mut decoder = LengthPrefixDecoder::new([0u8; api::MAX_RESPONSE_LEN]);
-        let res = decoder.read_all_from_stdio(&api)?;
-        let res = res.zk_parse::<api::SupplyKeypairResponse>()?;
-        assert_eq!(
-            *res,
-            api::SupplyKeypairResponse::new(supply_keypair_response_status::OK)
-        );
-    }
-
-    // Send AddPskBroker request
-    {
-        let mut fds = vec![psk_broker_server_sock.as_fd()].into();
-        let mut api = WriteWithFileDescriptors::<UnixStream, _, _, _>::new(&api, &mut fds);
-        LengthPrefixEncoder::from_message(api::AddPskBrokerRequest::new().as_bytes())
-            .write_all_to_stdio(&mut api)?;
-        assert!(fds.is_empty(), "Failed to write all file descriptors");
-    }
-
-    // Read response
-    {
-        let mut decoder = LengthPrefixDecoder::new([0u8; api::MAX_RESPONSE_LEN]);
-        let res = decoder.read_all_from_stdio(&api)?;
-        let res = res.zk_parse::<api::AddPskBrokerResponse>()?;
-        assert_eq!(
-            *res,
-            api::AddPskBrokerResponse::new(add_psk_broker_response_status::OK)
-        );
-    }
-
-    // Wait for the keys to successfully exchange a key
-    let mut attempt = 0;
-    loop {
-        // Read OSK generated by A
-        let osk_a = {
-            use rosenpass_wireguard_broker::api::msgs as M;
-            type SetPskReqPkg = M::Envelope<M::SetPskRequest>;
-            type SetPskResPkg = M::Envelope<M::SetPskResponse>;
-
-            // Receive request
-            let mut decoder = LengthPrefixDecoder::new([0u8; M::REQUEST_MSG_BUFFER_SIZE]);
-            let req = decoder.read_all_from_stdio(&psk_broker_sock)?;
-
-            let req = req.zk_parse::<SetPskReqPkg>()?;
-            assert_eq!(req.msg_type, M::MsgType::SetPsk as u8);
-            assert_eq!(req.payload.peer_id, peer_b_wg_peer_id);
-            assert_eq!(req.payload.iface()?, peer_b_wg_device);
-
-            // Send response
-            let res = SetPskResPkg {
-                msg_type: M::MsgType::SetPsk as u8,
-                reserved: [0u8; 3],
-                payload: M::SetPskResponse {
-                    return_code: M::SetPskResponseReturnCode::Success as u8,
-                },
-            };
-            LengthPrefixEncoder::from_message(res.as_bytes())
-                .write_all_to_stdio(&psk_broker_sock)?;
-
-            SymKey::from_slice(&req.payload.psk)
-        };
-
-        // Read OSK generated by B
-        let osk_b = {
-            let line = out_b.next().context("")??;
-            let words = line.split(' ').collect::<Vec<_>>();
-
-            // FIXED     FIXED PEER-ID                                      FIXED    FILENAME       STATUS
-            // output-key peer KZqXTZ4l2aNnkJtLPhs4D8JxHTGmRSL9w3Qr+X8JxFk= key-file "client-A-osk" exchanged
-            let peer_id = words
-                .get(2)
-                .with_context(|| format!("Bad rosenpass output: `{line}`"))?;
-            assert_eq!(
-                line,
-                format!(
-                    "output-key peer {peer_id} key-file \"{}\" exchanged",
-                    peer_b_osk.to_str().context("")?
-                )
-            );
-
-            SymKey::load_b64::<64, _>(peer_b_osk.clone())?
-        };
-
-        // TODO: This may be flaky. Both rosenpass instances are not guaranteed to produce
-        // the same number of output events; they merely guarantee eventual consistency of OSK.
-        // Correctly, we should use tokio to read any number of generated OSKs and indicate
-        // success on consensus
-        match osk_a.secret() == osk_b.secret() {
-            true => break,
-            false if attempt > 10 => bail!("Peers did not produce a matching key even after ten attempts. Something is wrong with the key exchange!"),
-            false => {},
-        };
-
-        attempt += 1;
-    }
-
-    Ok(())
-}

rosenpass/tests/api-integration-tests.rs

@@ -1,194 +0,0 @@
-use std::{
-    io::{BufRead, BufReader},
-    net::ToSocketAddrs,
-    os::unix::net::UnixStream,
-    process::Stdio,
-};
-
-use anyhow::{bail, Context};
-use rosenpass::api;
-use rosenpass_to::{ops::copy_slice_least_src, To};
-use rosenpass_util::{
-    file::LoadValueB64,
-    length_prefix_encoding::{decoder::LengthPrefixDecoder, encoder::LengthPrefixEncoder},
-};
-use rosenpass_util::{mem::DiscardResultExt, zerocopy::ZerocopySliceExt};
-use tempfile::TempDir;
-use zerocopy::AsBytes;
-
-use rosenpass::protocol::SymKey;
-
-struct KillChild(std::process::Child);
-
-impl Drop for KillChild {
-    fn drop(&mut self) {
-        self.0.kill().discard_result();
-        self.0.wait().discard_result()
-    }
-}
-
-#[test]
-fn api_integration_test() -> anyhow::Result<()> {
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    let dir = TempDir::with_prefix("rosenpass-api-integration-test")?;
-
-    macro_rules! tempfile {
-        ($($lst:expr),+) => {{
-            let mut buf =  dir.path().to_path_buf();
-            $(buf.push($lst);)*
-            buf
-        }}
-    }
-
-    let peer_a_endpoint = "[::1]:61423";
-    let peer_a_osk = tempfile!("a.osk");
-    let peer_b_osk = tempfile!("b.osk");
-
-    use rosenpass::config;
-
-    let peer_a_keypair = config::Keypair::new(tempfile!("a.pk"), tempfile!("a.sk"));
-    let peer_a = config::Rosenpass {
-        config_file_path: tempfile!("a.config"),
-        keypair: Some(peer_a_keypair.clone()),
-        listen: peer_a_endpoint.to_socket_addrs()?.collect(), // TODO: This could collide by accident
-        verbosity: config::Verbosity::Verbose,
-        api: api::config::ApiConfig {
-            listen_path: vec![tempfile!("a.sock")],
-            listen_fd: vec![],
-            stream_fd: vec![],
-        },
-        peers: vec![config::RosenpassPeer {
-            public_key: tempfile!("b.pk"),
-            key_out: Some(peer_a_osk.clone()),
-            endpoint: None,
-            pre_shared_key: None,
-            wg: None,
-        }],
-    };
-
-    let peer_b_keypair = config::Keypair::new(tempfile!("b.pk"), tempfile!("b.sk"));
-    let peer_b = config::Rosenpass {
-        config_file_path: tempfile!("b.config"),
-        keypair: Some(peer_b_keypair.clone()),
-        listen: vec![],
-        verbosity: config::Verbosity::Verbose,
-        api: api::config::ApiConfig {
-            listen_path: vec![tempfile!("b.sock")],
-            listen_fd: vec![],
-            stream_fd: vec![],
-        },
-        peers: vec![config::RosenpassPeer {
-            public_key: tempfile!("a.pk"),
-            key_out: Some(peer_b_osk.clone()),
-            endpoint: Some(peer_a_endpoint.to_owned()),
-            pre_shared_key: None,
-            wg: None,
-        }],
-    };
-
-    // Generate the keys
-    rosenpass::cli::testing::generate_and_save_keypair(
-        peer_a_keypair.secret_key.clone(),
-        peer_a_keypair.public_key.clone(),
-    )?;
-    rosenpass::cli::testing::generate_and_save_keypair(
-        peer_b_keypair.secret_key.clone(),
-        peer_b_keypair.public_key.clone(),
-    )?;
-
-    // Write the configuration files
-    peer_a.commit()?;
-    peer_b.commit()?;
-
-    // Start peer a
-    let mut proc_a = KillChild(
-        std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass"))
-            .args([
-                "exchange-config",
-                peer_a.config_file_path.to_str().context("")?,
-            ])
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .spawn()?,
-    );
-
-    // Start peer b
-    let mut proc_b = KillChild(
-        std::process::Command::new(env!("CARGO_BIN_EXE_rosenpass"))
-            .args([
-                "exchange-config",
-                peer_b.config_file_path.to_str().context("")?,
-            ])
-            .stdin(Stdio::null())
-            .stdout(Stdio::piped())
-            .spawn()?,
-    );
-
-    // Acquire stdout
-    let mut out_a = BufReader::new(proc_a.0.stdout.take().context("")?).lines();
-    let mut out_b = BufReader::new(proc_b.0.stdout.take().context("")?).lines();
-
-    // Wait for the keys to successfully exchange a key
-    let mut attempt = 0;
-    loop {
-        let line_a = out_a.next().context("")??;
-        let line_b = out_b.next().context("")??;
-
-        let words_a = line_a.split(' ').collect::<Vec<_>>();
-        let words_b = line_b.split(' ').collect::<Vec<_>>();
-
-        // FIXED     FIXED PEER-ID                                      FIXED    FILENAME       STATUS
-        // output-key peer KZqXTZ4l2aNnkJtLPhs4D8JxHTGmRSL9w3Qr+X8JxFk= key-file "client-A-osk" exchanged
-        let peer_a_id = words_b
-            .get(2)
-            .with_context(|| format!("Bad rosenpass output: `{line_b}`"))?;
-        let peer_b_id = words_a
-            .get(2)
-            .with_context(|| format!("Bad rosenpass output: `{line_a}`"))?;
-        assert_eq!(
-            line_a,
-            format!(
-                "output-key peer {peer_b_id} key-file \"{}\" exchanged",
-                peer_a_osk.to_str().context("")?
-            )
-        );
-        assert_eq!(
-            line_b,
-            format!(
-                "output-key peer {peer_a_id} key-file \"{}\" exchanged",
-                peer_b_osk.to_str().context("")?
-            )
-        );
-
-        // Read OSKs
-        let osk_a = SymKey::load_b64::<64, _>(peer_a_osk.clone())?;
-        let osk_b = SymKey::load_b64::<64, _>(peer_b_osk.clone())?;
-        match osk_a.secret() == osk_b.secret() {
-            true => break,
-            false if attempt > 10 => bail!("Peers did not produce a matching key even after ten attempts. Something is wrong with the key exchange!"),
-            false => {},
-        };
-
-        attempt += 1;
-    }
-
-    // Now connect to the peers
-    let api_a = UnixStream::connect(&peer_a.api.listen_path[0])?;
-    let api_b = UnixStream::connect(&peer_b.api.listen_path[0])?;
-
-    for conn in ([api_a, api_b]).iter() {
-        let mut echo = [0u8; 256];
-        copy_slice_least_src("Hello World".as_bytes()).to(&mut echo);
-
-        let req = api::PingRequest::new(echo);
-        LengthPrefixEncoder::from_message(req.as_bytes()).write_all_to_stdio(conn)?;
-
-        let mut decoder = LengthPrefixDecoder::new([0u8; api::MAX_RESPONSE_LEN]);
-        let res = decoder.read_all_from_stdio(conn)?;
-        let res = res.zk_parse::<api::PingResponse>()?;
-        assert_eq!(*res, api::PingResponse::new(echo));
-    }
-
-    Ok(())
-}

rosenpass/tests/config_Rosenpass_add_if_any.rs

@@ -1,10 +0,0 @@
-use rosenpass::config::Rosenpass;
-
-#[test]
-fn config_Rosenpass_add_if_any_example() {
-    let mut v = Rosenpass::empty();
-    v.add_if_any(4000);
-
-    assert!(v.listen.iter().any(|a| format!("{a:?}") == "0.0.0.0:4000"));
-    assert!(v.listen.iter().any(|a| format!("{a:?}") == "[::]:4000"));
-}

rosenpass/tests/config_Rosenpass_new.rs

@@ -1,18 +0,0 @@
-use rosenpass::config::{Keypair, Rosenpass};
-
-#[test]
-fn example_config_rosenpass_new() {
-    let (sk, pk) = ("./example.sk", "./example.pk");
-
-    assert_eq!(Rosenpass::empty(), Rosenpass::new(None));
-    assert_eq!(Rosenpass::empty(), Rosenpass::default());
-
-    assert_eq!(
-        Rosenpass::from_sk_pk(sk, pk),
-        Rosenpass::new(Some(Keypair::new(pk, sk)))
-    );
-
-    let mut v = Rosenpass::empty();
-    v.keypair = Some(Keypair::new(pk, sk));
-    assert_eq!(Rosenpass::from_sk_pk(sk, pk), v);
-}

rosenpass/tests/config_Rosenpass_parse_args_simple.rs

@@ -1,36 +0,0 @@
-use std::{
-    net::{IpAddr, Ipv4Addr, SocketAddr},
-    path::PathBuf,
-};
-
-use rosenpass::config::{Keypair, Rosenpass, RosenpassPeer, Verbosity};
-
-#[test]
-fn parse_simple() {
-    let argv = "public-key /my/public-key secret-key /my/secret-key verbose \
-                listen 0.0.0.0:9999 peer public-key /peer/public-key endpoint \
-                peer.test:9999 outfile /peer/rp-out";
-    let argv = argv.split(' ').map(|s| s.to_string()).collect();
-
-    let config = Rosenpass::parse_args(argv).unwrap();
-
-    assert_eq!(
-        config.keypair,
-        Some(Keypair::new("/my/public-key", "/my/secret-key"))
-    );
-    assert_eq!(config.verbosity, Verbosity::Verbose);
-    assert_eq!(
-        &config.listen,
-        &vec![SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 9999)]
-    );
-    assert_eq!(
-        config.peers,
-        vec![RosenpassPeer {
-            public_key: PathBuf::from("/peer/public-key"),
-            endpoint: Some("peer.test:9999".into()),
-            pre_shared_key: None,
-            key_out: Some(PathBuf::from("/peer/rp-out")),
-            ..Default::default()
-        }]
-    );
-}

rosenpass/tests/config_Rosenpass_store.rs

@@ -1,42 +0,0 @@
-use std::path::PathBuf;
-
-use rosenpass::config::{Rosenpass, Verbosity};
-
-#[test]
-fn example_config_rosenpass_store() -> anyhow::Result<()> {
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    let tmpdir = tempfile::tempdir()?;
-
-    let sk = tmpdir.path().join("example.sk");
-    let pk = tmpdir.path().join("example.pk");
-    let cfg = tmpdir.path().join("config.toml");
-
-    let mut c = Rosenpass::from_sk_pk(&sk, &pk);
-
-    // Can not commit config, path not known
-    assert!(c.commit().is_err());
-
-    // We can store it to an explicit path though
-    c.store(&cfg)?;
-
-    // Storing does not set commitment path
-    assert!(c.commit().is_err());
-
-    // We can reload the config now and the configurations
-    // are equal if we adjust the commitment path
-    let mut c2 = Rosenpass::load(&cfg)?;
-    c.config_file_path = PathBuf::from(&cfg);
-    assert_eq!(c, c2);
-
-    // And this loaded config can now be committed
-    c2.verbosity = Verbosity::Verbose;
-    c2.commit()?;
-
-    // And the changes actually made it to disk
-    let c3 = Rosenpass::load(cfg)?;
-    assert_eq!(c2, c3);
-    assert_ne!(c, c3);
-
-    Ok(())
-}

rosenpass/tests/config_Rosenpass_validate.rs

@@ -1,37 +0,0 @@
-use std::fs;
-
-use rosenpass::{cli::generate_and_save_keypair, config::Rosenpass};
-
-#[test]
-fn example_config_rosenpass_validate() -> anyhow::Result<()> {
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    let tmpdir = tempfile::tempdir()?;
-
-    // Empty validates OK
-    assert!(Rosenpass::empty().validate().is_ok());
-
-    // Missing secret key does not pass usefulness
-    assert!(Rosenpass::empty().check_usefullness().is_err());
-
-    let sk = tmpdir.path().join("example.sk");
-    let pk = tmpdir.path().join("example.pk");
-    let cfg = Rosenpass::from_sk_pk(&sk, &pk);
-
-    // Missing secret key does not validate
-    assert!(cfg.validate().is_err());
-
-    // But passes usefulness (the configuration is useful but invalid)
-    assert!(cfg.check_usefullness().is_ok());
-
-    // Providing empty key files does not help
-    fs::write(&sk, b"")?;
-    fs::write(&pk, b"")?;
-    assert!(cfg.validate().is_err());
-
-    // But after providing proper key files, the configuration validates
-    generate_and_save_keypair(sk, pk)?;
-    assert!(cfg.validate().is_ok());
-
-    Ok(())
-}

rosenpass/tests/integration_test.rs

@@ -1,4 +1,3 @@
-use std::fs::File;
 use std::{
     fs,
     net::UdpSocket,
@@ -6,10 +5,9 @@ use std::{
     sync::{Arc, Mutex},
     time::Duration,
 };
-use tempfile::tempdir;
 
 use clap::Parser;
-use rosenpass::{app_server::AppServerTestBuilder, cli::CliArgs, config::EXAMPLE_CONFIG};
+use rosenpass::{app_server::AppServerTestBuilder, cli::CliArgs};
 use rosenpass_secret_memory::{Public, Secret};
 use rosenpass_wireguard_broker::{WireguardBrokerMio, WG_KEY_LEN, WG_PEER_LEN};
 use serial_test::serial;
@@ -17,19 +15,9 @@ use std::io::Write;
 
 const BIN: &str = "rosenpass";
 
-fn setup_tests() {
-    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();
-}
-
 // check that we can generate keys
 #[test]
 fn generate_keys() {
-    setup_tests();
-
     let tmpdir = PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join("keygen");
     fs::create_dir_all(&tmpdir).unwrap();
 
@@ -106,11 +94,14 @@ fn run_server_client_exchange(
     .unwrap();
 
     std::thread::spawn(move || {
-        let test_helpers = server_test_builder
-            .termination_handler(Some(server_terminate_rx))
-            .build()
+        cli.command
+            .run(Some(
+                server_test_builder
+                    .termination_handler(Some(server_terminate_rx))
+                    .build()
+                    .unwrap(),
+            ))
             .unwrap();
-        cli.run(None, Some(test_helpers)).unwrap();
     });
 
     let cli = CliArgs::try_parse_from(
@@ -121,11 +112,14 @@ fn run_server_client_exchange(
     .unwrap();
 
     std::thread::spawn(move || {
-        let test_helpers = client_test_builder
-            .termination_handler(Some(client_terminate_rx))
-            .build()
+        cli.command
+            .run(Some(
+                client_test_builder
+                    .termination_handler(Some(client_terminate_rx))
+                    .build()
+                    .unwrap(),
+            ))
             .unwrap();
-        cli.run(None, Some(test_helpers)).unwrap();
     });
 
     // give them some time to do the key exchange under load
@@ -136,54 +130,10 @@ fn run_server_client_exchange(
     client_terminate.send(()).unwrap();
 }
 
-// verify that EXAMPLE_CONFIG is correct
-#[test]
-fn check_example_config() {
-    setup_tests();
-    setup_logging();
-
-    let tmp_dir = tempdir().unwrap();
-    let config_path = tmp_dir.path().join("config.toml");
-    let mut config_file = File::create(config_path.to_owned()).unwrap();
-
-    config_file
-        .write_all(
-            EXAMPLE_CONFIG
-                .replace("/path/to", tmp_dir.path().to_str().unwrap())
-                .as_bytes(),
-        )
-        .unwrap();
-
-    let output = test_bin::get_test_bin(BIN)
-        .args(["gen-keys"])
-        .arg(&config_path)
-        .output()
-        .expect("EXAMPLE_CONFIG not valid");
-
-    let stderr = String::from_utf8_lossy(&output.stderr);
-    assert_eq!(stderr, "");
-
-    fs::copy(
-        tmp_dir.path().join("rp-public-key"),
-        tmp_dir.path().join("rp-peer-public-key"),
-    )
-    .unwrap();
-
-    let output = test_bin::get_test_bin(BIN)
-        .args(["validate"])
-        .arg(&config_path)
-        .output()
-        .expect("EXAMPLE_CONFIG not valid");
-
-    let stderr = String::from_utf8_lossy(&output.stderr);
-    assert!(stderr.contains("has passed all logical checks"));
-}
-
 // check that we can exchange keys
 #[test]
 #[serial]
 fn check_exchange_under_normal() {
-    setup_tests();
     setup_logging();
 
     let tmpdir = PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join("exchange");
@@ -256,7 +206,6 @@ fn check_exchange_under_normal() {
 #[test]
 #[serial]
 fn check_exchange_under_dos() {
-    setup_tests();
     setup_logging();
 
     //Generate binary with responder with feature integration_test
@@ -334,11 +283,9 @@ struct MockBrokerInner {
     interface: Option<String>,
 }
 
-#[allow(dead_code)]
 #[derive(Debug, Default)]
 struct MockBroker {
     inner: Arc<Mutex<MockBrokerInner>>,
-    mio_token: Option<mio::Token>,
 }
 
 impl WireguardBrokerMio for MockBroker {
@@ -347,9 +294,8 @@ impl WireguardBrokerMio for MockBroker {
     fn register(
         &mut self,
         _registry: &mio::Registry,
-        token: mio::Token,
+        _token: mio::Token,
     ) -> Result<(), Self::MioError> {
-        self.mio_token = Some(token);
         Ok(())
     }
 
@@ -358,13 +304,8 @@ impl WireguardBrokerMio for MockBroker {
     }
 
     fn unregister(&mut self, _registry: &mio::Registry) -> Result<(), Self::MioError> {
-        self.mio_token = None;
         Ok(())
     }
-
-    fn mio_token(&self) -> Option<mio::Token> {
-        self.mio_token
-    }
 }
 
 impl rosenpass_wireguard_broker::WireGuardBroker for MockBroker {
@@ -380,7 +321,7 @@ impl rosenpass_wireguard_broker::WireGuardBroker for MockBroker {
             if let Ok(ref mut mutex) = lock {
                 **mutex = MockBrokerInner {
                     psk: Some(config.psk.clone()),
-                    peer_id: Some(*config.peer_id),
+                    peer_id: Some(config.peer_id.clone()),
                     interface: Some(std::str::from_utf8(config.interface).unwrap().to_string()),
                 };
                 break Ok(());

rosenpass/tests/main-fn-generates-manpages.rs

@@ -1,99 +0,0 @@
-use rosenpass_util::functional::ApplyExt;
-
-fn expect_section(manpage: &str, section: &str) -> anyhow::Result<()> {
-    anyhow::ensure!(manpage.lines().any(|line| { line.starts_with(section) }));
-    Ok(())
-}
-
-fn expect_sections(manpage: &str, sections: &[&str]) -> anyhow::Result<()> {
-    for section in sections.iter().copied() {
-        expect_section(manpage, section)?;
-    }
-    Ok(())
-}
-
-fn expect_contents(manpage: &str, patterns: &[&str]) -> anyhow::Result<()> {
-    for pat in patterns.iter().copied() {
-        anyhow::ensure!(manpage.contains(pat))
-    }
-    Ok(())
-}
-
-fn filter_backspace(str: &str) -> anyhow::Result<String> {
-    let mut out = String::new();
-    for chr in str.chars() {
-        if chr == '\x08' {
-            anyhow::ensure!(out.pop().is_some());
-        } else {
-            out.push(chr);
-        }
-    }
-    Ok(out)
-}
-
-/// Spot tests about man page generation; these are by far not exhaustive.
-#[test]
-fn main_fn_generates_manpages() -> anyhow::Result<()> {
-    let dir = tempfile::TempDir::with_prefix("rosenpass-test-main-fn-generates-mangapges")?;
-    let cmd_out = test_bin::get_test_bin("rosenpass")
-        .args(["--generate-manpage", dir.path().to_str().unwrap()])
-        .output()?;
-    assert!(cmd_out.status.success());
-
-    let expected_manpages = [
-        "rosenpass.1",
-        "rosenpass-exchange.1",
-        "rosenpass-exchange-config.1",
-        "rosenpass-gen-config.1",
-        "rosenpass-gen-keys.1",
-        "rosenpass-keygen.1",
-        "rosenpass-validate.1",
-    ];
-
-    let man_texts: std::collections::HashMap<&str, String> = expected_manpages
-        .iter()
-        .copied()
-        .map(|name| (name, dir.path().join(name)))
-        .map(|(name, path)| {
-            let res = std::process::Command::new("man").arg(path).output()?;
-            assert!(res.status.success());
-            let body = res
-                .stdout
-                .apply(String::from_utf8)?
-                .apply(|s| filter_backspace(&s))?;
-            Ok((name, body))
-        })
-        .collect::<anyhow::Result<_>>()?;
-
-    for (name, body) in man_texts.iter() {
-        expect_sections(body, &["NAME", "SYNOPSIS", "OPTIONS"])?;
-
-        if *name != "rosenpass.1" {
-            expect_section(body, "DESCRIPTION")?;
-        }
-    }
-
-    {
-        let body = man_texts.get("rosenpass.1").unwrap();
-        expect_sections(
-            body,
-            &["EXIT STATUS", "SEE ALSO", "STANDARDS", "AUTHORS", "BUGS"],
-        )?;
-        expect_contents(
-            body,
-            &[
-                "[--log-level]",
-                "rosenpass-exchange-config(1)",
-                "Start Rosenpass key exchanges based on a configuration file",
-                "https://rosenpass.eu/whitepaper.pdf",
-            ],
-        )?;
-    }
-
-    {
-        let body = man_texts.get("rosenpass-exchange.1").unwrap();
-        expect_contents(body, &["[-c|--config-file]", "PSK := preshared-key"])?;
-    }
-
-    Ok(())
-}

rosenpass/tests/main-fn-prints-errors.rs

@@ -1,10 +0,0 @@
-#[test]
-fn main_fn_prints_errors() -> anyhow::Result<()> {
-    let out = test_bin::get_test_bin("rosenpass")
-        .args(["exchange-config", "/"])
-        .output()?;
-    assert!(!out.status.success());
-    assert!(String::from_utf8(out.stderr)?.contains("Is a directory (os error 21)"));
-
-    Ok(())
-}

rosenpass/tests/poll_example.rs

@@ -1,642 +0,0 @@
-/// This file contains a correct simulation of a two-party key exchange using Poll
-use std::{
-    borrow::{Borrow, BorrowMut},
-    collections::VecDeque,
-    ops::DerefMut,
-};
-
-use rosenpass_cipher_traits::Kem;
-use rosenpass_ciphers::kem::StaticKem;
-use rosenpass_util::result::OkExt;
-
-use rosenpass::protocol::{
-    testutils::time_travel_forward, CryptoServer, HostIdentification, MsgBuf, PeerPtr, PollResult,
-    SPk, SSk, SymKey, Timing, UNENDING,
-};
-
-// TODO: Most of the utility functions in here should probably be moved to
-// rosenpass::protocol::testutils;
-
-#[test]
-fn test_successful_exchange_with_poll() -> anyhow::Result<()> {
-    // Set security policy for storing secrets; choose the one that is faster for testing
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    let mut sim = RosenpassSimulator::new()?;
-    sim.poll_loop(150)?; // Poll 75 times
-    let transcript = sim.transcript;
-
-    let _completions: Vec<_> = transcript
-        .iter()
-        .filter(|elm| matches!(elm, (_, TranscriptEvent::CompletedExchange(_))))
-        .collect();
-
-    #[cfg(not(coverage))]
-    assert!(
-        !_completions.is_empty(),
-        "\
-        Should have performed a successful key exchanged!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!(
-        _completions[0].0 < 20.0,
-        "\
-        First key exchange should happen in under twenty seconds!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-
-    #[cfg(not(coverage))]
-    assert!(
-        _completions.len() >= 3,
-        "\
-        Should have at least two renegotiations!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!(
-        (110.0..175.0).contains(&_completions[1].0),
-        "\
-        First renegotiation should happen in between two and three minutes!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!((110.0..175.0).contains(&(_completions[2].0 - _completions[1].0)), "\
-        First renegotiation should happen in between two and three minutes after the first renegotiation!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        ");
-
-    Ok(())
-}
-
-#[test]
-fn test_successful_exchange_under_packet_loss() -> anyhow::Result<()> {
-    // Set security policy for storing secrets; choose the one that is faster for testing
-    rosenpass_secret_memory::policy::secret_policy_use_only_malloc_secrets();
-
-    // Create the simulator
-    let mut sim = RosenpassSimulator::new()?;
-
-    // Make sure the servers are set to under load condition
-    sim.srv_a.under_load = true;
-    sim.srv_b.under_load = false; // See Issue #539 -- https://github.com/rosenpass/rosenpass/issues/539
-
-    // Perform the key exchanges
-    let mut pkg_counter = 0usize;
-    for _ in 0..300 {
-        let ev = sim.poll()?;
-        if let TranscriptEvent::ServerEvent {
-            source,
-            event: ServerEvent::Transmit(_, _),
-        } = ev
-        {
-            // Drop every fifth package
-            if pkg_counter % 10 == 0 {
-                source.drop_outgoing_packet(&mut sim);
-            }
-
-            pkg_counter += 1;
-        }
-    }
-
-    let transcript = sim.transcript;
-    let _completions: Vec<_> = transcript
-        .iter()
-        .filter(|elm| matches!(elm, (_, TranscriptEvent::CompletedExchange(_))))
-        .collect();
-
-    #[cfg(not(coverage))]
-    assert!(
-        !_completions.is_empty(),
-        "\
-        Should have performed a successful key exchanged!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!(
-        _completions[0].0 < 10.0,
-        "\
-          First key exchange should happen in under twenty seconds!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-
-    #[cfg(not(coverage))]
-    assert!(
-        _completions.len() >= 3,
-        "\
-        Should have at least two renegotiations!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!(
-        (110.0..175.0).contains(&_completions[1].0),
-        "\
-        First renegotiation should happen in between two and three minutes!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        "
-    );
-    #[cfg(not(coverage))]
-    assert!((110.0..175.0).contains(&(_completions[2].0 - _completions[1].0)), "\
-        First renegotiation should happen in between two and three minutes after the first renegotiation!\n\
-          Transcript: {transcript:?}\n\
-          Completions: {_completions:?}\
-        ");
-
-    Ok(())
-}
-
-type MessageType = u8;
-
-/// Lets record the events that are produced by Rosenpass
-#[derive(Debug)]
-#[allow(unused)]
-enum TranscriptEvent {
-    Wait(Timing),
-    ServerEvent {
-        source: ServerPtr,
-        event: ServerEvent,
-    },
-    CompletedExchange(SymKey),
-}
-
-#[derive(Debug)]
-#[allow(unused)]
-enum ServerEvent {
-    DeleteKey,
-    SendInitiationRequested,
-    SendRetransmissionRequested,
-    Exchanged(SymKey),
-    DiscardInvalidMessage(anyhow::Error),
-    Transmit(MessageType, SendMsgReason),
-    Receive(Option<MessageType>),
-    DroppedPackage,
-}
-
-#[derive(Debug, Clone, Copy)]
-enum SendMsgReason {
-    Initiation,
-    Response,
-    Retransmission,
-}
-
-impl TranscriptEvent {
-    fn hibernate() -> Self {
-        Self::Wait(UNENDING)
-    }
-
-    fn begin_poll() -> Self {
-        Self::hibernate()
-    }
-
-    fn transmit(source: ServerPtr, buf: &[u8], reason: SendMsgReason) -> Self {
-        assert!(!buf.is_empty());
-        let msg_type = buf[0];
-        ServerEvent::Transmit(msg_type, reason).into_transcript_event(source)
-    }
-
-    fn receive(source: ServerPtr, buf: &[u8]) -> Self {
-        let msg_type = (!buf.is_empty()).then(|| buf[0]);
-        ServerEvent::Receive(msg_type).into_transcript_event(source)
-    }
-
-    pub fn try_fold_with<F: FnOnce() -> anyhow::Result<TranscriptEvent>>(
-        self,
-        f: F,
-    ) -> anyhow::Result<TranscriptEvent> {
-        let wait_time_a = match self {
-            Self::Wait(wait_time_a) => wait_time_a,
-            els => return (els).ok(),
-        };
-
-        let wait_time_b = match f()? {
-            Self::Wait(wait_time_b) => wait_time_b,
-            els => return els.ok(),
-        };
-
-        let min_wt = if wait_time_a <= wait_time_b {
-            wait_time_a
-        } else {
-            wait_time_b
-        };
-        Self::Wait(min_wt).ok()
-    }
-}
-
-impl ServerEvent {
-    fn into_transcript_event(self, source: ServerPtr) -> TranscriptEvent {
-        let event = self;
-        TranscriptEvent::ServerEvent { source, event }
-    }
-}
-
-#[derive(Debug)]
-struct RosenpassSimulator {
-    transcript: Vec<(Timing, TranscriptEvent)>,
-    srv_a: SimulatorServer,
-    srv_b: SimulatorServer,
-    poll_focus: ServerPtr,
-}
-
-#[derive(Debug)]
-enum UpcomingPollResult {
-    IssueEvent(TranscriptEvent),
-    SendMessage(Vec<u8>, TranscriptEvent),
-}
-
-#[derive(Debug)]
-struct SimulatorServer {
-    /// We sometimes return multiple multiple events in one call,
-    /// but [ServerPtr::poll] should return just one event per call
-    upcoming_poll_results: VecDeque<UpcomingPollResult>,
-    srv: CryptoServer,
-    rx_queue: VecDeque<Vec<u8>>,
-    other_peer: PeerPtr,
-    under_load: bool,
-}
-
-impl RosenpassSimulator {
-    /// Set up the simulator
-    fn new() -> anyhow::Result<Self> {
-        // Set up the first server
-        let (mut peer_a_sk, mut peer_a_pk) = (SSk::zero(), SPk::zero());
-        StaticKem::keygen(peer_a_sk.secret_mut(), peer_a_pk.deref_mut())?;
-        let mut srv_a = CryptoServer::new(peer_a_sk, peer_a_pk.clone());
-
-        // …and the second server.
-        let (mut peer_b_sk, mut peer_b_pk) = (SSk::zero(), SPk::zero());
-        StaticKem::keygen(peer_b_sk.secret_mut(), peer_b_pk.deref_mut())?;
-        let mut srv_b = CryptoServer::new(peer_b_sk, peer_b_pk.clone());
-
-        // Generate a PSK and introduce the Peers to each other.
-        let psk = SymKey::random();
-        let peer_a = srv_a.add_peer(Some(psk.clone()), peer_b_pk)?;
-        let peer_b = srv_b.add_peer(Some(psk), peer_a_pk)?;
-
-        // Set up the individual server data structures
-        let srv_a = SimulatorServer::new(srv_a, peer_b);
-        let srv_b = SimulatorServer::new(srv_b, peer_a);
-
-        // Initialize transcript and polling state
-        let transcript = Vec::new();
-        let poll_focus = ServerPtr::A;
-
-        // Construct the simulator itself
-        Self {
-            transcript,
-            poll_focus,
-            srv_a,
-            srv_b,
-        }
-        .ok()
-    }
-
-    /// Call [poll] a fixed number of times
-    fn poll_loop(&mut self, times: u64) -> anyhow::Result<()> {
-        for _ in 0..times {
-            self.poll()?;
-        }
-        Ok(())
-    }
-
-    /// Every call to poll produces one [TranscriptEvent] and
-    /// and implicitly adds it to [Self:::transcript]
-    fn poll(&mut self) -> anyhow::Result<&TranscriptEvent> {
-        let ev = TranscriptEvent::begin_poll()
-            .try_fold_with(|| self.poll_focus.poll(self))?
-            .try_fold_with(|| {
-                self.poll_focus = self.poll_focus.other();
-                self.poll_focus.poll(self)
-            })?;
-
-        // Generate up a time stamp
-        let now = self.srv_a.srv.timebase.now();
-
-        // Push the event onto the transcript
-        self.transcript.push((now, ev));
-        // We can unwrap; we just pushed the event ourselves
-        let ev = self.transcript.last().unwrap().1.borrow();
-
-        // Time travel instead of waiting
-        if let TranscriptEvent::Wait(secs) = ev {
-            time_travel_forward(&mut self.srv_a.srv, *secs);
-            time_travel_forward(&mut self.srv_b.srv, *secs);
-        }
-
-        ev.ok()
-    }
-}
-
-impl SimulatorServer {
-    fn new(srv: CryptoServer, other_peer: PeerPtr) -> Self {
-        let upcoming_poll_results = VecDeque::new();
-        let rx_queue = VecDeque::new();
-        let under_load = false;
-        Self {
-            upcoming_poll_results,
-            srv,
-            rx_queue,
-            other_peer,
-            under_load,
-        }
-    }
-}
-
-/// Straightforward way of accessing either of the two servers
-/// with associated data
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-enum ServerPtr {
-    A,
-    B,
-}
-
-impl std::fmt::Display for ServerPtr {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_fmt(format_args!("{:?}", self))
-    }
-}
-
-impl HostIdentification for ServerPtr {
-    fn encode(&self) -> &[u8] {
-        match *self {
-            Self::A => b"ServerPtr::A",
-            Self::B => b"ServerPtr::B",
-        }
-    }
-}
-
-impl ServerPtr {
-    fn poll(self, sim: &mut RosenpassSimulator) -> anyhow::Result<TranscriptEvent> {
-        TranscriptEvent::begin_poll()
-            .try_fold_with(|| self.flush_upcoming_events(sim).ok())?
-            .try_fold_with(|| self.poll_for_timed_events(sim))?
-            .try_fold_with(|| self.process_incoming_messages(sim))
-    }
-
-    /// Returns and applies the first upcoming event
-    fn flush_upcoming_events(self, sim: &mut RosenpassSimulator) -> TranscriptEvent {
-        use UpcomingPollResult as R;
-        match self.get_mut(sim).upcoming_poll_results.pop_front() {
-            None => TranscriptEvent::hibernate(),
-            Some(R::IssueEvent(ev)) => ev,
-            Some(R::SendMessage(msg, ev)) => {
-                self.transmit(sim, msg);
-                ev
-            }
-        }
-    }
-
-    fn poll_for_timed_events(
-        self,
-        sim: &mut RosenpassSimulator,
-    ) -> anyhow::Result<TranscriptEvent> {
-        use PollResult as P;
-        use ServerEvent as SE;
-        use TranscriptEvent as TE;
-
-        let other_peer = self.peer(sim);
-
-        // Check if there are events to process from poll()
-        loop {
-            match self.srv_mut(sim).poll()? {
-                // Poll just told us to immediately call poll again
-                P::Sleep(0.0) => continue,
-
-                // No event to handle immediately. We can now check to see if there are some
-                // messages to be handled
-                P::Sleep(wait_time) => {
-                    return TE::Wait(wait_time).ok();
-                }
-
-                // Not deleting any keys in practice here, since we just push events to the
-                // transcript
-                P::DeleteKey(_) => {
-                    return SE::DeleteKey.into_transcript_event(self).ok();
-                }
-
-                P::SendInitiation(_) => {
-                    self.enqueue_upcoming_poll_event(
-                        sim,
-                        SE::SendInitiationRequested.into_transcript_event(self),
-                    );
-
-                    let mut buf = MsgBuf::zero();
-                    let len = self
-                        .srv_mut(sim)
-                        .initiate_handshake(other_peer, &mut buf[..])?;
-                    self.enqueue_upcoming_poll_transmission(
-                        sim,
-                        buf[..len].to_vec(),
-                        SendMsgReason::Initiation,
-                    );
-
-                    return self.flush_upcoming_events(sim).ok(); // Just added them
-                }
-
-                P::SendRetransmission(_) => {
-                    self.enqueue_upcoming_poll_event(
-                        sim,
-                        SE::SendRetransmissionRequested.into_transcript_event(self),
-                    );
-
-                    let mut buf = MsgBuf::zero();
-                    let len = self
-                        .srv_mut(sim)
-                        .retransmit_handshake(other_peer, &mut buf[..])?;
-                    self.enqueue_upcoming_poll_transmission(
-                        sim,
-                        buf[..len].to_vec(),
-                        SendMsgReason::Retransmission,
-                    );
-
-                    return self.flush_upcoming_events(sim).ok(); // Just added them
-                }
-            };
-        }
-    }
-
-    fn process_incoming_messages(
-        self,
-        sim: &mut RosenpassSimulator,
-    ) -> anyhow::Result<TranscriptEvent> {
-        use ServerEvent as SE;
-        use TranscriptEvent as TE;
-
-        // Check for a message or exit
-        let rx_msg = match self.recv(sim) {
-            None => return TE::hibernate().ok(),
-            // Actually received a message
-            Some(rx_msg) => rx_msg,
-        };
-
-        // Add info that a message was received into the transcript
-        self.enqueue_upcoming_poll_event(sim, TE::receive(self, rx_msg.borrow()));
-
-        // Let the crypto server handle the message now
-        let mut tx_buf = MsgBuf::zero();
-        let handle_msg_result = if self.get(sim).under_load {
-            self.srv_mut(sim)
-                .handle_msg_under_load(rx_msg.borrow(), tx_buf.borrow_mut(), &self)
-        } else {
-            self.srv_mut(sim)
-                .handle_msg(rx_msg.borrow(), tx_buf.borrow_mut())
-        };
-
-        // Handle bad messages
-        let handle_msg_result = match handle_msg_result {
-            Ok(res) => res,
-            Err(e) => {
-                self.enqueue_upcoming_poll_event(
-                    sim,
-                    SE::DiscardInvalidMessage(e).into_transcript_event(self),
-                );
-                return self.flush_upcoming_events(sim).ok(); // Just added them
-            }
-        };
-
-        // Successful key exchange; emit the appropriate event
-        if handle_msg_result.exchanged_with.is_some() {
-            self.enqueue_on_exchanged_events(sim)?;
-        }
-
-        // Handle message responses
-        if let Some(len) = handle_msg_result.resp {
-            let resp = &tx_buf[..len];
-            self.enqueue_upcoming_poll_transmission(sim, resp.to_vec(), SendMsgReason::Response);
-        };
-
-        // Return the first of the events we just enqueued
-        self.flush_upcoming_events(sim).ok()
-    }
-
-    fn enqueue_on_exchanged_events(self, sim: &mut RosenpassSimulator) -> anyhow::Result<()> {
-        use ServerEvent as SE;
-        use TranscriptEvent as TE;
-
-        // Retrieve the key exchanged; this function will panic if the OSK is missing
-        let osk = self.osk(sim).unwrap();
-
-        // Issue the `Exchanged`
-        self.enqueue_upcoming_poll_event(
-            sim,
-            SE::Exchanged(osk.clone()).into_transcript_event(self),
-        );
-
-        // Retrieve the other osk
-        let other_osk = match self.other().try_osk(sim) {
-            Some(other_osk) => other_osk,
-            None => return Ok(()),
-        };
-
-        // Issue the successful exchange event if the OSKs are equal;
-        // be careful to use constant time comparison for things like this!
-        if rosenpass_constant_time::memcmp(osk.secret(), other_osk.secret()) {
-            self.enqueue_upcoming_poll_event(sim, TE::CompletedExchange(osk));
-        }
-
-        Ok(())
-    }
-
-    fn enqueue_upcoming_poll_event(self, sim: &mut RosenpassSimulator, ev: TranscriptEvent) {
-        let upcoming = UpcomingPollResult::IssueEvent(ev);
-        self.get_mut(sim).upcoming_poll_results.push_back(upcoming);
-    }
-
-    fn enqueue_upcoming_poll_transmission(
-        self,
-        sim: &mut RosenpassSimulator,
-        msg: Vec<u8>,
-        reason: SendMsgReason,
-    ) {
-        let ev = TranscriptEvent::transmit(self, msg.borrow(), reason);
-        let upcoming = UpcomingPollResult::SendMessage(msg, ev);
-        self.get_mut(sim).upcoming_poll_results.push_back(upcoming);
-    }
-
-    fn try_osk(self, sim: &RosenpassSimulator) -> Option<SymKey> {
-        let peer = self.peer(sim);
-        let has_osk = peer.session().get(self.srv(sim)).is_some();
-
-        has_osk.then(|| {
-            // We already checked whether the OSK is present; there should be no other errors
-            self.osk(sim).unwrap()
-        })
-    }
-
-    fn osk(self, sim: &RosenpassSimulator) -> anyhow::Result<SymKey> {
-        self.srv(sim).osk(self.peer(sim))
-    }
-
-    fn drop_outgoing_packet(self, sim: &mut RosenpassSimulator) -> Option<Vec<u8>> {
-        let pkg = self.tx_queue_mut(sim).pop_front();
-        self.enqueue_upcoming_poll_event(
-            sim,
-            ServerEvent::DroppedPackage.into_transcript_event(self),
-        );
-        pkg
-    }
-
-    fn other(self) -> Self {
-        match self {
-            Self::A => Self::B,
-            Self::B => Self::A,
-        }
-    }
-
-    fn get(self, sim: &RosenpassSimulator) -> &SimulatorServer {
-        match self {
-            ServerPtr::A => sim.srv_a.borrow(),
-            ServerPtr::B => sim.srv_b.borrow(),
-        }
-    }
-
-    fn get_mut(self, sim: &mut RosenpassSimulator) -> &mut SimulatorServer {
-        match self {
-            ServerPtr::A => sim.srv_a.borrow_mut(),
-            ServerPtr::B => sim.srv_b.borrow_mut(),
-        }
-    }
-
-    fn srv(self, sim: &RosenpassSimulator) -> &CryptoServer {
-        self.get(sim).srv.borrow()
-    }
-
-    fn srv_mut(self, sim: &mut RosenpassSimulator) -> &mut CryptoServer {
-        self.get_mut(sim).srv.borrow_mut()
-    }
-
-    fn peer(self, sim: &RosenpassSimulator) -> PeerPtr {
-        self.get(sim).other_peer
-    }
-
-    fn recv(self, sim: &mut RosenpassSimulator) -> Option<Vec<u8>> {
-        self.rx_queue_mut(sim).pop_front()
-    }
-
-    fn transmit(self, sim: &mut RosenpassSimulator, msg: Vec<u8>) {
-        self.tx_queue_mut(sim).push_back(msg);
-    }
-
-    fn rx_queue_mut(self, sim: &mut RosenpassSimulator) -> &mut VecDeque<Vec<u8>> {
-        self.get_mut(sim).rx_queue.borrow_mut()
-    }
-
-    fn tx_queue_mut(self, sim: &mut RosenpassSimulator) -> &mut VecDeque<Vec<u8>> {
-        self.other().rx_queue_mut(sim)
-    }
-}