fix(multicore): an AMP core starts only on an image that verified

.github/workflows/ci.yml

@@ -250,7 +250,7 @@ jobs:
   ci-gate:
     name: CI Gate
     runs-on: ubuntu-22.04
-    needs: [test, build-arm, static-analysis]
+    needs: [test, build-arm, fuzz-build, static-analysis]
     if: always()
     steps:
       - uses: actions/checkout@v4

.github/workflows/eosim-sanity.yml

@@ -23,6 +23,14 @@ jobs:
   install-validate:
     name: Install & Validate (${{ matrix.os }}, Python ${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
+    # Every step here is written in bash: `$(...)`, `|| { ... }`, a heredoc,
+    # and /tmp. Without this the Windows legs ran them under PowerShell, where
+    # `SITE_PACKAGES=$(...)` is an unknown command and the job went red, while
+    # the `|| { exit 1 }` guard in "Verify installation" parsed as an unexecuted
+    # script block and could never fail.
+    defaults:
+      run:
+        shell: bash
     strategy:
       fail-fast: false
       matrix:

.github/workflows/scorecard.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: ossf/scorecard-action@v2.4.0
+      - uses: ossf/scorecard-action@v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

CHANGELOG.md

@@ -13,6 +13,13 @@
 - **`image_verify.c`:** `eos_image_verify_integrity` rejects a zero `image_size`, and an `addr + hdr_size` that wraps `uint32_t`, instead of computing a payload address that is not the payload.
 
 ### Fixed
+- **The tree did not configure, compile or link after the 09-07 batch merge.** `tests/CMakeLists.txt` registered `eboot_test_fdt_loader` twice; `core/sha512.c` had been replaced by a version predating the `bitlen[2]`/`buffer_len` context; `core/boot_log.c`, `core/secure_boot.c` and `core/fdt_loader.c` had been dropped from `eboot_core`; `scalarbase()` and `k_low_order[]` were defined twice; and the `eos_boot_log_get_head()` declaration was lost. All restored.
+- **Install-path verification order settled: signature before anti-rollback.** `eos_fw_update_finalize()` verifies the Ed25519 signature over the signed header prefix first and reads the TLV security counter only after the prefix that binds it is authenticated (see `docs/adr/ADR-020`). The `fw_update` and `fw_transport` suites now stream genuinely signed images; `tools/gen_fw_update_test_sigs.py` emits their signatures as `tests/vectors/fw_update_test_sigs.h`, and `tests/unit/test_fw_update_test_sigs.py` pins the committed header to the generator's output.
+- **`tests/CMakeLists.txt`:** the Valgrind list is derived from the registered suites again; a hand-written copy had replaced it, eleven registered suites were missing from `EBLDR_UNIT_TESTS`, and seven of those (`test_eos_sign_boot_path`, `test_fdt_loader`, `test_fw_decrypt`, `test_fw_update_sig`, `test_jump_app_bounds`, `test_qemu_arm64_timer`, `test_secure_boot_policy`) had no Valgrind run at all; the other four were only in the hand-written list. All eleven are appended.
+- **`.github/workflows/ci.yml`:** `fuzz-build` is in the CI gate. It was added after the gate job and the gate never waited for it.
+- **Unit suites count `tests_run`** as each test executes instead of assigning it a literal that the summary line then trusted.
+- **`.github/workflows/eosim-sanity.yml`:** the install-validate job's steps are bash and now run under `shell: bash` on the Windows legs, where PowerShell rejected `SITE_PACKAGES=$(...)` and parsed `|| { exit 1 }` as an unexecuted script block.
+- **`.github/workflows/scorecard.yml`:** `ossf/scorecard-action` moved to v2.4.3, the release hosted on ghcr.io; v2.4.0 pulls from gcr.io, which now requires GCP billing.
 - **The tree did not compile.** `include/eos_image.h` declared `eos_crc32()` as `int eos_crc32(uint32_t, size_t, uint32_t *)` while `core/image_verify.c` defined it as `uint32_t eos_crc32(uint32_t, size_t)` -- a conflicting-types error that stopped the build at the first core source file. The declaration now matches the definition and the documented behaviour.
 - **`ed25519_verify.c`:** `eos_ed25519_verify()` never performed the verification. Two merged copies of the challenge-hash step had been left in the function, the second referring to identifiers that do not exist (`sha512_ctx_t`, `sc_reduce`), and RFC 8032 step 4 -- the `[S]B == R + [k]A` check -- was absent entirely, leaving the function returning an undeclared `diff`. The duplicate is removed and the group-equation check restored; the function now passes the RFC 8032 test vectors and rejects tampered messages, every single-bit signature flip, wrong keys and malleated signatures.
 - **`recovery.c`:** `recovery_handle_write()` declared `slot_size` twice, which does not compile. The bounds check now calls `eos_recovery_write_in_range()` -- the helper the unit tests already exercise -- so the wire-input rule has one definition, and an unmapped slot (`base == 0`) is rejected too.

CMakeLists.txt

@@ -80,6 +80,7 @@ target_include_directories(eboot_hal PUBLIC ${EBLDR_INCLUDE_DIR})
 # ---- Core boot logic ----
 add_library(eboot_core STATIC
     core/bootctl.c
+    core/boot_log.c
     core/image_verify.c
     core/slot_manager.c
     core/boot_policy.c
@@ -106,8 +107,10 @@ add_library(eboot_core STATIC
     core/os_adapter.c
     core/ed25519_verify.c
     core/sha512.c
-    core/keystore.c
+    core/secure_boot.c
+    core/fdt_loader.c
     core/rollback.c
+    core/keystore.c
     core/debug_lock.c
     core/fw_decrypt.c
     core/image_tlv.c

core/ed25519_verify.c

@@ -300,16 +300,6 @@ static int point_is_identity(gf p[4])
     return diff == 0;
 }
 
-static void scalarbase(gf r[4], const uint8_t *s)
-{
-    gf q[4];
-    fe_copy16(q[0], BX);
-    fe_copy16(q[1], BY);
-    fe_copy16(q[2], gf1);
-    fe_mul(q[3], BX, BY);
-    scalarmult(r, q, s);
-}
-
 /* Reject a public key outside the prime-order subgroup.
  *
  * Decoding a point is not enough. Ed25519 has eight points of low order, and

core/multicore.c

@@ -61,14 +61,38 @@ int eos_multicore_start(const eos_core_config_t *cfg)
     if (cfg->core_id >= EOS_MAX_CORES) return EOS_ERR_INVALID;
     if (cfg->entry_addr == 0) return EOS_ERR_INVALID;
 
-    /* For AMP mode, verify the firmware image exists in the slot */
+    /* For AMP mode, verify the firmware image in the slot before a core is
+     * allowed to execute it. Parsing the header only proves the slot is
+     * shaped like an image; it authenticates nothing. Every other consumer
+     * of a slot in this tree also checks integrity and signature --
+     * slot_manager.c verify_slot(), stage1/jump_app.c, recovery.c and
+     * fw_update.c -- and this path did not.
+     *
+     * The checks live here rather than in eos_multicore_start_amp() because
+     * this function is public and a caller can reach it with a hand-built
+     * config; putting them in the wrapper alone would leave that entry
+     * point unverified.
+     *
+     * entry_addr must be the one the signed header names. Verifying the
+     * image and then branching somewhere else would authenticate an image
+     * nobody runs: eos_multicore_start_amp() already derives entry_addr
+     * from the header, so this rejects only a config that disagrees with
+     * the image it points at. */
     if (cfg->mode == EOS_CORE_AMP && cfg->image_slot != EOS_SLOT_NONE) {
         uint32_t slot_addr = eos_hal_slot_addr(cfg->image_slot);
         if (slot_addr == 0) return EOS_ERR_NO_IMAGE;
 
         eos_image_header_t hdr;
         int rc = eos_image_parse_header(slot_addr, &hdr);
         if (rc != EOS_OK) return rc;
+
+        rc = eos_image_verify_integrity(&hdr, slot_addr);
+        if (rc != EOS_OK) return rc;
+
+        rc = eos_image_verify_signature(&hdr);
+        if (rc != EOS_OK) return rc;
+
+        if (cfg->entry_addr != hdr.entry_addr) return EOS_ERR_INVALID;
     }
 
     /* Store config */