Skip to content

Commit

Permalink
Add features to USB emulator
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleKotowick committed Oct 27, 2024
1 parent ad1a0de commit 853cb16
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,16 @@ 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" }

# 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" }
Expand Down
5 changes: 5 additions & 0 deletions runners/usbip/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
6 changes: 4 additions & 2 deletions runners/usbip/delayed-attach.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 853cb16

Please sign in to comment.