From 3e44e17ea83486699c9aa5aeb65a2a4904ba4ee9 Mon Sep 17 00:00:00 2001 From: flawedworld <38294951+flawedworld@users.noreply.github.com> Date: Mon, 1 Mar 2021 19:55:57 +0000 Subject: [PATCH] Add ability to remove non-stock key via WebUSB. --- static/install/web.html | 20 +++++++++++++++++++- static/js/web-install.js | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/static/install/web.html b/static/install/web.html index b7bd6333..5ec251f8 100644 --- a/static/install/web.html +++ b/static/install/web.html @@ -28,7 +28,7 @@ - +
@@ -80,6 +80,7 @@
  • Booting
  • Disabling OEM unlocking
  • Verifying installation
    • +
  • Replacing GrapheneOS with the stock OS
  • Further information
    • @@ -333,6 +334,23 @@ also consider setting up the optional remote attestation service.

    +
    +

    Replacing GrapheneOS with the stock OS

    + +

    Installation of the stock OS via the stock factory images is the same process + described above. However, before locking, there's an additional step to fully revert + the device to a clean factory state.

    + +

    The GrapheneOS factory images flash a non-stock Android Verified Boot key which + needs to be erased to fully revert back to a stock device state. After flashing the + stock factory images and before locking the bootloader, you should erase the custom + Android Verified Boot key to untrust it:

    + + + +

    +
    +

    Further information

    diff --git a/static/js/web-install.js b/static/js/web-install.js index 9571b49f..9b88502e 100644 --- a/static/js/web-install.js +++ b/static/js/web-install.js @@ -207,6 +207,19 @@ async function flashRelease(setProgress) { return `Flashed ${latestZip} to device.`; } +async function eraseNonStockKey(setProgress) { + await ensureConnected(setProgress); + + setProgress("Erasing key..."); + try { + await device.runCommand("erase:avb_custom_key"); + } catch (error) { + console.log(error); + throw error; + } + return "Key erased."; +} + async function lockBootloader(setProgress) { await ensureConnected(setProgress); @@ -281,6 +294,7 @@ if ("usb" in navigator) { addButtonHook("download-release", downloadRelease); addButtonHook("flash-release", flashRelease); addButtonHook("lock-bootloader", lockBootloader); + addButtonHook("remove-custom-key", eraseNonStockKey); } else { console.log("WebUSB unavailable"); }