Repository navigation
Make the harvested verifiedBootHash user-editable; honour pinned NDK in build.sh - #312
Merged
Merged
Conversation
the data-dir FileObserver only matched config.json and *.xml, so a save from the overrides group wrote overrides.json but resolveAndPush() never re-merged and /status kept serving the boot-time record -- an override edit appeared to revert to the stale value until the daemon restarted. overrides.json is written atomically like config.json (temp file + rename), so the existing CLOSE_WRITE/MOVED_TO mask already covers it; only the path filter needed widening.
JingMatrix
force-pushed
the
harvest-hash-override
branch
from
October 19, 2026 15:44
d3c57ea to
b78b93a
Compare
Owner
|
Thanks — |
JingMatrix
added a commit
that referenced
this pull request
Oct 19, 2026
The DATA_DIR observer fired only for config.json and the keyboxes, so an override written from the WebUI reached nobody: writeOverride waits 600ms for that watcher and never calls /rescan, and OverrideStore.load runs only at daemon init and inside resolveAndPush. An edit therefore did nothing until a reboot or an unrelated push, while /status kept serving the pre-edit record. Co-Authored-By: JingMatrix <jingmatrix@gmail.com>
Owner
|
@cawilliamson Can you please again a new PR with commit cb4044a. The first merge has formatting issue, while the second merge we have the annoying |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two independent fixes; separate commits, feel free to cherry-pick.
1. verifiedBootHash is now user-editable (
84dcb99)On devices where the TEE reports a usable-but-useless boot hash (unlocked bootloader with verification disabled reports an all-f placeholder), there was no way to override the hash:
userEditableonly allowed it when the captured value was a fallback, andbuildOverridesemitted no entry at all when the raw capture was usable — so the WebUI showed the field locked andoverrides.jsonentries were ignored (override ignoring non-editable field 'verifiedBootHash').Since the hash is attestation-only and — per the existing docs — carries no stored-key/KEK constraint (unlike the boot key, which stays fallback-only-editable), it is safe to always present it as an editable override:
buildOverridesnow always emits averifiedBootHashentry; when the raw capture is usable it presents the captured value as the replaceable defaultuserEditableneeds no change: it already keys off the entry'seditableflagverifiedBootHashis already in the field order/hex-editor listsVerified on device (unlocked OB-A98, GSI): override in
overrides.jsonnow applies, the daemon force-syncsro.boot.vbmeta.digestto the attested value, and fresh attestations carry the configured hash.2. build.sh: honour an explicitly pinned NDK (
2426f88)rust/build.shonly honouredNDK_HOME, then fell back to newest-installed-wins — silently overriding the workflow's deliberateANDROID_NDK_HOMEpin ("Pinned for reproducibility") whenever the runner image ships a newer NDK. Currentubuntu-latestimages now include NDK 30 alongside the pinned 28.2, and the openssl-sys bindgen step fails against NDK 30 (Unversioned target triples are not supported!) — dev-branch CI is affected too. The fallback now prefersANDROID_NDK_HOMEwhen it points at a real directory.Both changes covered by the normal
zipReleaseCI run on my fork (green onharvest-hash-override).