Merge branch 'main' into dev/changelog

google · Oct 4, 2024 · 3705667 · 3705667
2 parents a328f9c + 909ec3c
commit 3705667
Show file tree

Hide file tree

Showing 224 changed files with 5,933 additions and 1,885 deletions.
diff --git a/.github/actions/ci-checks/action.yml b/.github/actions/ci-checks/action.yml
@@ -12,7 +12,7 @@ runs:
     - if: >-
         ${{ contains(fromJSON(inputs.checks), 'changelog')
          || contains(fromJSON(inputs.checks), 'sync') }}
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       with:
         fetch-depth: 0
     - if: inputs.use-cache == 'true'
@@ -69,7 +69,7 @@ runs:
       run: ./scripts/ci-tests.sh 3 4
       shell: bash
     - if: ${{ contains(fromJSON(inputs.checks), 'hw-host') }}
-      run: ./scripts/hwci.sh host --no-default-features
+      run: ./scripts/hwci.sh host
       shell: bash
     - if: ${{ contains(fromJSON(inputs.checks), 'book') }}
       run: ./scripts/ci-book.sh

diff --git a/.github/actions/ci-footprint/action.yml b/.github/actions/ci-footprint/action.yml
@@ -12,7 +12,7 @@ runs:
     - run: mv footprint.toml footprint-${{ github.event_name }}.toml
       shell: bash
     - if: github.event_name == 'push' && inputs.upload == 'true'
-      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: footprint
         path: footprint-push.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Compute the checks for ${{ github.event_name }}
         id: checks
         run: |
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: checks
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - if: github.event_name != 'schedule'
         id: cache
         name: Restore and save the cache
@@ -84,7 +84,7 @@ jobs:
         check: ${{ fromJSON(needs.checks.outputs.checks) }}
     name: ${{ matrix.check }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Run the ${{ matrix.check }} check
         uses: ./.github/actions/ci-checks
         with:
@@ -104,9 +104,9 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - run: ./scripts/artifacts.sh
-      - uses: actions/attest-build-provenance@210c1913531870065f03ce1f9440dd87bc0938cd # v1.4.0
+      - uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
         id: attest
         with:
           subject-path: 'artifacts/*'

diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           fetch-depth: 0
       - run: sudo apt-get update

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -18,19 +18,19 @@ jobs:
       # Needed to publish results and get a badge (see publish_results below).
       id-token: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
       - uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
           publish_results: true
-      - uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
-      - uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+      - uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           sarif_file: results.sarif
diff --git a/crates/api-desc/CHANGELOG.md b/crates/api-desc/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.2.1-git
 
+### Minor
+
+- Remove `debug::exit()` and add `scheduling::exit()` instead
+
 ### Patch
 
 - Update dependencies

diff --git a/crates/api-desc/src/debug.rs b/crates/api-desc/src/debug.rs
@@ -72,16 +72,6 @@ pub(crate) fn new() -> Item {
                 ptr: *mut u8,
             } -> ()
         },
-        item! {
-            /// Exits the platform with an error code.
-            ///
-            /// This is used by test applets to terminate the platform and propagate the test
-            /// result.
-            fn exit "de" {
-                /// 0 for success, 1 for failure.
-                code: usize,
-            } -> !
-        },
     ];
     Item::Mod(Mod { docs, name, items })
 }
diff --git a/crates/api-desc/src/scheduling.rs b/crates/api-desc/src/scheduling.rs
@@ -32,6 +32,10 @@ pub(crate) fn new() -> Item {
             /// Aborts the applet.
             fn abort "sa" {} -> !
         },
+        item! {
+            /// Exits the applet.
+            fn exit "se" {} -> !
+        },
     ];
     Item::Mod(Mod { docs, name, items })
 }
diff --git a/crates/api-macro/CHANGELOG.md b/crates/api-macro/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.6.2-git
+## 0.7.0-git
+
+### Major
+
+- Update `wasefire-applet-api-desc` version
 
 ### Patch
 

diff --git a/crates/api-macro/Cargo.lock b/crates/api-macro/Cargo.lock
diff --git a/crates/api-macro/Cargo.toml b/crates/api-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasefire-applet-api-macro"
-version = "0.6.2-git"
+version = "0.7.0-git"
 authors = ["Julien Cretin <cretin@google.com>"]
 license = "Apache-2.0"
 publish = true

diff --git a/crates/api/CHANGELOG.md b/crates/api/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
-## 0.6.2-git
+## 0.7.0-git
+
+### Major
+
+- Update `wasefire-applet-api-macro` version
 
 ### Patch
 
+- Make sure at compile-time that exactly one `host` or `wasm` feature is enabled
 - Update dependencies
 
 ## 0.6.1
@@ -93,4 +98,4 @@
 
 ## 0.1.0
 
-<!-- Increment to skip CHANGELOG.md test: 1 -->
+<!-- Increment to skip CHANGELOG.md test: 2 -->
diff --git a/crates/api/Cargo.lock b/crates/api/Cargo.lock
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasefire-applet-api"
-version = "0.6.2-git"
+version = "0.7.0-git"
 authors = ["Julien Cretin <cretin@google.com>"]
 license = "Apache-2.0"
 publish = true
@@ -18,9 +18,10 @@ features = ["full-api", "wasm"]
 [dependencies]
 bytemuck = { version = "1.16.0", default-features = false, features = ["derive"] }
 sealed = { version = "0.5.0", default-features = false, optional = true }
-wasefire-applet-api-macro = { version = "0.6.2-git", path = "../api-macro" }
+wasefire-applet-api-macro = { version = "0.7.0-git", path = "../api-macro" }
 wasefire-error = { version = "0.1.2-git", path = "../error" }
-wasefire-logger = { version = "0.1.5", path = "../logger", optional = true }
+wasefire-logger = { version = "0.1.6-git", path = "../logger", optional = true }
+wasefire-one-of = { version = "0.1.0-git", path = "../one-of" }
 
 [features]
 # Compiles for host or wasm (choose exactly one).

diff --git a/crates/api/src/lib.rs b/crates/api/src/lib.rs
@@ -24,12 +24,15 @@ extern crate alloc;
 #[cfg(feature = "host")]
 pub use host::*;
 use wasefire_error as _;
+use wasefire_one_of::exactly_one_of;
 
 #[cfg(feature = "host")]
 mod host;
 #[cfg(feature = "wasm")]
 pub(crate) mod wasm;
 
+exactly_one_of!["host", "wasm"];
+
 #[cfg(feature = "wasm")]
 wasefire_applet_api_macro::wasm!();
 

diff --git a/crates/board/CHANGELOG.md b/crates/board/CHANGELOG.md
@@ -4,11 +4,18 @@
 
 ### Major
 
+- Remove `platform::protocol::Api::disable()` in favor of locking
+- Add `Api::Applet` as a required API for simple applet management
+- Remove `debug::Api::exit()`
+- Remove `api-platform{,-protocol,-update}` features making those APIs required
+- (Only when `api-platform-protocol` is used) Change `platform::protocol::Api::{enable,disable}()`
+  to also control whether requests are accepted
 - (Only when `api-storage` is used) The reexported `wasefire-store::Storage` now uses
   `wasefire-error` for errors
 
 ### Minor
 
+- Add `usb::serial::Serial::{read,write,flush,enable,disable}()` to bypass `HasSerial`
 - Implement `defmt::Format` for `Event` when `defmt` is enabled
 
 ### Patch
@@ -153,4 +160,4 @@
 
 ## 0.1.0
 
-<!-- Increment to skip CHANGELOG.md test: 0 -->
+<!-- Increment to skip CHANGELOG.md test: 2 -->
diff --git a/crates/board/Cargo.lock b/crates/board/Cargo.lock
diff --git a/crates/board/Cargo.toml b/crates/board/Cargo.toml
@@ -35,11 +35,11 @@ typenum = { version = "1.17.0", default-features = false, optional = true }
 usb-device = { version = "0.3.2", default-features = false, optional = true }
 usbd-serial = { version = "0.2.2", default-features = false, optional = true }
 wasefire-error = { version = "0.1.2-git", path = "../error" }
-wasefire-logger = { version = "0.1.5", path = "../logger" }
+wasefire-logger = { version = "0.1.6-git", path = "../logger" }
 wasefire-store = { version = "0.3.0-git", path = "../store", optional = true }
 
 [dependencies.wasefire-applet-api]
-version = "0.6.2-git"
+version = "0.7.0-git"
 path = "../api"
 features = ["host"]
 optional = true
@@ -62,9 +62,6 @@ api-crypto-sha256 = ["internal-api-crypto-hash"]
 api-crypto-sha384 = ["internal-api-crypto-hash"]
 api-gpio = ["bytemuck/derive"]
 api-led = []
-api-platform = ["internal-api-platform"]
-api-platform-protocol = ["internal-api-platform"]
-api-platform-update = ["internal-api-platform"]
 api-radio-ble = ["internal-api-radio", "wasefire-applet-api/api-radio-ble"]
 api-rng = []
 api-storage = ["dep:wasefire-store"]
@@ -84,9 +81,6 @@ full-api = [
   "api-crypto-sha384",
   "api-gpio",
   "api-led",
-  "api-platform",
-  "api-platform-protocol",
-  "api-platform-update",
   "api-radio-ble",
   "api-rng",
   "api-storage",
@@ -132,7 +126,6 @@ internal-api-crypto-aead = ["dep:crypto-common", "dep:typenum", "internal-api-cr
 internal-api-crypto-ecc = ["dep:crypto-common", "dep:typenum", "internal-api-crypto"]
 internal-api-crypto-hash = ["dep:crypto-common", "dep:digest", "dep:typenum", "internal-api-crypto"]
 internal-api-crypto-hmac = ["dep:crypto-common", "dep:typenum", "digest/mac", "internal-api-crypto"]
-internal-api-platform = []
 internal-api-radio = []
 internal-api-usb = []
 internal-software-crypto = [