Fixes setup and paths

Cargo.toml

@@ -12,10 +12,10 @@ edition = "2024"
 
 [dependencies]
 portable-atomic-util = { version = "0.2.6", default-features = false, features = ["alloc"] }
-wasefire-common = { version = "0.1.0", optional = true }
+wasefire-common = { path = "third_party/wasefire/crates/common", optional = true }
 
 [dependencies.wasefire]
-version = "0.8.1"
+path = "third_party/wasefire/crates/prelude"
 default-features = false
 features = [
   "api-button",

docs/install.md

@@ -13,11 +13,10 @@ In order to compile and flash a working OpenSK firmware, you will need the
 following:
 
 - rustup (can be installed with [Rustup](https://rustup.rs/))
-- uv (can be installed with
-  [uv](https://docs.astral.sh/uv/getting-started/installation/))
-- python3 and pip (can be installed with the `python3-pip` package on Debian)
 - the OpenSSL command line tool (can be installed and configured with the
   `libssl-dev` and `pkg-config` packages on Debian)
+- uv and python3 (optional, for sending CTAP commands for configuration, can be
+  installed with [uv](https://docs.astral.sh/uv/getting-started/installation/))
 
 ## Setup
 

libraries/opensk/Cargo.toml

@@ -25,7 +25,7 @@ hkdf = { version = "0.12.3", default-features = false, optional = true }
 aes = { version = "0.8.2", default-features = false, optional = true }
 cbc = { version = "0.1.2", default-features = false, optional = true }
 zeroize = { version = "1.5.7", features = ["derive"] }
-wasefire-store = { version = "=0.2.4", optional = true }
+wasefire-store = { version = "0.2.4", optional = true }
 
 [dependencies.p256]
 version = "0.13.0"

libraries/opensk/src/ctap/status_code.rs

@@ -109,7 +109,7 @@ impl From<Ctap2StatusCode> for key_store::Error {
     }
 }
 
-#[cfg(feature = "wasefire-store")]
+#[cfg(feature = "std")]
 impl From<wasefire_store::StoreError> for Ctap2StatusCode {
     fn from(error: wasefire_store::StoreError) -> Ctap2StatusCode {
         use wasefire_store::StoreError;
@@ -144,7 +144,7 @@ mod test {
     }
 
     #[test]
-    #[cfg(feature = "wasefire-store")]
+    #[cfg(feature = "std")]
     fn test_wasefire_store_errors() -> () {
         for (store_error, ctap_error) in [
             (

setup.sh

@@ -19,22 +19,16 @@ done_text="$(tput bold)DONE.$(tput sgr0)"
 
 set -e
 
-# Installs uv for OSS-Fuzz
-if [[ -n "${CI}" ]] && ! command -v uv &> /dev/null; then
-    curl -LsSf "https://astral.sh/uv/install.sh" | sh
-    export PATH="${HOME}/.local/bin:${HOME}/.cargo/bin:${PATH}"
+if ! command -v rustup &> /dev/null; then
+  echo "❌ Missing rustup command."
+  echo "Please follow the steps at https://rustup.rs/ to install it."
+  exit 1
 fi
 
-# Check that rustup and pip3 are installed
-check_command () {
-  if ! which "$1" >/dev/null
-  then
-    echo "Missing $1 command. Follow the steps under $2 to install it."
-    exit 1
-  fi
-}
-check_command rustup "https://rustup.rs/"
-check_command uv "https://docs.astral.sh/uv/getting-started/installation/"
+if ! command -v uv &> /dev/null; then
+  echo "uv command not found, optional for device configuration. "
+  echo "Install with: https://docs.astral.sh/uv/getting-started/installation/"
+fi
 
 git submodule update --init