From 1959942b1a72c8d178b6cab2913c19234749a732 Mon Sep 17 00:00:00 2001
From: Surya Midatala <suryamidatala@google.com>
Date: Fri, 9 Aug 2024 15:08:59 +0000
Subject: [PATCH] Fix CI

---
 crates/api-desc/src/usb.rs       |   5 -
 crates/prelude/Cargo.toml        |   1 -
 crates/runner-host/Cargo.toml    |   1 -
 crates/runner-nordic/Cargo.toml  |   1 -
 crates/scheduler/Cargo.toml      |   8 -
 crates/scheduler/src/call/usb.rs |   4 -
 examples/rust/opensk/Cargo.lock  | 297 +------------------------------
 7 files changed, 1 insertion(+), 316 deletions(-)

diff --git a/crates/api-desc/src/usb.rs b/crates/api-desc/src/usb.rs
index e6435190..29ff5619 100644
--- a/crates/api-desc/src/usb.rs
+++ b/crates/api-desc/src/usb.rs
@@ -17,9 +17,6 @@ use crate::*;
 #[cfg(feature = "api-usb-serial")]
 mod serial;
 
-#[cfg(feature = "api-usb-ctap")]
-mod ctap;
-
 pub(crate) fn new() -> Item {
     let docs = docs! {
         /// USB operations.
@@ -28,8 +25,6 @@ pub(crate) fn new() -> Item {
     let items = vec![
         #[cfg(feature = "api-usb-serial")]
         serial::new(),
-        #[cfg(feature = "api-usb-ctap")]
-        ctap::new(),
     ];
     Item::Mod(Mod { docs, name, items })
 }
diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml
index 891f5628..aced93b7 100644
--- a/crates/prelude/Cargo.toml
+++ b/crates/prelude/Cargo.toml
@@ -24,7 +24,6 @@ digest = { version = "0.10.7", default-features = false, features = ["mac"], opt
 rlsf = { version = "0.2.1", default-features = false, optional = true }
 sealed = { version = "0.5.0", default-features = false, optional = true }
 typenum = { version = "1.17.0", default-features = false, optional = true }
-usbd-ctaphid = "0.1.0"
 wasefire-applet-api = { version = "0.6.1", path = "../api", features = ["wasm"] }
 wasefire-error = { version = "0.1.1", path = "../error" }
 wasefire-sync = { version = "0.1.1", path = "../sync" }
diff --git a/crates/runner-host/Cargo.toml b/crates/runner-host/Cargo.toml
index ff702801..e656d4a5 100644
--- a/crates/runner-host/Cargo.toml
+++ b/crates/runner-host/Cargo.toml
@@ -53,7 +53,6 @@ usb = [
   "dep:usbip-device",
   "dep:wasefire-protocol-usb",
   "wasefire-scheduler/board-api-platform-protocol",
-  "wasefire-scheduler/board-api-usb-ctap",
   "wasefire-scheduler/board-api-usb-serial",
 ]
 web = ["dep:web-server"]
diff --git a/crates/runner-nordic/Cargo.toml b/crates/runner-nordic/Cargo.toml
index 15a208e1..21562338 100644
--- a/crates/runner-nordic/Cargo.toml
+++ b/crates/runner-nordic/Cargo.toml
@@ -57,7 +57,6 @@ features = [
   "board-api-storage",
   "board-api-timer",
   "board-api-uart",
-  "board-api-usb-ctap",
   "board-api-usb-serial",
 ]
 
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
index ad2f3bf0..f567cc2f 100644
--- a/crates/scheduler/Cargo.toml
+++ b/crates/scheduler/Cargo.toml
@@ -84,7 +84,6 @@ applet-api-store = ["internal-applet-api-store", "wasefire-applet-api/api-store"
 applet-api-store-fragment = ["internal-applet-api-store", "wasefire-applet-api/api-store-fragment"]
 applet-api-timer = ["wasefire-applet-api/api-timer"]
 applet-api-uart = ["wasefire-applet-api/api-uart"]
-applet-api-usb-ctap = ["internal-applet-api-usb", "wasefire-applet-api/api-usb-ctap"]
 applet-api-usb-serial = ["internal-applet-api-usb", "wasefire-applet-api/api-usb-serial"]
 # Board API features. Enabling a board API feature automatically enables all
 # applet API features that would be implemented.
@@ -154,11 +153,6 @@ board-api-storage = [
 ]
 board-api-timer = ["applet-api-timer", "wasefire-board-api/api-timer"]
 board-api-uart = ["applet-api-uart", "wasefire-board-api/api-uart"]
-board-api-usb-ctap = [
-  "applet-api-usb-ctap",
-  "internal-board-api-usb",
-  "wasefire-board-api/api-usb-ctap",
-]
 board-api-usb-serial = [
   "applet-api-usb-serial",
   "internal-board-api-usb",
@@ -186,7 +180,6 @@ full-applet-api = [
   "applet-api-store-fragment",
   "applet-api-timer",
   "applet-api-uart",
-  "applet-api-usb-ctap",
   "applet-api-usb-serial",
 ]
 # Enables all board API features (unstable).
@@ -210,7 +203,6 @@ full-board-api = [
   "board-api-storage",
   "board-api-timer",
   "board-api-uart",
-  "board-api-usb-ctap",
   "board-api-usb-serial",
 ]
 # Software crypto features. Enabling a software crypto feature automatically
diff --git a/crates/scheduler/src/call/usb.rs b/crates/scheduler/src/call/usb.rs
index 53086e70..617992c4 100644
--- a/crates/scheduler/src/call/usb.rs
+++ b/crates/scheduler/src/call/usb.rs
@@ -19,14 +19,10 @@ use crate::DispatchSchedulerCall;
 
 #[cfg(feature = "applet-api-usb-ctap")]
 mod ctap;
-#[cfg(feature = "applet-api-usb-serial")]
-mod serial;
 
 pub fn process<B: Board>(call: Api<DispatchSchedulerCall<B>>) {
     match call {
         #[cfg(feature = "applet-api-usb-serial")]
         Api::Serial(call) => serial::process(call),
-        #[cfg(feature = "applet-api-usb-ctap")]
-        Api::Ctap(call) => ctap::process(call),
     }
 }
diff --git a/examples/rust/opensk/Cargo.lock b/examples/rust/opensk/Cargo.lock
index 1a9f67b5..9d5bb941 100644
--- a/examples/rust/opensk/Cargo.lock
+++ b/examples/rust/opensk/Cargo.lock
@@ -17,33 +17,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
-[[package]]
-name = "atomic-polyfill"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
-dependencies = [
- "critical-section",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
-
 [[package]]
 name = "base16ct"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.4.1"
@@ -91,18 +70,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "cbor-smol"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d516e3e353d5fc5ee156028f43224033430fd08ef05f8d5dba18a57a4ee5df49"
-dependencies = [
- "delog",
- "heapless",
- "heapless-bytes",
- "serde",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.83"
@@ -124,17 +91,6 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
-[[package]]
-name = "cosey"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39323fe531b92e7acad90b8550b58cec63d29a6c5a56e02de4b25b6aeedbf82e"
-dependencies = [
- "heapless-bytes",
- "serde",
- "serde_repr",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -144,12 +100,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "critical-section"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-
 [[package]]
 name = "crypto"
 version = "0.1.0"
@@ -189,37 +139,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "ctap-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e4fa005ff525537460e1fd70a1ff4f417ae4a6ed14887f3e4720221e20f7562"
-dependencies = [
- "bitflags 1.3.2",
- "cbor-smol",
- "cosey",
- "delog",
- "heapless",
- "heapless-bytes",
- "interchange",
- "iso7816",
- "serde",
- "serde-indexed",
- "serde_repr",
-]
-
-[[package]]
-name = "ctaphid-dispatch"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9e775f67c3a82a134a9e23e0771d3fb3808612ab03843cd31a9b0312004bdde"
-dependencies = [
- "delog",
- "heapless",
- "heapless-bytes",
- "interchange",
-]
-
 [[package]]
 name = "data-encoding"
 version = "2.6.0"
@@ -246,15 +165,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "delog"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2b93368262340c9d4441251b824500d1b641a50957ecf4219a2cc41b9eac8f"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "der"
 version = "0.7.9"
@@ -308,15 +218,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "embedded-time"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a4b4d10ac48d08bfe3db7688c402baadb244721f30a77ce360bd24c3dffe58"
-dependencies = [
- "num",
-]
-
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -375,40 +276,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "hash32"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "heapless"
-version = "0.7.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
-dependencies = [
- "atomic-polyfill",
- "hash32",
- "rustc_version",
- "serde",
- "spin 0.9.8",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "heapless-bytes"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7285eba272c6af3e9f15fb9e1c1b6e7d35aa70580ffe0d47af017e97dfb6f48b"
-dependencies = [
- "heapless",
- "serde",
- "typenum",
-]
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -439,22 +306,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "interchange"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310d743c23f798f10d5ba2f77fdd3eff06aaf2d8f8b9d78beba7fb1167f4ccbf"
-
-[[package]]
-name = "iso7816"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3af73ac9c821e7aea3280532118e15cdf9e7bb45c923cbf0e319ae25b27d20c"
-dependencies = [
- "delog",
- "heapless",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -476,16 +327,6 @@ version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -498,68 +339,6 @@ version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
-[[package]]
-name = "num"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
-dependencies = [
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.7.2"
@@ -621,7 +400,7 @@ version = "0.10.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -810,27 +589,12 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "sealed"
 version = "0.5.0"
@@ -856,12 +620,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
 [[package]]
 name = "serde"
 version = "1.0.197"
@@ -871,17 +629,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-indexed"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca2da10b1f1623f47130256065e05e94fd7a98dbd26a780a4c5de831b21e5c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.197"
@@ -904,17 +651,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_repr"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "sha2"
 version = "0.10.8"
@@ -952,16 +688,9 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 dependencies = [
- "lock_api",
  "portable-atomic",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "subtle"
 version = "2.5.0"
@@ -1008,29 +737,6 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
-[[package]]
-name = "usb-device"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6cc3adc849b5292b4075fc0d5fdcf2f24866e88e336dd27a8943090a520508"
-
-[[package]]
-name = "usbd-ctaphid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddb69f660f962236eb21565780c433412ad0ba35e5106f53191cdf443c1d03d2"
-dependencies = [
- "ctap-types",
- "ctaphid-dispatch",
- "delog",
- "embedded-time",
- "heapless",
- "heapless-bytes",
- "interchange",
- "serde",
- "usb-device",
-]
-
 [[package]]
 name = "uuid"
 version = "0.8.2"
@@ -1066,7 +772,6 @@ dependencies = [
  "crypto-common",
  "sealed",
  "typenum",
- "usbd-ctaphid",
  "wasefire-applet-api",
  "wasefire-error",
  "wasefire-sync",