From 853cb16bdb30d5331aa0edb7abf3429e40cfa62c Mon Sep 17 00:00:00 2001
From: Kyle Kotowick <kotowick@invictonlabs.com>
Date: Sun, 27 Oct 2024 22:11:48 +0000
Subject: [PATCH] Add features to USB emulator

---
 Cargo.lock                      | 1 -
 Cargo.toml                      | 4 +++-
 runners/usbip/Cargo.toml        | 5 +++++
 runners/usbip/delayed-attach.sh | 6 ++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 73043262..86a3daee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3398,7 +3398,6 @@ dependencies = [
 [[package]]
 name = "trussed-rsa-alloc"
 version = "0.2.1"
-source = "git+https://github.com/trussed-dev/trussed-rsa-backend.git?tag=v0.2.1#655eca355df59e85a9f1d803623bc2efa10a8b5a"
 dependencies = [
  "delog",
  "heapless-bytes",
diff --git a/Cargo.toml b/Cargo.toml
index 4636c49c..469b2b87 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ trussed-wrap-key-to-file = { git = "https://github.com/trussed-dev/trussed-stagi
 trussed-staging = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "v0.3.1" }
 trussed-auth = { git = "https://github.com/trussed-dev/trussed-auth", rev = "947ffe6cff426ccbbbb2d0f689437f427665919e" }
 trussed-hkdf = { git = "https://github.com/trussed-dev/trussed-staging.git", tag = "hkdf-v0.2.0" }
-trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.2.1" }
+#trussed-rsa-alloc = { git = "https://github.com/trussed-dev/trussed-rsa-backend.git", tag = "v0.2.1" }
 trussed-usbip = { git = "https://github.com/Nitrokey/pc-usbip-runner.git", tag = "v0.0.1-nitrokey.4" }
 trussed-se050-manage = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag = "se050-manage-v0.1.0" }
 trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backend.git", tag ="v0.3.5" }
@@ -53,6 +53,8 @@ trussed-se050-backend = { git = "https://github.com/Nitrokey/trussed-se050-backe
 # TODO: revert to remote
 trussed = { path = "../trussed"}
 # TODO: revert to remote
+trussed-rsa-alloc = { path = "../trussed-rsa-backend" }
+# TODO: revert to remote
 trussed-pqc-backend = { path = "../trussed-pqc-backend" }
 # TODO: delete and uncomment above
 ctap-types = { path = "../ctap-types" }
diff --git a/runners/usbip/Cargo.toml b/runners/usbip/Cargo.toml
index 0fa5da02..b19d482a 100644
--- a/runners/usbip/Cargo.toml
+++ b/runners/usbip/Cargo.toml
@@ -26,3 +26,8 @@ utils = { path = "../../components/utils", features = ["build"] }
 test = ["apps/nk3-test"]
 provisioner = ["apps/nk3-provisioner"]
 ccid = ["apps/trussed-usbip-ccid", "trussed-usbip/ccid"]
+
+# PQC
+backend-dilithium2 = ["apps/backend-dilithium2"]
+backend-dilithium3 = ["apps/backend-dilithium3"]
+backend-dilithium5 = ["apps/backend-dilithium5"]
\ No newline at end of file
diff --git a/runners/usbip/delayed-attach.sh b/runners/usbip/delayed-attach.sh
index a3f184b3..82b0097e 100755
--- a/runners/usbip/delayed-attach.sh
+++ b/runners/usbip/delayed-attach.sh
@@ -51,9 +51,11 @@ while [ $(date +%s) -le $endtime ]; do
         sleep $attach_delay
 
         # Check if it's been attached
-        if lsusb | grep -q "$device_name"; then
+        if lsusb | tee /dev/tty | grep -q "$device_name"; then
             echo "Device attached!"
-            lsusb | grep "$device_name"
+            while true; do
+                sleep 100
+            done
             exit 0
         fi