Version 3.20.0

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
CHANGELOG.md: Add entry for PR #487
2026-07-03 14:05:11 +02:00 · 2025-08-10 22:35:40 -04:00 · 2025-08-10 22:24:42 -04:00 · 2025-08-10 22:21:24 -04:00 · 2025-08-10 22:10:31 -04:00 · 2025-08-10 22:03:09 -04:00
48 changed files with 3066 additions and 1628 deletions
@@ -34,8 +34,7 @@ jobs:
              - aarch64-apple-darwin
              - x86_64-apple-darwin
            combine: lipo
-          # ubuntu-latest is not 24.04 yet and 22.04's qemu-user-static segfaults.
-          - os: ubuntu-24.04
+          - os: ubuntu-latest
            name: aarch64-linux-android31
            targets:
              - aarch64-linux-android
@@ -84,7 +83,7 @@ jobs:
          done

      - name: Cache Rust dependencies
-        uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7
+        uses: Swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # v2.8.0
        with:
          key: ${{ matrix.artifact.name }}

@@ -93,7 +92,7 @@ jobs:
        run: |
          for target in ${TARGETS}; do
              cargo android \
-                  clippy --release --workspace --features static \
+                  clippy --release --workspace \
                  --target "${target}"
          done

@@ -102,7 +101,7 @@ jobs:
        run: |
          for target in ${TARGETS}; do
              cargo android \
-                  build --release --workspace --features static \
+                  build --release --workspace \
                  --target "${target}"
          done

@@ -111,7 +110,7 @@ jobs:
        run: |
          for target in ${TARGETS}; do
              cargo android \
-                  test --release --workspace --features static \
+                  test --release --workspace \
                  --target "${target}"
          done

@@ -120,7 +119,7 @@ jobs:
        run: |
          for target in ${TARGETS}; do
              cargo android \
-                  run --release -p e2e --features static \
+                  run --release -p e2e \
                  --target "${target}" \
                  -- test -a -c e2e/e2e.toml
          done
@@ -155,7 +154,7 @@ jobs:
        run: cp LICENSE README.md target/output/

      - name: Archive executable
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: avbroot-${{ steps.get_version.outputs.version }}-${{ matrix.artifact.name }}
          path: |
@@ -13,4 +13,4 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Run cargo-deny
-        uses: EmbarkStudios/cargo-deny-action@e2f4ede4a4e60ea15ff31bc0647485d80c66cfba # v2.0.4
+        uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
@@ -27,7 +27,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

      - name: Create release
-        uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2.2.1
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
        with:
          tag_name: v${{ steps.get_version.outputs.version }}
          name: Version ${{ steps.get_version.outputs.version }}
@@ -7,6 +7,93 @@
    to update the actual links at the bottom of the file.
 -->

+### Version 3.20.0
+
+* Switch to using lzma-rust2 for XZ compression and decompression ([PR #483])
+* Remove cap-std and cap-tempfile dependencies ([PR #484])
+* Add new `avbroot avb verify-device` command to verify the signatures on the actual device ([Issue #482], [PR #485], [PR #486])
+  * This is only available in the Android build of avbroot.
+* Update dependencies and fix new Rust 1.89 clippy lints ([PR #487])
+
+### Version 3.19.0
+
+* Allow verifying hashes of unsigned images with `avbroot avb verify` ([PR #477])
+* Warn when verifying image containing insecure flags field with `avbroot avb verify` ([PR #478])
+* Force re-signing of signed images in `avbroot avb pack` when fields were changed externally ([PR #479])
+
+### Version 3.18.1
+
+* Fix output file corruption in `avbroot sparse unpack` when unpacking a sparse file with holes larger than 2^32 ([Issue #472], [PR #476])
+
+### Version 3.18.0
+
+* Make OTA metadata property file field validation more lenient ([Issue #469], [PR #470])
+  * Fixes `avbroot ota verify` for stock OTAs that include extra zip file entries in the metadata
+* Remove automatic promotion of insecure SHA-1 AVB hash algorithm to SHA-256 ([Issue #366], [Issue #469], [PR #473])
+  * There are insecure devices that don't support SHA-256 and won't boot with it.
+  * The original feature was a bandaid for OnePlus devices to make them a tiny bit more secure. They used SHA-256 for every partition except `system`. However, OnePlus no longer supports custom AVB keys anyway, so this feature is going away.
+* Add support for Magisk 30200 ([PR #474])
+* Update dependencies ([PR #475])
+
+### Version 3.17.2
+
+* Add support for Magisk 30100 ([PR #468])
+
+### Version 3.17.1
+
+* Update end-to-end tests to place streaming and seekable OTAs in separate directories for easier troubleshooting ([PR #463])
+* Update dependencies ([PR #464])
+* Add support for Magisk 30000 ([PR #467])
+
+### Version 3.17.0
+
+* Fix reserved space error when patching OTA zips larger than ~10 GB ([Issue #451], [PR #452])
+* Update dependencies ([PR #453])
+
+### Version 3.16.1
+
+* Add support for Magisk 29000 ([PR #448])
+* Update dependencies ([PR #449])
+
+### Version 3.16.0
+
+* Add support for CoW version 3 for virtual A/B ([Issue #441], [PR #442], [PR #445])
+  * This was recently introduced with the Pixel 9a. Previous devices all used CoW version 2.
+* Add support for uncompressed CoW for virtual A/B ([PR #443])
+  * This is not used on actual devices, but is very useful for testing the CoW estimation logic.
+  * All differences between avbroot's and AOSP delta_generator's estimation logic are now fixed.
+* Add support for custom CoW compression levels for virtual A/B ([PR #444])
+  * This is also not used on actual devices, but is supported by AOSP, so avbroot should support it too.
+* Update dependencies ([PR #446])
+
+### Version 3.15.0
+
+* Add support for changing the virtual A/B compression algorithm ([PR #437])
+    * For devices that launched with Android <14, `--vabc-algo lz4` can significantly increase OTA installation speed when using a custom OTA updater app (with caveats). There is no difference when sideloading from recovery mode.
+    * See [the documentation](./README.md#changing-virtual-ab-cow-compression-algorithm) for more details.
+* Switch back to the ring library now that it is maintained again ([PR #438])
+* Update dependencies ([PR #439])
+
+### Version 3.14.0
+
+* Report as many errors as possible before failing in `avbroot ota verify` and improve error messages ([Discussion #426], [PR #428], [PR #430])
+* Fix new clippy warnings introduced in Rust 1.85 ([PR #429])
+* Fix massive performance regression introduced in 3.13.0 for OTAs that use gzip for virtual A/B CoW compression ([Issue #433], [PR #434])
+* Update dependencies ([PR #435])
+
+### Version 3.13.0
+
+* Fix parsing Samsung `super.img` files in `avbroot lp` due to Samsung putting their own data structures in a region that's supposed to be filled with zeros ([PR #415])
+* Add advanced option to skip replacing the OTA certificate in the system image ([Discussion #417], [PR #418])
+* Switch to stable bzip2-rs release and use zlib-rs as the backend for flate2 ([PR #421])
+* Switch to the aws-lc cryptography library for SHA1 and SHA2 hashing ([PR #422])
+    * The ring library is no longer maintained
+* Fix incorrect `Partitions aren't protected by AVB: system` warning when using `--skip-system-ota-cert` ([PR #423])
+* Discard unneeded temp file sooner when using `--skip-system-ota-cert` ([PR #424])
+* Make `avbroot lp`'s parser less strict so that it can load on-device `super` partitions ([PR #425])
+    * The on-disk layout on virtual A/B devices violates some requirements stated in AOSP's documentation
+* Update dependencies ([PR #427])
+
 ### Version 3.12.0

 * Add new `-p <name>` option to `avbroot ota extract` for extracting specific partitions ([PR #408])
@@ -280,6 +367,8 @@ Behind-the-scenes changes:
 [Discussion #235]: https://github.com/chenxiaolong/avbroot/discussions/235
 [Discussion #286]: https://github.com/chenxiaolong/avbroot/discussions/286
 [Discussion #294]: https://github.com/chenxiaolong/avbroot/discussions/294
+[Discussion #417]: https://github.com/chenxiaolong/avbroot/discussions/417
+[Discussion #426]: https://github.com/chenxiaolong/avbroot/discussions/426
 [Issue #138]: https://github.com/chenxiaolong/avbroot/issues/138
 [Issue #144]: https://github.com/chenxiaolong/avbroot/issues/144
 [Issue #145]: https://github.com/chenxiaolong/avbroot/issues/145
@@ -306,6 +395,12 @@ Behind-the-scenes changes:
 [Issue #356]: https://github.com/chenxiaolong/avbroot/issues/356
 [Issue #366]: https://github.com/chenxiaolong/avbroot/issues/366
 [Issue #393]: https://github.com/chenxiaolong/avbroot/issues/393
+[Issue #433]: https://github.com/chenxiaolong/avbroot/issues/433
+[Issue #441]: https://github.com/chenxiaolong/avbroot/issues/441
+[Issue #451]: https://github.com/chenxiaolong/avbroot/issues/451
+[Issue #469]: https://github.com/chenxiaolong/avbroot/issues/469
+[Issue #472]: https://github.com/chenxiaolong/avbroot/issues/472
+[Issue #482]: https://github.com/chenxiaolong/avbroot/issues/482
 [PR #130]: https://github.com/chenxiaolong/avbroot/pull/130
 [PR #132]: https://github.com/chenxiaolong/avbroot/pull/132
 [PR #133]: https://github.com/chenxiaolong/avbroot/pull/133
@@ -444,3 +539,45 @@ Behind-the-scenes changes:
 [PR #409]: https://github.com/chenxiaolong/avbroot/pull/409
 [PR #410]: https://github.com/chenxiaolong/avbroot/pull/410
 [PR #411]: https://github.com/chenxiaolong/avbroot/pull/411
+[PR #415]: https://github.com/chenxiaolong/avbroot/pull/415
+[PR #418]: https://github.com/chenxiaolong/avbroot/pull/418
+[PR #421]: https://github.com/chenxiaolong/avbroot/pull/421
+[PR #422]: https://github.com/chenxiaolong/avbroot/pull/422
+[PR #423]: https://github.com/chenxiaolong/avbroot/pull/423
+[PR #424]: https://github.com/chenxiaolong/avbroot/pull/424
+[PR #425]: https://github.com/chenxiaolong/avbroot/pull/425
+[PR #427]: https://github.com/chenxiaolong/avbroot/pull/427
+[PR #428]: https://github.com/chenxiaolong/avbroot/pull/428
+[PR #429]: https://github.com/chenxiaolong/avbroot/pull/429
+[PR #430]: https://github.com/chenxiaolong/avbroot/pull/430
+[PR #434]: https://github.com/chenxiaolong/avbroot/pull/434
+[PR #435]: https://github.com/chenxiaolong/avbroot/pull/435
+[PR #437]: https://github.com/chenxiaolong/avbroot/pull/437
+[PR #438]: https://github.com/chenxiaolong/avbroot/pull/438
+[PR #439]: https://github.com/chenxiaolong/avbroot/pull/439
+[PR #442]: https://github.com/chenxiaolong/avbroot/pull/442
+[PR #443]: https://github.com/chenxiaolong/avbroot/pull/443
+[PR #444]: https://github.com/chenxiaolong/avbroot/pull/444
+[PR #445]: https://github.com/chenxiaolong/avbroot/pull/445
+[PR #446]: https://github.com/chenxiaolong/avbroot/pull/446
+[PR #448]: https://github.com/chenxiaolong/avbroot/pull/448
+[PR #449]: https://github.com/chenxiaolong/avbroot/pull/449
+[PR #452]: https://github.com/chenxiaolong/avbroot/pull/452
+[PR #453]: https://github.com/chenxiaolong/avbroot/pull/453
+[PR #463]: https://github.com/chenxiaolong/avbroot/pull/463
+[PR #464]: https://github.com/chenxiaolong/avbroot/pull/464
+[PR #467]: https://github.com/chenxiaolong/avbroot/pull/467
+[PR #468]: https://github.com/chenxiaolong/avbroot/pull/468
+[PR #470]: https://github.com/chenxiaolong/avbroot/pull/470
+[PR #473]: https://github.com/chenxiaolong/avbroot/pull/473
+[PR #474]: https://github.com/chenxiaolong/avbroot/pull/474
+[PR #475]: https://github.com/chenxiaolong/avbroot/pull/475
+[PR #476]: https://github.com/chenxiaolong/avbroot/pull/476
+[PR #477]: https://github.com/chenxiaolong/avbroot/pull/477
+[PR #478]: https://github.com/chenxiaolong/avbroot/pull/478
+[PR #479]: https://github.com/chenxiaolong/avbroot/pull/479
+[PR #483]: https://github.com/chenxiaolong/avbroot/pull/483
+[PR #484]: https://github.com/chenxiaolong/avbroot/pull/484
+[PR #485]: https://github.com/chenxiaolong/avbroot/pull/485
+[PR #486]: https://github.com/chenxiaolong/avbroot/pull/486
+[PR #487]: https://github.com/chenxiaolong/avbroot/pull/487
@@ -4,9 +4,9 @@ members = ["avbroot", "e2e", "fuzz", "xtask"]
 resolver = "2"

 [workspace.package]
-version = "3.12.0"
+version = "3.20.0"
 license = "GPL-3.0-only"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/chenxiaolong/avbroot"

 [workspace.lints.clippy]
@@ -30,8 +30,6 @@ This subcommand packs a new AVB image from the `avb.toml` file and, for appended
 * To force an image to be signed, use `--key <path> --force`.
 * To force an image to be unsigned, use `--force` without specifying `--key`.

-Note that if the image is an appended image and its hash or hash tree descriptor uses an insecure algorithm, like `sha1`, then it will automatically be promoted to `sha256`.
-
 By default, for appended vbmeta images, the output image size will match the size of the original image that was unpacked. This size is specified by the `image_size` field in `avb.toml`. If the image is resizable (eg. `system`), then passing in `--recompute-size` will cause the `image_size` field to be ignored and the smallest possible output file that fits the raw image and AVB metadata will be built. This avoids wasting space if `raw.img` shrunk or allows the packing to work at all if `raw.img` grew. **Do not use this option for non-resizable images** (eg. `boot`) or else the device won't be able to boot.

 When packing an image, several of the fields in `avb.toml` may potentially be recomputed. To write a TOML file containing the new values, use `--output-info <output TOML>`. It is safe to overwrite the existing `avb.toml` if desired.
@@ -60,12 +58,23 @@ This subcommand shows all of the vbmeta header and footer fields. `vbmeta` parti
 avbroot avb verify -i <root vbmeta image> -p <public key>
 ```

-This subcommand verifies the vbmeta header signature and the hashes for all vbmeta descriptors (including hash tree descriptors). If the vbmeta image has a chain descriptor for another partition, that partition image will be verified as well (recursively). All partitions are expected to be in the same directory as the vbmeta image being verified.
+This subcommand verifies the vbmeta header signature and the hashes for all vbmeta descriptors (including hash tree descriptors). If the vbmeta image has a chain descriptor for another partition, that partition image will be verified as well (recursively). All images are expected to be in the same directory as the vbmeta image being verified. Missing images are ignored by default because the vbmeta images in some OTAs reference partitions that only exist on a real device. `--fail-if-missing` can be used to override this.

 If `-p` is omitted, the signatures and hashes are checked only for validity, not that they are trusted.

 By default, this command will not write to any file and fails if an image is corrupt or invalid. To attempt to repair corrupted dm-verity images, pass in `--repair`.

+### Verifying AVB hashes and signatures on device
+
+```bash
+# Run from a root adb shell:
+avbroot avb verify-device [-p <public key>]
+```
+
+This subcommand is like `avbroot avb verify`, except that it verifies the actual partitions on the device instead of a directory of image files. This is only available in the Android build of avbroot.
+
+If `-p` is omitted, the signatures are verified against the public key SHA-256 digest reported by the bootloader. This is the same digest shown on screen every time the device boots.
+
 ### Computing vbmeta digest

 ```bash
@@ -2,12 +2,10 @@

 (This page is also available in: [Russian (Русский)](./README.ru.md).)

-avbroot is a program for patching Android A/B-style OTA images for root access while preserving AVB (Android Verified Boot) using custom signing keys. It is compatible with both Magisk and KernelSU. If desired, it can also just re-sign an OTA without enabling root access.
+avbroot is a tool for modifying Android A/B OTA images reproducibly and re-signing them with custom keys. It also includes a [collection of subcommands](./README.extra.md) for packing and unpacking numerous Android image formats.

 Having a good understanding of how AVB and A/B OTAs work is recommended prior to using avbroot. At the very least, please make sure the [warnings and caveats](#warnings-and-caveats) are well-understood to avoid the risk of hard bricking.

-**NOTE:** avbroot 2.0 has been rewritten in Rust and no longer relies on any AOSP code. The CLI is fully backwards compatible, but the old Python implementation can be found in the `python` branch if needed.
-
 ## Requirements

 * Only devices that use modern A/B partitioning are supported. This is the case for most non-Samsung devices launched with Android 10 or newer. To check if a device uses this partitioning scheme, open the OTA zip file and check that:
@@ -23,7 +21,7 @@ Having a good understanding of how AVB and A/B OTAs work is recommended prior to

 avbroot applies the following patches to the partition images:

-* The `boot` or `init_boot` image, depending on device, is patched to enable root access. For Magisk, the patch is equivalent to what would be normally done by the Magisk app.
+* The `boot` or `init_boot` image, depending on device, is patched to enable root access if requested.

 * The `boot`, `recovery`, or `vendor_boot` image, depending on device, is patched to replace the OTA signature verification certificates with the custom OTA signing certificate. This allows future patched OTAs to be sideloaded from recovery mode after the bootloader has been locked. It also prevents accidental flashing of the original unpatched OTA.

@@ -31,7 +29,7 @@ avbroot applies the following patches to the partition images:

 ## Warnings and Caveats

-* **Always leave the `OEM unlocking` checkbox enabled when using a locked bootloader with root.** This is critically important. Root access allows the boot partition to potentially be overwritten, either accidentally or intentionally, with an image that is not properly signed. In this scenario, if the checkbox is turned off, both the OS and recovery mode will be made unbootable and `fastboot flashing unlock` will not be allowed. This effectively renders the device **_hard bricked_**.
+* **Always leave the `OEM unlocking` checkbox enabled when using a locked bootloader while rooted.** This is critically important. Root access allows the boot partition to potentially be overwritten, either accidentally or intentionally, with an image that is not properly signed. In this scenario, if the checkbox is turned off, both the OS and recovery mode will be made unbootable and `fastboot flashing unlock` will not be allowed. This effectively renders the device **_hard bricked_**.

    Repeat: **_ALWAYS leave `OEM unlocking` enabled if rooted._**

@@ -53,6 +51,8 @@ avbroot applies the following patches to the partition images:

 3. Follow the steps to [generate signing keys](#generating-keys).

+    Skip this step if you're updating Android, Magisk, or KernelSU after you've performed an [initial setup](#initial-setup). [Updates](#updates) do not require signing keys since you have already generated them in the initial setup.
+
 4. Patch the OTA zip. The base command is:

    ```bash
@@ -213,6 +213,8 @@ If you lose your AVB or OTA signing key, you will no longer be able to sign new
    init: [libfs_avb]Returning avb_handle with status: Success
    ```

+    Alternatively, the Android build of avbroot can also be used to [verify the partitions on the device](./README.extra.md#verifying-avb-hashes-and-signatures-on-device).
+
 9. Reboot back into fastboot and lock the bootloader. This will trigger a data wipe again.

    ```bash
@@ -225,21 +227,25 @@ If you lose your AVB or OTA signing key, you will no longer be able to sign new

    **WARNING**: If you are flashing CalyxOS, the setup wizard will [automatically turn off the `OEM unlocking` switch](https://github.com/CalyxOS/platform_packages_apps_SetupWizard/blob/7d2df25cedcbff83ddb608e628f9d97b38259c26/src/org/lineageos/setupwizard/SetupWizardApp.java#L135-L140). Make sure to manually reenable it again from Android's developer settings. Consider using the [`OEMUnlockOnBoot` module](https://github.com/chenxiaolong/OEMUnlockOnBoot) to automatically ensure OEM unlocking is enabled on every boot.

-10. That's it! To install future OS, Magisk, or KernelSU updates, see the [next section](#updates).
+10. That's it! To update the OS, Magisk, or KernelSU see the [next section](#updates).

 ## Updates

-Updates to Android, Magisk, and KernelSU are all done the same way by patching (or repatching) the OTA.
+Updates to Android, Magisk, and KernelSU are all done the same way: by patching (or repatching) the OTA.

-1. If Magisk or KernelSU is being updated, first install their new `.apk`. If you happen to open the app, make sure it **does not** flash the boot image. Cancel the boot image update prompts if needed.
+1. Generate a new patched OTA by following the steps in the [usage section](#usage).

-2. Follow the step in the [usage section](#usage) to patch the new OTA.
+2. If Magisk or KernelSU is being updated, first install their new `.apk`. If you happen to open the app, make sure it **does not** flash the boot image. Cancel the boot image update prompts if needed.

 3. Reboot to recovery mode. If the screen is stuck at a `No command` message, press the volume up button once while holding down the power button.

 4. Sideload the patched OTA with `adb sideload`.

-5. That's it!
+5. Restart your phone. Note: the phone will likely take a long time to startup after an OS update (a few minutes in some cases).
+
+**Warning**: Due to how virtual A/B works, there is a snapshot merge operation that Android runs invisibly in the background after installing an OTA and rebooting. During the snapshot merge process, it's not possible to sideload another OTA from recovery mode. Avoid doing anything that could result in a boot loop (eg. installing modules) until this process is complete because there is no way to recover, aside from unlocking the bootloader (and wiping) again.
+
+The status can be found by running `adb logcat -v color -s update_engine`. Alternatively, if [Custota](https://github.com/chenxiaolong/Custota) is installed (even if it's not configured to point to a custom OTA server), it will show a notification until the snapshot merge operation completes.

 ## Reverting to stock firmware

@@ -384,11 +390,28 @@ Note that avbroot will validate that the prepatched image is compatible with the

 avbroot can be used for just re-signing an OTA by specifying `--rootless` instead of `--magisk`/`--prepatched`. With this option, the patched OTA will not be rooted. The only modification applied is the replacement of the OTA verification certificate so that the OS can be upgraded with future (patched) OTAs.

-### Skipping recovery OTA certificate patches
+### Skipping OTA certificate patches

-avbroot can skip modifying `otacerts.zip` in the recovery image with the `--skip-recovery-ota-cert` option. **Do not do this unless you have a good reason to do so.** (For example, if you've already manually inserted the OTA certificate into a boot image specified with `--prepatched` or `--replace`.) When this option is used with `--rootless` (and `--dsu` is not specified), then no modifications are performed on any boot image besides ensuring they are properly signed.
+avbroot can skip modifying `otacerts.zip` with the `--skip-system-ota-cert` and `--skip-recovery-ota-cert` options. **Do not use these unless you have a good reason to do so.**

-When manually adding the OTA certificate to a boot image, [verifying the patched OTA](#verifying-otas) afterwards is recommended to ensure that it was properly done.
+When `--skip-system-ota-cert` is used, the OTA certificates in the `system` partition will not be modified. This prevents custom OTA updater apps from installing further patched OTAs while booted into Android.
+
+When `--skip-recovery-ota-cert` is used, the OTA certificates in the `vendor_boot` or `recovery` partition will not be modified. **This prevents sideloading further patched OTAs from recovery mode.**
+
+If `--skip-recovery-ota-cert` is used because the OTA certificate was already manually added to the boot image, then [verifying the patched OTA](#verifying-otas) afterwards is recommended to ensure that it was properly done. The verification process is only capable of checking the boot image's copy of the OTA certificates, not the system image's copy of them.
+
+### Skipping all patches
+
+To have avbroot make the absolute minimal changes:
+
+* Specify `--skip-system-ota-cert`
+* Specify `--skip-recovery-ota-cert`
+* Specify `--rootless`
+* Omit `--dsu`
+
+This will re-sign the `vbmeta` partition and the OTA with the custom keys, but leave all other partitions untouched.
+
+**This should only be used for advanced troubleshooting.** Without the OTA certificate patches, the resulting OTA will not be able to install further updates.

 ### Replacing partitions

@@ -414,6 +437,18 @@ Verified boot is disabled by vbmeta's header flags: 0x3

 To forcibly enable AVB (by clearing the flags), pass in `--clear-vbmeta-flags`.

+### Changing virtual A/B CoW compression algorithm
+
+The virtual A/B CoW compression algorithm can be changed by passing in `--vabc-algo <algo>` with `gz` or `lz4`. OTAs normally use an algorithm that is compatible with the initial version of Android shipped on the device.
+
+* Devices launching with Android 12 support `gz` and `brotli` (unsupported by avbroot)
+* Devices launching with Android 14 support `lz4`
+* Devices launching with Android 15 support `zstd` (unsupported by avbroot)
+
+Picking a fast algorithm, like lz4, can speed up OTA installation significantly when installing via a custom OTA updater app. However, there is no performance difference when sideloading an OTA from recovery mode.
+
+Note that the currently running version of Android must support the specified compression algorithm or else the OTA will fail to install. For example, trying to install an Android 14 OTA that uses lz4 CoW compression will fail if the running system is Android 13.
+
 ### Non-interactive use

 avbroot prompts for the private key passphrases interactively by default. To run avbroot non-interactively, either:
@@ -555,8 +590,6 @@ The output binary is written to `target/release/avbroot`.

 Debug builds work too, but they will run significantly slower (in the sha256 computations) due to compiler optimizations being turned off.

-By default, the executable links to the system's bzip2 and liblzma libraries, which are the only external libraries avbroot depends on. To compile and statically link these two libraries, pass in `--features static`.
-
 ### Android cross-compilation

 To cross-compile for Android, install [cargo-android](https://github.com/chenxiaolong/cargo-android) and use the `cargo android` wrapper. To make a release build for aarch64, run:
@@ -1,11 +1,9 @@
 # avbroot

-avbroot – это программа для модификации OTA-образов Android A/B-формата с целью получения root-прав при сохранении прохождения AVB (Android Verified Boot) с использованием кастомных (пользовательских) ключей подписи. Она совместима как с Magisk, так и с KernelSU. При необходимости можно просто переподписать OTA, без получения root-доступа.
+avbroot – это утилита для воспроизводимой модификации OTA-образов Android A/B-формата и их переподписания пользовательскими ключами. Она также включает в себя [набор подкоманд](./README.extra.md) для упаковки и распаковки образов Android различных форматов.

 Прежде чем использовать avbroot, рекомендуется иметь хорошее понимание того, как работают AVB и OTA в формате A/B. Как минимум, следует ознакомиться с [разделом предостережений,](#предостережения) чтобы избежать хардбрика устройства.

-**ПРИМЕЧАНИЕ:** avbroot 2.0 была переписана на Rust и больше не имеет в основе никакого кода AOSP, а CLI полностью обратно совместим. Тем не менее, старую реализацию на Python можно найти в одноименной ветке `python`.
-
 ## Требования

 * Поддерживаются только устройства, использующие современную A/B-разметку. Это большинство девайсов, выпускаемых с Android 10 и новее (за исключением устройств от Samsung). Чтобы проверить, использует ли ваш телефон необходимую схему разметки, откройте zip-архив OTA и проверьте:
@@ -21,7 +19,7 @@ avbroot – это программа для модификации OTA-обра

 avbroot модифицирует следующие образы:

-* `boot` или `init_boot`, в зависимости от устройства, модифицируется для получения root-доступа. В случае с Magisk, патч будет эквивалентен тому, что производится в самом приложении Magisk.
+* `boot` или `init_boot`, в зависимости от устройства, модифицируется для получения root-доступа, если это запрашивается.

 * `boot`, `recovery` или `vendor_boot`, в зависимости от устройства, модифицируется для замены сертификата проверки подписи OTA на пользовательский. Это позволяет устанавливать будущие пропатченные OTA через режим Recovery уже после блокировки загрузчика, то есть в качестве обновления. Также это предотвращает случайную установку оригинального непропатченного OTA.

@@ -122,7 +120,7 @@ avbroot модифицирует следующие образы:
    avbroot key encode-avb -k avb.key -o avb_pkmd.bin
    ```

-3. Сгенерируйте самоподписанный сертификат для ключа подписи OTA. Он используется режимом Recovery для проверки подписи OTA при сайдлоадинге обновления.
+3. Сгенерируйте самоподписанный сертификат для ключа подписи OTA. Он используется режимом Recovery для проверки подписи OTA при установке обновления.

    ```bash
    avbroot key generate-cert -k ota.key -o ota.crt
@@ -185,7 +183,7 @@ avbroot совместим с любым стандартным 4096-битны
    fastboot flashall --skip-reboot
    ```

-    Обратите внимание, что так прошиваются лишь те образы, что относятся к системе. Разделы загрузчика и модема же остаются нетронутыми из-за ограничений fastboot. Если они не обновлены до необходимой версии, или вы не уверены в этом, после прошивки перейдите к пункту [обновлений](#обновления) и установите пропатченный OTA-архив сайдлоадом в режиме Recovery. Прошивка полного OTA гарантирует, что абсолютно все разделы будут обновлены.
+    Обратите внимание, что так прошиваются лишь те образы, что относятся к системе. Разделы загрузчика и модема же остаются нетронутыми из-за ограничений fastboot. Если они не обновлены до необходимой версии, или вы не уверены в этом, после прошивки перейдите к пункту [обновлений](#обновления) и установите пропатченный OTA в режиме Recovery. Прошивка полного OTA гарантирует, что абсолютно все разделы будут обновлены.

    Для устройств Pixel есть ещё один вариант: запуск скрипта `flash-base.sh` из папки заводских образов (factory images) обновит загрузчик и модем.

@@ -255,11 +253,11 @@ avbroot совместим с любым стандартным 4096-битны

 ## OTA-обновления

-avbroot заменяет `/system/etc/security/otacerts.zip` в разделах системы и Recovery на новый архив, содержащий пользовательский сертификат подписи OTA. Это предотвращает случайную установку непропатченных OTA как при загрузке в Android, так и при сайдлоадинге через Recovery.
+avbroot заменяет `/system/etc/security/otacerts.zip` в разделах системы и Recovery на новый архив, содержащий пользовательский сертификат подписи OTA. Это предотвращает случайную установку непропатченных OTA как из-под загруженной системы, так и при прошивке через Recovery.

-Рекомендуется отключить приложение обновлений системы, чтобы оно не пыталось установить непропатченные OTA:
+Рекомендуется отключить системное приложение для обновлений, чтобы оно не пыталось установить непропатченные OTA:

-* Стоковая прошивка: Отключите `Автоматические обновления системы` (Automatic system updates в англ.) в настройках для разработчиков.
+* Стоковая (заводская) прошивка: Отключите `Автоматические обновления системы` (Automatic system updates в англ.) в настройках для разработчиков.
 * Кастомная прошивка: Отключите приложение обновлений системы (или запретите ему доступ к Интернету) через Настройки -> Приложения -> Все приложения -> (меню/три точки) -> Показать системные -> (найдите приложение обновлений, например Обновления системы/Updater).

 Это особенно важно для некоторых кастомных прошивок, поскольку их фирменное приложение для обновления системы может уйти в бесконечный цикл, загружая OTA-обновление, а затем повторяя попытку загрузки и установки при неудачной проверке подписи.
@@ -295,6 +293,7 @@ Magisk версии 25211 и новее требует наличие разде
        --input /path/to/ota.zip \
        --directory . \
        --boot-only
+        --partition <название раздела> # init_boot или boot, в зависимости от устройства
    ```

 2. Теперь нужно пропатчить загрузочный образ с помощью приложения Magisk. Это **ДОЛЖНО** быть сделано именно на целевом устройстве или устройстве той же модели! Имя раздела будет неверным и не подойдет, если пропатчить образ на устройстве иной модели.
@@ -381,17 +380,34 @@ avbroot может подменить используемый загрузоч

 avbroot можно использовать для простого переподписания OTA, указав аргумент `--rootless` вместо `--magisk`/`--prepatched`. В таком случае пропатченный OTA не будет рутирован. Единственная модификация, которая будет применена – это замена сертификата проверки OTA, чтобы систему можно было обновлять с помощью будущих пропатченных OTA.

-### Пропуск патчинга сертификата OTA в разделе Recovery
+### Пропуск патчинга сертификата OTA

-avbroot может пропустить изменение файла `otacerts.zip` в разделе Recovery с помощью опции `--skip-recovery-ota-cert`. **Не используйте эту функцию, если на то нет веской причины.** (Например, если вы уже самостоятельно встроили сертификат OTA в загрузочный образ (`boot.img`) и передаете его программе через опции `--prepatched` или `--replace`.) Если эта опция применяется совместно с `--rootless` (и без указания параметра `--dsu`), то в загрузочный образ не будут внесены никакие изменения, кроме обеспечения его корректной подписи.
+Вы можете пропустить изменение otacerts.zip, используя аргументы  `--skip-system-ota-cert` и `--skip-recovery-ota-cert`. **Не используйте их без веской причины.**

-Если вы вручную добавили сертификат OTA в загрузочный образ, рекомендуем [предварительно проверить пропатченный OTA.](#проверка-ota)
+При использовании `--skip-system-ota-cert`, сертификаты OTA в образе `system` изменены не будут. Это не позволит сторонним приложениям для OTA-обновлений устанавливать будущие пропатченные OTA из-под загруженной системы.

-### Подмена разделов
+При использовании `--skip-recovery-ota-cert`, сертификаты OTA в образах `vendor_boot` или `recovery` изменены не будут. **Это не позволит устанавливать будущие пропатченные OTA в режиме Recovery.**

-avbroot поддерживает подмену целых образов в OTA, даже тех, что не являются загрузочными (например, `vendor_dlkm`). Образ можно заменить, указав аргумент `--replace <имя раздела> /путь/к/образу.img`.
+Если вы используете аргумент `--skip-recovery-ota-cert`, потому что уже добавили сертификат OTA в загрузочный образ вручную, рекомендуетcя [проверить пропатченный OTA](#проверка-ota), дабы удостовериться, что замена произведена корректно. Процесс верификации проверяет только копию сертификатов OTA в загрузочном образе, не проверяя копию в образе системы.

-Единственное, что меняется – это то, откуда считывается раздел. При использовании `--replace` вместо использования образа раздела из оригинального `payload.bin` в OTA, он берется напрямую по указанному вами пути. Таким образом, заменяющие образы разделов должны иметь правильные колонтитулы vbmeta, соответствующие оригинальным.
+### Пропуск всех патчей
+
+Чтобы внести самый минимум изменений, укажите аргументы:
+
+* `--skip-system-ota-cert`
+* `--skip-recovery-ota-cert`
+* `--rootless`
+* не используйте аргумент `--dsu`.
+
+Так, пользовательскими ключами будут переподписаны лишь образ `vbmeta` и OTA, остальные разделы останутся нетронутыми.
+
+**Это следует использовать только для устранения неполадок.** Без патчей сертификатов, поверх полученного OTA не получится установить никакие обновления.
+
+### Подмена образов
+
+avbroot поддерживает подмену целых образов в OTA, даже тех, что не являются загрузочными (например, `vendor_dlkm`). Образ можно заменить, используя аргумент `--replace <имя раздела> /путь/к/образу.img`.
+
+Единственное, что меняется – это то, откуда считывается файл. При использовании `--replace` вместо образа раздела из оригинального `payload.bin` в OTA, он берется напрямую по указанному вами пути. Заменяющие образы разделов должны иметь правильные колонтитулы vbmeta, соответствующие оригинальным.

 Это не влияет на ход применения пачтей. Например, при использовании Magisk, патч получения root-прав применяется к загрузочному образу одинаково, независимо от того, был ли он получен из оригинального `payload.bin` или это файл, указанный через `--replace`.

@@ -405,6 +421,18 @@ Verified boot is disabled by vbmeta's header flags: 0x3

 Чтобы принудительно включить AVB (очистив флаги), укажите аргумент `--clear-vbmeta-flags`.

+### Изменение алгоритма CoW сжатия для вирутального A/B
+
+Алгоритм CoW (copy-on-write) сжатия для виртуального A/B можно изменить, используя аргумент `--vabc-algo <алгоритм>`, указав `gz` или `lz4`. Как правило, по умолчанию OTA использует алгоритм, который совместим с изначальной версией Android, на которой поставлялось устройство.
+
+* Девайсы, поставляемые с Android 12, поддерживают `gz` и `brotli` (последний не поддерживается avbroot)
+* Девайсы, поставляемые с Android 14, поддерживают `lz4`
+* Девайсы, поставляемые с Android 15, поддерживают `zstd` (не поддерживается avbroot)
+
+Выбор быстрого алгоритма, такого как lz4, может значительно ускорить установку OTA из-под системы (при использованием стороннего приложения для OTA-обновлений). Однако, при установке OTA в режиме Recovery, разницы в скорости не будет.
+
+Обратите внимание, что текущая используемая версия Android должна поддерживать выбранный алгоритм сжатия. В противном случае установка завершится ошибкой. Например, попытка установить OTA-обновление с Android 14, использующее алгоритм lz4, приведет к ошибке, если установка производится из-под Android 13.
+
 ### Использование в неинтерактивном режиме

 По умолчанию avbroot интерактивно запрашивает пароли к приватным ключам. Чтобы запустить avbroot в неинтерактивном режиме, можно:
@@ -441,17 +469,20 @@ Verified boot is disabled by vbmeta's header flags: 0x3

 * Использовать незашифрованные приватные ключи. Крайне не рекомендуется.

-### Извлечение всей OTA
+### Извлечение образов из OTA

-Чтобы извлечь все образы, содержащиеся в `payload.bin`, используйте команду:
+Чтобы извлечь образы разделов, содержащихся в `payload.bin`, используйте команду:

 ```bash
 avbroot ota extract \
    --input /путь/к/ota.zip \
-    --directory extracted \
-    --all
+    --directory extracted
 ```

+По умолчанию извлекаются только те образы, которые потенциально могут быть пропатчены с помощью avbroot. Чтобы извлечь все образы, используйте опцию `--all`. Для извлечения конкретных образов используйте опцию `--partition <название раздела>`, которую можно указать несколько раз.
+
+Эта команда также поддерживает извлечение встроенного сертификата OTA и публичного ключа AVB с помощью опций `--cert-ota` и `--public-key-avb`. Чтобы извлечь только эти компоненты, укажите аргумент `--none`, чтобы пропустить извлечение образов разделов.
+
 ### Режим записи ZIP

 По умолчанию, avbroot использует потоковую запись для вывода OTA во время патчинга. Это означает, что он вычисляет дайджест sha256 для цифровой подписи одновременно с записью файла. Такой режим приводит к тому, что в ZIP-файле появляются описатели данных, что является частью стандарта ZIP и работает на подавляющем большинстве устройств. Однако некоторые устройства могут иметь некорректно работающие парсеры ZIP-файлов и не смогут правильно прочитать ZIP-файлы OTA, содержащие описатели данных. Если это так, используйте опцию `--zip-mode seekable` при патчинге.
@@ -480,6 +511,53 @@ avbroot поддерживает делегирование всех опера

 Обратите внимание, что avbroot проверит подпись, возвращенную внешней программой, на соответствие с публичным ключом. Это гарантирует, что процесс патчинга завершится ошибкой, если был использован неправильный приватный ключ.

+### Размер страницы 16 КБ в настройках для разработчиков
+
+На современных устройствах с Android 16 и выше, в настройках для разработчиков может появиться опция переключения на ядро с размером страницы 16 КБ. Однако, эта функция не будет работать в системе, пропатченной с помощью avbroot, поскольку переключение данной настройки осуществляется путём установки инкрементальной OTA:
+
+* `/vendor/boot_otas/boot_ota_16k.zip` — используется для переключения на ядро с размером страницы 16 КБ (в разделе `boot` уже должно быть прошито ядро с размером страницы 4K)
+* `/vendor/boot_otas/boot_ota_4k.zip` — используется для переключения на ядро с размером страницы 4 КБ (в разделе `boot` уже должно быть прошито ядро с размером страницы 16K)
+
+Эти файлы (в `boot_otas`) невозможно прошить на системе, пропатченной avbroot, потому что `payload.bin` внутри них подписан ключом производителя. Кроме того, это неполноценные OTA-файлы: у них нет метаданных, характерных для OTA, а сам zip-файл не подписан. Это просто обычный архив, который содержит подписанный `payload.bin`.
+
+Поддержка `boot_otas` не планируется. Это потребует реализации функционала для модификации ФС в инкрементальных OTA и их дальнейшей обработки, что сделать очень непросто.
+
+Если вы всё же хотите завести эту функцию, можно попробовать вручную подписать файлы в `boot_otas` собственным ключом. Поскольку инкрементальные OTA не пересоздаются, раздел `boot` должен оставаться без изменений во время выполнения команды `avbroot ota patch`.
+
+1. Распакуйте `vendor.img` с помощью avbroot и [afsr](https://github.com/chenxiaolong/afsr):
+    ```bash
+    avbroot avb unpack -i vendor.img
+    afsr unpack -i raw.img
+    ```
+
+2. Извлеките `payload.bin` из `boot_otas/boot_ota_16k.zip`.
+
+3. Переподпишите `payload.bin` вашим OTA-ключом:
+    ```bash
+    avbroot payload repack \
+        -i payload.bin.orig \
+        -o payload.bin \
+        -k ota.key \
+        --output-properties payload_properties.txt
+    ```
+
+4. Создайте новый zip, включающий `payload.bin` и `payload_properties.txt`. Файлы должны быть добавлены без сжатия (например, с помощью `zip -0`).
+
+5. Повторите эту процедуру для `boot_otas/boot_ota_4k.zip`.
+
+6. Соберите `vendor.img` обратно и подпишите его вашим AVB-ключом:
+    ```bash
+    afsr pack -o raw.img
+    avbroot avb pack -o vendor.img -k avb.key --recompute-size
+    ```
+
+7. Пропатчите обычный OTA-архив с прошивкой, подменив `vendor` на модифицированный образ:
+    ```bash
+    avbroot ota patch \
+        --replace vendor <модифицированный vendor.img> \
+        <дальше указываются аргументы, как при обычном патчинге>
+    ```
+
 ## Сборка из исходного кода

 Убедитесь, что у вас установлен [набор инструментов Rust.](https://www.rust-lang.org/ru/) Затем выполните:
@@ -492,8 +570,6 @@ cargo build --release

 Дебаг-сборки тоже работают, но они будут работать значительно медленнее (в вычислениях sha256), потому что оптимизации компилятора отключены.

-По умолчанию исполняемый файл ссылается на системные библиотеки bzip2 и liblzma, от которых зависит avbroot. Чтобы скомпилировать и статически связать эти две библиотеки, укажите аргумент `--features static`.
-
 ### Кросс-компиляция на Android

 Чтобы использовать кросс-компиляцию на Android, установите [cargo-android](https://github.com/chenxiaolong/cargo-android) и воспользуйтесь оболочкой `cargo android`. Чтобы создать релизную сборку для aarch64, выполните:
@@ -13,28 +13,29 @@ anyhow = "1.0.75"
 base64 = "0.22.1"
 bitflags = { version = "2.4.1", features = ["serde"] }
 bstr = "1.6.2"
-cap-std = "3.0.0"
-cap-tempfile = "3.0.0"
+bzip2 = "0.6.0"
 clap = { version = "4.4.1", features = ["derive"] }
 clap_complete = "4.4.0"
 cms = { version = "0.2.2", features = ["std"] }
+# We can't upgrade to 0.10.0 until x509-cert updates it too, since it's part of
+# the public API.
 const-oid = "0.9.5"
 crc32fast = "1.4.2"
 ctrlc = "3.4.0"
 dlv-list = "0.6.0"
-flate2 = "1.0.27"
+flate2 = { version = "1.0.29", features = ["zlib-rs"] }
 gf256 = { version = "0.3.0", features = ["rs"] }
 hex = { version = "0.4.3", features = ["serde"] }
-liblzma = "0.3.0"
 lz4_flex = "0.11.1"
+lzma-rust2 = "0.8.0"
 memchr = "2.6.0"
-miniz_oxide = "0.8.0"
 num-bigint-dig = "0.8.4"
 num-traits = "0.2.16"
 passterm = "2.0.3"
-phf = { version = "0.11.2", features = ["macros"] }
+phf = { version = "0.12.1", features = ["macros"] }
 pkcs8 = { version = "0.10.2", features = ["encryption", "pem"] }
-prost = "0.13.1"
+prost = "0.14.1"
+# We can't upgrade to 0.9.0 until rsa updates its rand_core dependency.
 rand = "0.8.5"
 rayon = "1.7.0"
 regex = { version = "1.9.4", default-features = false, features = ["perf", "std"] }
@@ -42,14 +43,14 @@ regex = { version = "1.9.4", default-features = false, features = ["perf", "std"
 # because sha2 is significantly slower on older x86_64 CPUs without the SHA-NI
 # instructions. sha2 is still used for signing purposes.
 # https://github.com/RustCrypto/hashes/issues/327
-ring = "0.17.0"
+ring = "0.17.14"
 rsa = { version = "0.9.2", features = ["sha1", "sha2"] }
 serde = { version = "1.0.188", features = ["derive"] }
 sha1 = "0.10.5"
 sha2 = "0.10.7"
 tempfile = "3.8.0"
 thiserror = "2.0.3"
-toml_edit = { version = "0.22.9", features = ["serde"] }
+toml_edit = { version = "0.23.3", features = ["serde"] }
 topological-sort = "0.2.2"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
@@ -57,34 +58,29 @@ x509-cert = { version = "0.2.4", features = ["builder"] }
 zerocopy = { version = "0.8.10", features = ["std"] }
 zerocopy-derive = "0.8.5"

-# Waiting for next stable release.
-[dependencies.bzip2]
-git = "https://github.com/trifectatechfoundation/bzip2-rs"
-rev = "09a87db73c0517a9715ab3fd96fbe4961d545aee"
-default-features = false
-features = ["libbz2-rs-sys"]
-
-# https://github.com/zip-rs/zip/pull/383
+# https://github.com/zip-rs/zip2/pull/367
+# https://github.com/zip-rs/zip2/pull/368
+# For getting the data offset when writing new zip entries.
 [dependencies.zip]
-git = "https://github.com/chenxiaolong/zip"
-rev = "989101f9384b9e94e36e6e9e0f51908fdf98bde6"
+git = "https://github.com/chenxiaolong/zip2"
+rev = "59685f4dadbfee8cb3ea74c8fbb402b60d8137e8"
 default-features = false
 features = ["deflate"]

 [target.'cfg(unix)'.dependencies]
 libc = "0.2.158"
-rustix = { version = "0.38.9", default-features = false, features = ["process"] }
+rustix = { version = "1.0.3", default-features = false, features = ["process"] }
+
+[target.'cfg(target_os = "android")'.dependencies]
+system-properties = { git = "https://github.com/chenxiaolong/system-properties", tag = "v0.2.1" }

 [build-dependencies]
-constcat = "0.5.0"
-prost-build = "0.13.1"
-protox = "0.7.0"
+constcat = "0.6.0"
+prost-build = "0.14.1"
+protox = "0.9.0"

 [dev-dependencies]
 assert_matches = "1.5.0"

-[features]
-static = ["liblzma/static"]
-
 [lints]
 workspace = true
@@ -10,7 +10,7 @@ use std::{

 use anyhow::Result;
 use clap::{Parser, Subcommand, ValueEnum};
-use tracing::{debug, Level};
+use tracing::{Level, debug};
 use tracing_subscriber::fmt::{format::Writer, time::FormatTime};

 use crate::cli::{avb, boot, completion, cpio, fec, hashtree, key, lp, ota, payload, sparse};
@@ -1,25 +1,23 @@
-// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    collections::{HashMap, HashSet},
-    ffi::{OsStr, OsString},
-    fs::{self, File},
+    ffi::OsString,
+    fmt,
+    fs::{self, File, OpenOptions},
    io::{self, BufReader, BufWriter, Cursor, Seek, SeekFrom, Write},
    path::{Path, PathBuf},
    sync::atomic::AtomicBool,
 };

-use anyhow::{anyhow, bail, Context, Result};
-use cap_std::{
-    ambient_authority,
-    fs::{Dir, OpenOptions},
-};
+use anyhow::{Context, Result, anyhow, bail};
 use clap::{Args, Parser, Subcommand};
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 use rsa::RsaPublicKey;
 use serde::{Deserialize, Serialize};
-use tracing::{debug_span, info, warn, Span};
+use sha2::{Digest, Sha256};
+use tracing::{Span, debug_span, info, warn};

 use crate::{
    crypto::{self, PassphraseSource, RsaSigningKey},
@@ -27,7 +25,7 @@ use crate::{
        self, AlgorithmType, AppendedDescriptorMut, AppendedDescriptorRef, Descriptor, Footer,
        HashTreeDescriptor, Header, KernelCmdlineDescriptor,
    },
-    stream::{self, check_cancel, PSeekFile, ReadFixedSizeExt, Reopen, ToWriter},
+    stream::{self, PSeekFile, ReadFixedSizeExt, Reopen, ToWriter, check_cancel},
    util,
 };

@@ -95,18 +93,6 @@ fn write_info(path: &Path, info: &AvbInfo) -> Result<()> {
    Ok(())
 }

-/// Packing with insecure algorithms is intentionally not supported, so promote
-/// to a secure algorithm if needed.
-fn promote_insecure_hash_algorithm(algorithm: &mut String) {
-    const INSECURE_ALGORITHMS: &[&str] = &["sha1"];
-    const NEW_ALGORITHM: &str = "sha256";
-
-    if INSECURE_ALGORITHMS.contains(&algorithm.as_str()) {
-        warn!("Changing insecure hash algorithm {algorithm} to {NEW_ALGORITHM}");
-        NEW_ALGORITHM.clone_into(algorithm);
-    }
-}
-
 /// Copy `size` bytes from `reader` into a new file `path` that's opened as
 /// both readable and writable.
 fn write_raw(
@@ -194,13 +180,11 @@ fn write_raw_and_update(

    match info.header.appended_descriptor_mut()? {
        AppendedDescriptorMut::HashTree(d) => {
-            promote_insecure_hash_algorithm(&mut d.hash_algorithm);
            d.image_size = image_size;
            d.update(&raw_file, &raw_file, None, cancel_signal)
                .context("Failed to update hash tree descriptor")?;
        }
        AppendedDescriptorMut::Hash(d) => {
-            promote_insecure_hash_algorithm(&mut d.hash_algorithm);
            d.image_size = image_size;
            raw_file.rewind()?;
            d.update(&mut raw_file, cancel_signal)
@@ -312,14 +296,13 @@ fn update_dm_verity_cmdline(info: &mut AvbInfo) -> Result<bool> {
    };

    for d in &mut info.header.descriptors {
-        if let Descriptor::KernelCmdline(d) = d {
-            if d.flags & KernelCmdlineDescriptor::FLAG_USE_ONLY_IF_HASHTREE_NOT_DISABLED != 0
-                && d.cmdline.starts_with("dm=")
-                && d.cmdline != new_cmdline
-            {
-                d.cmdline = new_cmdline;
-                return Ok(true);
-            }
+        if let Descriptor::KernelCmdline(d) = d
+            && d.flags & KernelCmdlineDescriptor::FLAG_USE_ONLY_IF_HASHTREE_NOT_DISABLED != 0
+            && d.cmdline.starts_with("dm=")
+            && d.cmdline != new_cmdline
+        {
+            d.cmdline = new_cmdline;
+            return Ok(true);
        }
    }

@@ -345,7 +328,7 @@ fn sign_or_clear(info: &mut AvbInfo, orig_header: &Header, key_group: &KeyGroup)
        } else {
            SignAction::Clear
        }
-    } else if originally_signed && &info.header != orig_header {
+    } else if originally_signed && (&info.header != orig_header || info.header.verify().is_err()) {
        SignAction::Sign
    } else {
        // If the original image was signed, we can preserve the existing
@@ -424,22 +407,82 @@ fn display_info(display: &DisplayGroup, info: &AvbInfo) {
    }
 }

-/// Ensure that the partition name won't cause directory traversals.
-fn ensure_name_is_safe(name: &str) -> Result<()> {
-    if Path::new(name).file_name() != Some(OsStr::new(name)) {
-        bail!("Unsafe partition name: {name}");
+#[derive(Debug, Clone)]
+struct SearchPath {
+    dir: PathBuf,
+    suffix: String,
+}
+
+impl fmt::Display for SearchPath {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?} (suffix: {:?})", self.dir, self.suffix)
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct ImageOpener {
+    search: Vec<SearchPath>,
+}
+
+impl ImageOpener {
+    pub fn new() -> Self {
+        Self::default()
    }

-    Ok(())
+    pub fn with_dir(dir: impl Into<PathBuf>) -> Self {
+        let mut result = Self::new();
+        result.add_dir(dir, ".img");
+        result
+    }
+
+    pub fn add_dir(&mut self, dir: impl Into<PathBuf>, suffix: impl Into<String>) {
+        self.search.push(SearchPath {
+            dir: dir.into(),
+            suffix: suffix.into(),
+        });
+    }
+
+    fn open(&self, name: &str, options: &OpenOptions) -> io::Result<(PathBuf, File)> {
+        for search in &self.search {
+            let path = util::path_join_single(&search.dir, format!("{name}{}", search.suffix))
+                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
+
+            match options.open(&path) {
+                Ok(f) => return Ok((path, f)),
+                Err(e) if e.kind() == io::ErrorKind::NotFound => continue,
+                Err(e) => {
+                    return Err(io::Error::new(
+                        e.kind(),
+                        format!("Failed to open for reading: {path:?}: {e}"),
+                    ));
+                }
+            }
+        }
+
+        Err(io::Error::new(
+            io::ErrorKind::NotFound,
+            format!(
+                "Failed to find {name:?} image in: {}",
+                util::join(&self.search, ", "),
+            ),
+        ))
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum TrustMethod {
+    Key(RsaPublicKey),
+    KeyDigest([u8; 32]),
+    Anything,
 }

 /// Recursively verify an image's vbmeta header and all of the chained images.
 /// `seen` is used to prevent cycles. `descriptors` will contain all of the hash
 /// and hash tree descriptors that need to be verified.
 pub fn verify_headers(
-    directory: &Dir,
+    opener: &ImageOpener,
    name: &str,
-    expected_key: Option<&RsaPublicKey>,
+    trust_method: &TrustMethod,
    seen: &mut HashSet<String>,
    descriptors: &mut HashMap<String, Descriptor>,
 ) -> Result<()> {
@@ -447,12 +490,7 @@ pub fn verify_headers(
        return Ok(());
    }

-    ensure_name_is_safe(name)?;
-
-    let path = format!("{name}.img");
-    let raw_reader = directory
-        .open(&path)
-        .with_context(|| format!("Failed to open for reading: {path:?}"))?;
+    let (path, raw_reader) = opener.open(name, OpenOptions::new().read(true))?;
    let (header, _, _) = avb::load_image(BufReader::new(raw_reader))
        .with_context(|| format!("Failed to load vbmeta structures: {path:?}"))?;

@@ -464,19 +502,36 @@ pub fn verify_headers(
    if let Some(k) = &public_key {
        let prefix = format!("{name} has a signed vbmeta header");

-        if let Some(e) = expected_key {
-            if k == e {
-                info!("{prefix}");
-            } else {
-                bail!("{prefix}, but is signed by an untrusted key");
+        match trust_method {
+            TrustMethod::Key(expected) => {
+                if k == expected {
+                    info!("{prefix}");
+                } else {
+                    bail!("{prefix}, but is signed by an untrusted key");
+                }
+            }
+            TrustMethod::KeyDigest(expected_sha256) => {
+                let encoded = avb::encode_public_key(k)?;
+                let digest = Sha256::digest(&encoded);
+
+                if digest.as_slice() == expected_sha256 {
+                    info!("{prefix}");
+                } else {
+                    bail!("{prefix}, but is signed by an untrusted key");
+                }
+            }
+            TrustMethod::Anything => {
+                warn!("{prefix}, but parent does not list a trusted key");
            }
-        } else {
-            warn!("{prefix}, but parent does not list a trusted key");
        }
    } else {
        info!("{name} has an unsigned vbmeta header");
    }

+    if header.flags != 0 {
+        warn!("{name} has insecure flags: {:#x}", header.flags);
+    }
+
    for descriptor in &header.descriptors {
        let Some(target_name) = descriptor.partition_name() else {
            continue;
@@ -496,8 +551,9 @@ pub fn verify_headers(
                let target_key = avb::decode_public_key(&d.public_key).with_context(|| {
                    format!("Failed to decode chained public key for: {target_name}")
                })?;
+                let target_trust = TrustMethod::Key(target_key);

-                verify_headers(directory, target_name, Some(&target_key), seen, descriptors)?;
+                verify_headers(opener, target_name, &target_trust, seen, descriptors)?;
            }
            _ => {}
        }
@@ -555,34 +611,33 @@ fn verify_and_repair(
 /// Verify hash and hash tree descriptor digests and FEC data against their
 /// corresponding input files.
 pub fn verify_descriptors(
-    directory: &Dir,
+    opener: &ImageOpener,
    descriptors: &HashMap<String, Descriptor>,
    repair: bool,
+    allow_missing: bool,
    cancel_signal: &AtomicBool,
 ) -> Result<()> {
    let parent_span = Span::current();

+    let mut options = OpenOptions::new();
+    options.read(true);
+    options.write(repair);
+
    descriptors
        .par_iter()
        .map(|(name, descriptor)| {
            let _span = parent_span.enter();

-            let path = format!("{name}.img");
-            let file = match directory
-                .open_with(&path, OpenOptions::new().read(true).write(repair))
-                .map(|f| PSeekFile::new(f.into_std()))
-            {
-                Ok(f) => f,
+            let file = match opener.open(name, &options) {
+                Ok((_, f)) => PSeekFile::new(f),
                // Some devices, like bluejay, have vbmeta descriptors that
                // refer to partitions that exist on the device, but not in the
                // OTA.
-                Err(e) if e.kind() == io::ErrorKind::NotFound => {
-                    warn!("Partition image does not exist: {path:?}");
+                Err(e) if e.kind() == io::ErrorKind::NotFound && allow_missing => {
+                    warn!("{e}");
                    return Ok(());
                }
-                Err(e) => {
-                    Err(e).with_context(|| format!("Failed to open for reading: {path:?}"))?
-                }
+                Err(e) => return Err(e.into()),
            };

            verify_and_repair(
@@ -597,7 +652,7 @@ pub fn verify_descriptors(
 }

 fn compute_digest_recursive(
-    directory: &Dir,
+    directory: &Path,
    name: &str,
    context: &mut ring::digest::Context,
    max_depth: u8,
@@ -612,11 +667,8 @@ fn compute_digest_recursive(

    seen.insert(name.to_owned());

-    ensure_name_is_safe(name)?;
-
-    let path = format!("{name}.img");
-    let mut raw_reader = directory
-        .open(&path)
+    let path = util::path_join_single(directory, format!("{name}.img"))?;
+    let mut raw_reader = File::open(&path)
        .map(BufReader::new)
        .with_context(|| format!("Failed to open for reading: {path:?}"))?;
    let (header, footer, _) = avb::load_image(&mut raw_reader)
@@ -668,7 +720,11 @@ fn compute_digest_recursive(
 /// the root vbmeta image, followed by the headers in the immediate chained
 /// partitions. This digest is not defined to be recursive, so headers of
 /// chained partitions more than one level deep are ignored.
-pub fn compute_digest(directory: &Dir, name: &str, cancel_signal: &AtomicBool) -> Result<[u8; 32]> {
+pub fn compute_digest(
+    directory: &Path,
+    name: &str,
+    cancel_signal: &AtomicBool,
+) -> Result<[u8; 32]> {
    let mut seen = HashSet::<String>::new();
    let mut context = ring::digest::Context::new(&ring::digest::SHA256);

@@ -745,7 +801,6 @@ fn repack_subcommand(cli: &RepackCli, cancel_signal: &AtomicBool) -> Result<()>
        // Write new hash tree and FEC data instead of copying the original.
        // There could have been errors in the original FEC data itself.
        if let AppendedDescriptorMut::HashTree(d) = info.header.appended_descriptor_mut()? {
-            promote_insecure_hash_algorithm(&mut d.hash_algorithm);
            d.update(&file, &file, None, cancel_signal)?;
        }

@@ -776,50 +831,40 @@ fn info_subcommand(cli: &InfoCli) -> Result<()> {
    Ok(())
 }

-fn verify_subcommand(cli: &VerifyCli, cancel_signal: &AtomicBool) -> Result<()> {
-    let public_key = if let Some(p) = &cli.public_key {
+fn verify_internal(
+    public_key_path: Option<&Path>,
+    public_key_digest: Option<[u8; 32]>,
+    opener: &ImageOpener,
+    name: &str,
+    repair: bool,
+    allow_missing: bool,
+    cancel_signal: &AtomicBool,
+) -> Result<()> {
+    let trust_method = if let Some(p) = public_key_path {
        let data = fs::read(p).with_context(|| format!("Failed to read file: {p:?}"))?;
        let key = avb::decode_public_key(&data)
            .with_context(|| format!("Failed to decode public key: {p:?}"))?;

-        Some(key)
+        TrustMethod::Key(key)
+    } else if let Some(d) = public_key_digest {
+        TrustMethod::KeyDigest(d)
    } else {
-        None
+        TrustMethod::Anything
    };

-    let authority = ambient_authority();
-    let parent_path = util::parent_path(&cli.input);
-    let directory = Dir::open_ambient_dir(parent_path, authority)
-        .with_context(|| format!("Failed to open directory: {parent_path:?}"))?;
-    let name = cli
-        .input
-        .file_stem()
-        .with_context(|| format!("Path is not a file: {:?}", cli.input))?
-        .to_str()
-        .ok_or_else(|| anyhow!("Invalid UTF-8: {:?}", cli.input))?;
-
    let mut seen = HashSet::<String>::new();
    let mut descriptors = HashMap::<String, Descriptor>::new();

-    verify_headers(
-        &directory,
-        name,
-        public_key.as_ref(),
-        &mut seen,
-        &mut descriptors,
-    )?;
-    verify_descriptors(&directory, &descriptors, cli.repair, cancel_signal)?;
+    verify_headers(opener, name, &trust_method, &mut seen, &mut descriptors)?;
+    verify_descriptors(opener, &descriptors, repair, allow_missing, cancel_signal)?;

    info!("Successfully verified all vbmeta signatures and hashes");

    Ok(())
 }

-fn digest_subcommand(cli: &DigestCli, cancel_signal: &AtomicBool) -> Result<()> {
-    let authority = ambient_authority();
-    let parent_path = util::parent_path(&cli.input);
-    let directory = Dir::open_ambient_dir(parent_path, authority)
-        .with_context(|| format!("Failed to open directory: {parent_path:?}"))?;
+fn verify_subcommand(cli: &VerifyCli, cancel_signal: &AtomicBool) -> Result<()> {
+    let directory = util::parent_path(&cli.input);
    let name = cli
        .input
        .file_stem()
@@ -827,7 +872,71 @@ fn digest_subcommand(cli: &DigestCli, cancel_signal: &AtomicBool) -> Result<()>
        .to_str()
        .ok_or_else(|| anyhow!("Invalid UTF-8: {:?}", cli.input))?;

-    let digest = compute_digest(&directory, name, cancel_signal)?;
+    let opener = ImageOpener::with_dir(directory);
+
+    verify_internal(
+        cli.public_key.as_deref(),
+        None,
+        &opener,
+        name,
+        cli.repair,
+        !cli.fail_if_missing,
+        cancel_signal,
+    )
+}
+
+#[cfg(target_os = "android")]
+fn get_required_property(name: &str) -> Result<String> {
+    system_properties::read(name)
+        .with_context(|| format!("Failed to query property: {name}"))?
+        .ok_or_else(|| anyhow!("Property is not set: {name}"))
+}
+
+#[cfg(target_os = "android")]
+fn verify_device_subcommand(cli: &VerifyDeviceCli, cancel_signal: &AtomicBool) -> Result<()> {
+    let slot_suffix = get_required_property("ro.boot.slot_suffix")?;
+
+    // Use the bootloader's public key digest if no key is specified. This is
+    // what the user flashed for avb_custom_key.
+    let public_key_digest = if cli.public_key.is_none() {
+        let hex_digest = get_required_property("ro.boot.vbmeta.public_key_digest")?;
+        let mut digest = [0u8; 32];
+
+        hex::decode_to_slice(&hex_digest, &mut digest)
+            .with_context(|| format!("Invalid public key digest: {hex_digest}"))?;
+
+        info!("Verifying against bootloader public key digest: {hex_digest}");
+
+        Some(digest)
+    } else {
+        None
+    };
+
+    let mut opener = ImageOpener::new();
+    opener.add_dir("/dev/block/by-name", &slot_suffix);
+    opener.add_dir("/dev/block/mapper", &slot_suffix);
+
+    verify_internal(
+        cli.public_key.as_deref(),
+        public_key_digest,
+        &opener,
+        &cli.partition,
+        false,
+        false,
+        cancel_signal,
+    )
+}
+
+fn digest_subcommand(cli: &DigestCli, cancel_signal: &AtomicBool) -> Result<()> {
+    let directory = util::parent_path(&cli.input);
+    let name = cli
+        .input
+        .file_stem()
+        .with_context(|| format!("Path is not a file: {:?}", cli.input))?
+        .to_str()
+        .ok_or_else(|| anyhow!("Invalid UTF-8: {:?}", cli.input))?;
+
+    let digest = compute_digest(directory, name, cancel_signal)?;

    println!("{}", hex::encode(digest));

@@ -841,6 +950,8 @@ pub fn avb_main(cli: &AvbCli, cancel_signal: &AtomicBool) -> Result<()> {
        AvbCommand::Repack(c) => repack_subcommand(c, cancel_signal),
        AvbCommand::Info(c) => info_subcommand(c),
        AvbCommand::Verify(c) => verify_subcommand(c, cancel_signal),
+        #[cfg(target_os = "android")]
+        AvbCommand::VerifyDevice(c) => verify_device_subcommand(c, cancel_signal),
        AvbCommand::Digest(c) => digest_subcommand(c, cancel_signal),
    }
 }
@@ -1044,6 +1155,32 @@ struct VerifyCli {
    /// Only images with hash tree descriptors can contain FEC data.
    #[arg(short, long)]
    repair: bool,
+
+    /// Fail if a referenced image is missing.
+    ///
+    /// Missing images are ignored by default because some OTAs contain vbmeta
+    /// images referencing partitions that only exist on the real device.
+    #[arg(long)]
+    fail_if_missing: bool,
+}
+
+/// Verify vbmeta signatures for the currently booted system.
+///
+/// This behaves like the `verify` subcommand, except that it checks the actual
+/// partitions that this device is currently booted from.
+#[cfg(target_os = "android")]
+#[derive(Debug, Parser)]
+struct VerifyDeviceCli {
+    /// Path to public key in AVB binary format.
+    ///
+    /// If this is not specified, the signatures can only be checked for
+    /// validity, not whether they are trusted.
+    #[arg(short, long, value_name = "FILE", value_parser)]
+    public_key: Option<PathBuf>,
+
+    /// Partition to recursively verify.
+    #[arg(short = 'P', long, value_name = "NAME", default_value = "vbmeta")]
+    partition: String,
 }

 /// Compute the vbmeta digest.
@@ -1065,6 +1202,8 @@ enum AvbCommand {
    #[command(alias = "dump")]
    Info(InfoCli),
    Verify(VerifyCli),
+    #[cfg(target_os = "android")]
+    VerifyDevice(VerifyDeviceCli),
    Digest(DigestCli),
 }

@@ -7,7 +7,7 @@ use std::{
    path::{Path, PathBuf},
 };

-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use clap::{Parser, Subcommand};

 use crate::{
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
@@ -9,9 +9,8 @@ use std::{
    sync::atomic::AtomicBool,
 };

-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result, anyhow};
 use bstr::ByteSlice;
-use cap_std::{ambient_authority, fs::Dir};
 use clap::{Parser, Subcommand};
 use num_traits::ToPrimitive;
 use serde::{Deserialize, Serialize};
@@ -34,7 +33,7 @@ fn open_reader(
    path: &Path,
    include_trailer: bool,
 ) -> Result<(
-    CpioReader<CompressedReader<BufReader<File>>>,
+    CpioReader<CompressedReader<'_, BufReader<File>>>,
    CompressedFormat,
 )> {
    let file =
@@ -50,7 +49,7 @@ fn open_reader(
 fn open_writer(
    path: &Path,
    format: CompressedFormat,
-) -> Result<CpioWriter<CompressedWriter<BufWriter<File>>>> {
+) -> Result<CpioWriter<CompressedWriter<'_, BufWriter<File>>>> {
    let file =
        File::create(path).with_context(|| format!("Failed to open cpio for writing: {path:?}"))?;
    let writer = CompressedWriter::new(BufWriter::new(file), format)
@@ -91,17 +90,17 @@ fn write_info(path: &Path, info: &CpioInfo) -> Result<()> {

 /// Open reader to the corresponding file inside the tree if the entry is a
 /// regular file. Unsafe paths will result in an error.
-fn open_tree_file(tree: &Dir, entry: &CpioEntry) -> Result<Option<(BufReader<File>, u32)>> {
+fn open_tree_file(tree: &Path, entry: &CpioEntry) -> Result<Option<(BufReader<File>, u32)>> {
    if entry.file_type == CpioEntryType::Regular {
-        let path = entry
+        let sub_path = entry
            .path
            .as_bstr()
            .to_path()
            .with_context(|| format!("Invalid entry path: {:?}", entry.path.as_bstr()))?;
+        let path = util::path_join(tree, sub_path)?;

-        let mut reader = tree
-            .open(path)
-            .map(|f| BufReader::new(f.into_std()))
+        let mut reader = File::open(&path)
+            .map(BufReader::new)
            .with_context(|| format!("Failed to open for reading: {path:?}"))?;

        let file_size = reader
@@ -122,21 +121,21 @@ fn open_tree_file(tree: &Dir, entry: &CpioEntry) -> Result<Option<(BufReader<Fil
 /// Open writer to the corresponding file inside the tree if the entry is a
 /// regular file. Intermediate directories are automatically created as needed.
 /// Unsafe paths will result in an error.
-fn create_tree_file(tree: &Dir, entry: &CpioEntry) -> Result<Option<BufWriter<File>>> {
+fn create_tree_file(tree: &Path, entry: &CpioEntry) -> Result<Option<BufWriter<File>>> {
    if entry.file_type == CpioEntryType::Regular {
-        let path = entry
+        let sub_path = entry
            .path
            .as_bstr()
            .to_path()
            .with_context(|| format!("Invalid entry path: {:?}", entry.path.as_bstr()))?;
-        let parent = util::parent_path(path);
+        let path = util::path_join(tree, sub_path)?;
+        let parent = util::parent_path(&path);

-        tree.create_dir_all(parent)
+        fs::create_dir_all(parent)
            .with_context(|| format!("Failed to create directory: {parent:?}"))?;

-        let writer = tree
-            .create(path)
-            .map(|f| BufWriter::new(f.into_std()))
+        let writer = File::create(&path)
+            .map(BufWriter::new)
            .with_context(|| format!("Failed to open for writing: {path:?}"))?;

        Ok(Some(writer))
@@ -171,16 +170,13 @@ fn unpack_subcommand(

    display_format(cpio_cli, format);

-    let authority = ambient_authority();
-    Dir::create_ambient_dir_all(&cli.output_tree, authority)
+    fs::create_dir_all(&cli.output_tree)
        .with_context(|| format!("Failed to create directory: {:?}", cli.output_tree))?;
-    let tree = Dir::open_ambient_dir(&cli.output_tree, authority)
-        .with_context(|| format!("Failed to open directory: {:?}", cli.output_tree))?;

    while let Some(entry) = reader.next_entry().context("Failed to read cpio entry")? {
        display_entry(cpio_cli, &entry);

-        if let Some(mut writer) = create_tree_file(&tree, &entry)? {
+        if let Some(mut writer) = create_tree_file(&cli.output_tree, &entry)? {
            let file_size = entry.data.size()?;

            stream::copy_n(&mut reader, &mut writer, file_size.into(), cancel_signal)
@@ -209,12 +205,8 @@ fn pack_subcommand(cpio_cli: &CpioCli, cli: &PackCli, cancel_signal: &AtomicBool

    cpio::assign_inodes(&mut info.entries, true)?;

-    let authority = ambient_authority();
-    let tree = Dir::open_ambient_dir(&cli.input_tree, authority)
-        .with_context(|| format!("Failed to open directory: {:?}", cli.input_tree))?;
-
    for entry in &mut info.entries {
-        let out = open_tree_file(&tree, entry)?;
+        let out = open_tree_file(&cli.input_tree, entry)?;

        if let Some((_, file_size)) = &out {
            entry.data = CpioEntryData::Size(*file_size);
@@ -1,16 +1,14 @@
-// SPDX-FileCopyrightText: 2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2024-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
-    ffi::OsStr,
    fs::{self, File},
    io::{Seek, SeekFrom},
    path::{Path, PathBuf},
    sync::atomic::AtomicBool,
 };

-use anyhow::{bail, Context, Result};
-use cap_std::{ambient_authority, fs::Dir};
+use anyhow::{Context, Result, bail};
 use clap::{CommandFactory, Parser, Subcommand};
 use rayon::iter::{
    IndexedParallelIterator, IntoParallelIterator, IntoParallelRefIterator, ParallelIterator,
@@ -19,6 +17,7 @@ use rayon::iter::{
 use crate::{
    format::lp::{Extent, ExtentType, ImageType, Metadata, SECTOR_SIZE},
    stream::{self, FromReader, PSeekFile, Reopen, ToWriter},
+    util,
 };

 fn open_lp_inputs(paths: &[impl AsRef<Path>]) -> Result<(Vec<PSeekFile>, Metadata)> {
@@ -190,11 +189,8 @@ fn unpack_subcommand(lp_cli: &LpCli, cli: &UnpackCli, cancel_signal: &AtomicBool
        return Ok(());
    }

-    let authority = ambient_authority();
-    Dir::create_ambient_dir_all(&cli.output_images, authority)
+    fs::create_dir_all(&cli.output_images)
        .with_context(|| format!("Failed to create directory: {:?}", cli.output_images))?;
-    let directory = Dir::open_ambient_dir(&cli.output_images, authority)
-        .with_context(|| format!("Failed to open directory: {:?}", cli.output_images))?;

    let slot = &metadata.slots[0];

@@ -216,11 +212,11 @@ fn unpack_subcommand(lp_cli: &LpCli, cli: &UnpackCli, cancel_signal: &AtomicBool

        for partition in &group.partitions {
            // A partition name with unsafe characters fails during parsing.
-            let path = format!("{}.img", partition.name);
+            let path =
+                util::path_join_single(&cli.output_images, format!("{}.img", partition.name))?;

-            let file = directory
-                .create(&path)
-                .map(|f| PSeekFile::new(f.into_std()))
+            let file = File::create(&path)
+                .map(PSeekFile::new)
                .with_context(|| format!("Failed to open for writing: {path:?}"))?;

            file.set_len(partition.size()?)
@@ -303,35 +299,21 @@ fn pack_subcommand(lp_cli: &LpCli, cli: &PackCli, cancel_signal: &AtomicBool) ->
        }
    }

-    for group in &slot.groups {
-        for partition in &group.partitions {
-            let name = &partition.name;
-
-            if Path::new(name).file_name() != Some(OsStr::new(name)) {
-                bail!("Unsafe partition name: {name}");
-            }
-        }
-    }
-
    // Preopen all image input files.
    let mut paths = vec![];
    let mut files = vec![];

    if metadata.image_type == ImageType::Normal {
-        let authority = ambient_authority();
-        let directory = Dir::open_ambient_dir(&cli.input_images, authority)
-            .with_context(|| format!("Failed to open directory: {:?}", cli.input_images))?;
-
        for group in &mut slot.groups {
            let mut group_paths = vec![];
            let mut group_files = vec![];

            for partition in &mut group.partitions {
-                let path = format!("{}.img", partition.name);
+                let path =
+                    util::path_join_single(&cli.input_images, format!("{}.img", partition.name))?;

-                let mut file = directory
-                    .open(&path)
-                    .map(|f| PSeekFile::new(f.into_std()))
+                let mut file = File::open(&path)
+                    .map(PSeekFile::new)
                    .with_context(|| format!("Failed to open for reading: {path:?}"))?;

                let size = file
@@ -1,17 +1,16 @@
-// SPDX-FileCopyrightText: 2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2024-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    collections::HashMap,
-    ffi::{OsStr, OsString},
+    ffi::OsString,
    fs::{self, File},
    io::{BufReader, BufWriter, Seek, SeekFrom},
    path::{Path, PathBuf},
    sync::atomic::AtomicBool,
 };

-use anyhow::{anyhow, bail, Context, Result};
-use cap_std::{ambient_authority, fs::Dir};
+use anyhow::{Context, Result, anyhow, bail};
 use clap::{Args, Parser, Subcommand};
 use tracing::info;

@@ -20,6 +19,7 @@ use crate::{
    crypto::{self, PassphraseSource, RsaSigningKey},
    format::payload::{PayloadHeader, PayloadWriter},
    stream::{self, FromReader, PSeekFile},
+    util,
 };

 fn open_reader(path: &Path, allow_delta: bool) -> Result<(BufReader<File>, PayloadHeader)> {
@@ -113,15 +113,12 @@ fn unpack_subcommand(

    write_info(&cli.output_info, &header)?;

-    let authority = ambient_authority();
-    Dir::create_ambient_dir_all(&cli.output_images, authority)
+    fs::create_dir_all(&cli.output_images)
        .with_context(|| format!("Failed to create directory: {:?}", cli.output_images))?;
-    let directory = Dir::open_ambient_dir(&cli.output_images, authority)
-        .with_context(|| format!("Failed to open directory: {:?}", cli.output_images))?;

    ota::extract_payload(
        &PSeekFile::new(reader.into_inner()),
-        &directory,
+        &cli.output_images,
        0,
        payload_size,
        &header,
@@ -147,28 +144,16 @@ fn pack_subcommand(

    let mut header = read_info(&cli.input_info)?;

-    let authority = ambient_authority();
-    let directory = Dir::open_ambient_dir(&cli.input_images, authority)
-        .with_context(|| format!("Failed to open directory: {:?}", cli.input_images))?;
-
-    for p in &header.manifest.partitions {
-        let name = &p.partition_name;
-
-        if Path::new(name).file_name() != Some(OsStr::new(name)) {
-            bail!("Unsafe partition name: {name}");
-        }
-    }
-
    // Pre-open all of the image files.
    let input_files = header
        .manifest
        .partitions
        .iter()
        .map(|p| {
-            let path = format!("{}.img", p.partition_name);
-            let file = directory
-                .open(&path)
-                .map(|f| PSeekFile::new(f.into_std()))
+            let path =
+                util::path_join_single(&cli.input_images, format!("{}.img", p.partition_name))?;
+            let file = File::open(&path)
+                .map(PSeekFile::new)
                .with_context(|| format!("Failed to open file: {path:?}"))?;

            Ok((p.partition_name.clone(), file))
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2024-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
@@ -10,10 +10,10 @@ use std::{
    sync::atomic::AtomicBool,
 };

-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use clap::{Parser, Subcommand};
 use crc32fast::Hasher;
-use zerocopy::{little_endian, IntoBytes};
+use zerocopy::{IntoBytes, little_endian};

 use crate::{
    format::{
@@ -122,13 +122,13 @@ fn find_allocated_regions(
    loop {
        stream::check_cancel(cancel_signal)?;

-        start = match rustix::fs::seek(reader, SeekFrom::Data(end as i64)) {
+        start = match rustix::fs::seek(reader, SeekFrom::Data(end)) {
            Ok(offset) => offset,
            Err(e) if e == Errno::NXIO => break,
            Err(e) => return Err(e).with_context(|| format!("Failed to seek to data: {path:?}")),
        };

-        end = rustix::fs::seek(reader, SeekFrom::Hole(start as i64))
+        end = rustix::fs::seek(reader, SeekFrom::Hole(start))
            .with_context(|| format!("Failed to seek to hole: {path:?}"))?;

        result.push(start..end);
@@ -317,11 +317,11 @@ fn unpack_subcommand(
                })?;
            }
            ChunkData::Hole => {
-                // This cannot overflow.
-                let to_skip = chunk.bounds.len() * metadata.header.block_size;
+                // Unlike ChunkData::Data, this can overflow a u32.
+                let to_skip = i64::from(chunk.bounds.len()) * i64::from(metadata.header.block_size);

                writer
-                    .seek(SeekFrom::Current(to_skip.into()))
+                    .seek(SeekFrom::Current(to_skip))
                    .with_context(|| format!("Failed to seek file: {:?}", cli.output))?;
            }
            ChunkData::Crc32(_) => {}
@@ -21,25 +21,25 @@ use cms::{
 };
 use passterm::PromptError;
 use pkcs8::{
-    pkcs5::{pbes2, scrypt},
    DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey, EncryptedPrivateKeyInfo,
    LineEnding, PrivateKeyInfo,
+    pkcs5::{pbes2, scrypt},
 };
 use rand::RngCore;
 use rsa::{
-    pkcs1v15::SigningKey, traits::PublicKeyParts, Pkcs1v15Sign, RsaPrivateKey, RsaPublicKey,
+    Pkcs1v15Sign, RsaPrivateKey, RsaPublicKey, pkcs1v15::SigningKey, traits::PublicKeyParts,
 };
 use serde::{Deserialize, Serialize};
 use sha1::Sha1;
 use sha2::{Digest, Sha256, Sha512};
 use thiserror::Error;
 use x509_cert::{
+    Certificate,
    builder::{Builder, CertificateBuilder, Profile},
-    der::{pem::PemLabel, referenced::OwnedToRef, Any, Decode, DecodePem, EncodePem},
+    der::{Any, Decode, DecodePem, EncodePem, pem::PemLabel, referenced::OwnedToRef},
    serial_number::SerialNumber,
    spki::{AlgorithmIdentifierOwned, SubjectPublicKeyInfoOwned},
    time::Validity,
-    Certificate,
 };

 use crate::util::DebugString;
@@ -144,6 +144,7 @@ pub enum PassphraseSource {

 impl PassphraseSource {
    pub fn new(key_file: &Path, pass_file: Option<&Path>, env_var: Option<&OsStr>) -> Self {
+        #[allow(clippy::option_if_let_else)]
        if let Some(v) = env_var {
            Self::EnvVar(v.to_owned())
        } else if let Some(p) = pass_file {
@@ -159,10 +160,10 @@ impl PassphraseSource {
            Err(e) => {
                #[cfg(unix)]
                if let PromptError::IOError(io_e) = e {
-                    if let Some(errno) = io_e.raw_os_error() {
-                        if errno == libc::ENXIO || errno == libc::ENOTTY {
-                            return Err(Error::NotInteractive(io_e));
-                        }
+                    if let Some(errno) = io_e.raw_os_error()
+                        && (errno == libc::ENXIO || errno == libc::ENOTTY)
+                    {
+                        return Err(Error::NotInteractive(io_e));
                    }

                    return Err(Error::PassphrasePrompt(PromptError::IOError(io_e)));
@@ -4,7 +4,7 @@
 use std::{fmt, marker::PhantomData};

 use bstr::{ByteSlice, ByteVec};
-use serde::{de::Visitor, Deserializer, Serializer};
+use serde::{Deserializer, Serializer, de::Visitor};
 use thiserror::Error;

 #[derive(Clone, Debug, Error)]
@@ -14,10 +14,10 @@ use bstr::ByteSlice;
 use num_bigint_dig::{ModInverse, ToBigInt};
 use num_traits::{Pow, ToPrimitive};
 use ring::digest::{Algorithm, Context};
-use rsa::{traits::PublicKeyParts, BigUint, RsaPublicKey};
+use rsa::{BigUint, RsaPublicKey, traits::PublicKeyParts};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use zerocopy::{big_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, big_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
@@ -163,9 +163,9 @@ pub enum Error {

 type Result<T> = std::result::Result<T, Error>;

-pub(crate) fn ring_algorithm(name: &str, for_verify: bool) -> Result<&'static Algorithm> {
+pub(crate) fn digest_algorithm(name: &str) -> Result<&'static Algorithm> {
    match name {
-        "sha1" if for_verify => Ok(&ring::digest::SHA1_FOR_LEGACY_USE_ONLY),
+        "sha1" => Ok(&ring::digest::SHA1_FOR_LEGACY_USE_ONLY),
        "sha256" => Ok(&ring::digest::SHA256),
        "sha512" => Ok(&ring::digest::SHA512),
        a => Err(Error::UnsupportedHashAlgorithm(a.to_owned())),
@@ -292,7 +292,7 @@ trait DescriptorTag {

 /// Raw on-disk layout for the AVB property descriptor after the prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawPropertyDescriptor {
    key_size: big_endian::U64,
    value_size: big_endian::U64,
@@ -395,7 +395,7 @@ impl<W: Write> ToWriter<W> for PropertyDescriptor {

 /// Raw on-disk layout for the AVB hash tree descriptor after the prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHashTreeDescriptor {
    dm_verity_version: big_endian::U32,
    image_size: big_endian::U64,
@@ -534,7 +534,7 @@ impl HashTreeDescriptor {
        ranges: Option<&[Range<u64>]>,
        cancel_signal: &AtomicBool,
    ) -> Result<()> {
-        let algorithm = ring_algorithm(&self.hash_algorithm, false)?;
+        let algorithm = digest_algorithm(&self.hash_algorithm)?;
        let hash_tree = HashTree::new(self.data_block_size, algorithm, &self.salt);
        let (root_digest, hash_tree_data) = match ranges {
            Some(r) => {
@@ -642,7 +642,7 @@ impl HashTreeDescriptor {
    ) -> Result<()> {
        self.check_offsets()?;

-        let algorithm = ring_algorithm(&self.hash_algorithm, true)?;
+        let algorithm = digest_algorithm(&self.hash_algorithm)?;

        util::check_bounds(self.tree_size, ..=HASH_TREE_MAX_SIZE)
            .map_err(|e| Error::IntOutOfBounds("HashTree::tree_size", e))?;
@@ -860,7 +860,7 @@ impl<W: Write> ToWriter<W> for HashTreeDescriptor {

 /// Raw on-disk layout for the AVB hash descriptor after the prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHashDescriptor {
    image_size: big_endian::U64,
    hash_algorithm: [u8; 32],
@@ -903,10 +903,9 @@ impl HashDescriptor {
    fn calculate(
        &self,
        reader: impl Read,
-        for_verify: bool,
        cancel_signal: &AtomicBool,
    ) -> Result<ring::digest::Digest> {
-        let algorithm = ring_algorithm(&self.hash_algorithm, for_verify)?;
+        let algorithm = digest_algorithm(&self.hash_algorithm)?;
        let mut context = Context::new(algorithm);
        context.update(&self.salt);

@@ -924,14 +923,14 @@ impl HashDescriptor {

    /// Update the root hash from the input reader's contents.
    pub fn update(&mut self, reader: impl Read, cancel_signal: &AtomicBool) -> Result<()> {
-        let digest = self.calculate(reader, false, cancel_signal)?;
+        let digest = self.calculate(reader, cancel_signal)?;
        self.root_digest = digest.as_ref().to_vec();
        Ok(())
    }

    /// Verify the root hash against the input reader.
    pub fn verify(&self, reader: impl Read, cancel_signal: &AtomicBool) -> Result<()> {
-        let digest = self.calculate(reader, true, cancel_signal)?;
+        let digest = self.calculate(reader, cancel_signal)?;

        if self.root_digest != digest.as_ref() {
            return Err(Error::InvalidRootDigest {
@@ -1065,7 +1064,7 @@ impl<W: Write> ToWriter<W> for HashDescriptor {
 /// Raw on-disk layout for the AVB kernel command line descriptor after the
 /// prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawKernelCmdlineDescriptor {
    flags: big_endian::U32,
    cmdline_len: big_endian::U32,
@@ -1139,7 +1138,7 @@ impl<W: Write> ToWriter<W> for KernelCmdlineDescriptor {

 /// Raw on-disk layout for the AVB chain partition descriptor after the prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawChainPartitionDescriptor {
    rollback_index_location: big_endian::U32,
    partition_name_len: big_endian::U32,
@@ -1258,7 +1257,7 @@ impl<W: Write> ToWriter<W> for ChainPartitionDescriptor {

 /// Raw on-disk layout for the AVB descriptor prefix.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawDescriptor {
    tag: big_endian::U64,
    num_bytes_following: big_endian::U64,
@@ -1458,7 +1457,7 @@ impl<'a> TryFrom<&'a mut Descriptor> for AppendedDescriptorMut<'a> {

 /// Raw on-disk layout for the AVB header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`HEADER_MAGIC`].
    magic: [u8; 4],
@@ -1658,7 +1657,7 @@ impl Header {

    /// Get the first hash or hash tree descriptor if there is only one. This is
    /// the case for appended AVB images.
-    pub fn appended_descriptor(&self) -> Result<AppendedDescriptorRef> {
+    pub fn appended_descriptor(&self) -> Result<AppendedDescriptorRef<'_>> {
        let mut result = None;

        for descriptor in &self.descriptors {
@@ -1684,7 +1683,7 @@ impl Header {

    /// Get the first hash or hash tree descriptor if there is only one. This is
    /// the case for appended AVB images.
-    pub fn appended_descriptor_mut(&mut self) -> Result<AppendedDescriptorMut> {
+    pub fn appended_descriptor_mut(&mut self) -> Result<AppendedDescriptorMut<'_>> {
        let mut result = None;

        for descriptor in &mut self.descriptors {
@@ -1759,16 +1758,20 @@ impl Header {
    /// and return the public key. If the header is not signed, then `None` is
    /// returned.
    pub fn verify(&self) -> Result<Option<RsaPublicKey>> {
-        // Reconstruct the public key.
-        let public_key = decode_public_key(&self.public_key)?;
-
        if self.public_key.len() != self.algorithm_type.public_key_len() {
            return Err(Error::IncorrectKeySize(
-                public_key.size(),
+                self.public_key.len(),
                self.algorithm_type,
            ));
        }

+        if self.algorithm_type == AlgorithmType::None {
+            return Ok(None);
+        }
+
+        // Reconstruct the public key.
+        let public_key = decode_public_key(&self.public_key)?;
+
        let mut without_auth_writer = Cursor::new(Vec::new());
        self.to_writer_internal(&mut without_auth_writer, true)?;
        let without_auth = without_auth_writer.into_inner();
@@ -1927,7 +1930,7 @@ impl<W: Write> ToWriter<W> for Header {

 /// Raw on-disk layout for the AVB footer.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawFooter {
    /// Magic value. This should be equal to [`FOOTER_MAGIC`].
    magic: [u8; 4],
@@ -2015,10 +2018,9 @@ impl<W: Write> ToWriter<W> for Footer {

 /// Raw on-disk layout for the AVB binary public key header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawPublicKey {
    key_num_bits: big_endian::U32,
-    #[expect(unused)]
    n0inv: big_endian::U32,
 }

@@ -2176,10 +2178,10 @@ pub fn write_appended_image(
        .and_then(|s| s.checked_add(header_padding))
        .ok_or(Error::IntOverflow("Appended::header_end_padded"))?;

-    if let Some(s) = image_size {
-        if header_end_padded > s {
-            return Err(Error::TooSmallForHeader(s));
-        }
+    if let Some(s) = image_size
+        && header_end_padded > s
+    {
+        return Err(Error::TooSmallForHeader(s));
    }

    writer
@@ -13,7 +13,7 @@ use num_traits::ToPrimitive;
 use ring::digest::Context;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use zerocopy::{little_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, little_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
@@ -117,7 +117,7 @@ pub trait BootImageExt {

 /// Raw on-disk layout for the v0 image header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawV0 {
    /// Magic value. This should be equal to [`BOOT_MAGIC`].
    magic: [u8; 8],
@@ -139,7 +139,7 @@ struct RawV0 {

 /// Raw on-disk layout for the extra v1 image header fields.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawV1Extra {
    recovery_dtbo_size: little_endian::U32,
    recovery_dtbo_offset: little_endian::U64,
@@ -148,7 +148,7 @@ struct RawV1Extra {

 /// Raw on-disk layout for the extra v2 image header fields.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawV2Extra {
    dtb_size: little_endian::U32,
    dtb_addr: little_endian::U64,
@@ -269,6 +269,7 @@ impl fmt::Display for BootImageV0Through2 {

 impl BootImageExt for BootImageV0Through2 {
    fn header_version(&self) -> u32 {
+        #[allow(clippy::bool_to_int_with_if)]
        if self.v2_extra.is_some() {
            2
        } else if self.v1_extra.is_some() {
@@ -386,14 +387,13 @@ impl<R: Read> FromReader<R> for BootImageV0Through2 {
            None
        };

-        if let Some(v1) = &v1_data {
-            if reader
+        if let Some(v1) = &v1_data
+            && reader
                .stream_position()
                .map_err(|e| Error::DataRead("Boot::V1::header_size", e))?
                != u64::from(v1.header_size)
-            {
-                return Err(Error::InvalidHeaderSize(v1.header_size));
-            }
+        {
+            return Err(Error::InvalidHeaderSize(v1.header_size));
        }

        padding::read_discard(&mut reader, page_size.into())
@@ -595,7 +595,7 @@ impl<W: Write> ToWriter<W> for BootImageV0Through2 {

 /// Raw on-disk layout for the v3 image header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawV3 {
    /// Magic value. This should be equal to [`BOOT_MAGIC`].
    magic: [u8; 8],
@@ -610,7 +610,7 @@ struct RawV3 {

 /// Raw on-disk layout for the extra v4 image header fields.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawV4Extra {
    signature_size: little_endian::U32,
 }
@@ -668,11 +668,7 @@ impl fmt::Display for BootImageV3Through4 {

 impl BootImageExt for BootImageV3Through4 {
    fn header_version(&self) -> u32 {
-        if self.v4_extra.is_some() {
-            4
-        } else {
-            3
-        }
+        if self.v4_extra.is_some() { 4 } else { 3 }
    }

    fn header_size(&self) -> u32 {
@@ -873,14 +869,12 @@ impl BootImageV3Through4 {
        padding::write_zeros(&mut writer, PAGE_SIZE.into())
            .map_err(|e| Error::DataWrite("Boot::V3::ramdisk_padding", e))?;

-        if !skip_v4_sig {
-            if let Some(sig) = v4_signature {
-                writer
-                    .write_all(&sig)
-                    .map_err(|e| Error::DataWrite("Boot::V4::signature", e))?;
-                padding::write_zeros(&mut writer, PAGE_SIZE.into())
-                    .map_err(|e| Error::DataWrite("Boot::V4::signature_padding", e))?;
-            }
+        if !skip_v4_sig && let Some(sig) = v4_signature {
+            writer
+                .write_all(&sig)
+                .map_err(|e| Error::DataWrite("Boot::V4::signature", e))?;
+            padding::write_zeros(&mut writer, PAGE_SIZE.into())
+                .map_err(|e| Error::DataWrite("Boot::V4::signature_padding", e))?;
        }

        Ok(())
@@ -961,7 +955,7 @@ impl<W: Write> ToWriter<W> for BootImageV3Through4 {

 /// Raw on-disk layout for the vendor v3 image header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawVendorV3 {
    /// Magic value. This should be equal to [`VENDOR_BOOT_MAGIC`].
    magic: [u8; 8],
@@ -980,7 +974,7 @@ struct RawVendorV3 {

 /// Raw on-disk layout for the extra vendor v4 image header fields.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawVendorV4Extra {
    vendor_ramdisk_table_size: little_endian::U32,
    vendor_ramdisk_table_entry_num: little_endian::U32,
@@ -990,7 +984,7 @@ struct RawVendorV4Extra {

 /// Raw on-disk layout for the vendor v4 ramdisk table entry.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawVendorV4RamdiskTableEntry {
    ramdisk_size: little_endian::U32,
    ramdisk_offset: little_endian::U32,
@@ -1093,11 +1087,7 @@ impl fmt::Display for VendorBootImageV3Through4 {

 impl BootImageExt for VendorBootImageV3Through4 {
    fn header_version(&self) -> u32 {
-        if self.v4_extra.is_some() {
-            4
-        } else {
-            3
-        }
+        if self.v4_extra.is_some() { 4 } else { 3 }
    }

    fn header_size(&self) -> u32 {
@@ -1,15 +1,11 @@
-// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::io::{self, Read, Seek, Write};

-use flate2::{read::GzDecoder, write::GzEncoder, Compression};
-use liblzma::{
-    read::XzDecoder,
-    stream::{Check, Stream},
-    write::XzEncoder,
-};
+use flate2::{Compression, read::GzDecoder, write::GzEncoder};
 use lz4_flex::frame::FrameDecoder;
+use lzma_rust2::{CheckType, XZOptions, XZReader, XZWriter};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;

@@ -28,7 +24,7 @@ pub enum Error {
    #[error("Failed to initialize legacy LZ4 encoder")]
    Lz4Init(#[source] io::Error),
    #[error("Failed to initialize XZ encoder")]
-    XzInit(#[source] liblzma::stream::Error),
+    XzInit(#[source] io::Error),
 }

 type Result<T> = std::result::Result<T, Error>;
@@ -114,14 +110,14 @@ pub enum CompressedFormat {
    Xz,
 }

-pub enum CompressedReader<R: Read> {
+pub enum CompressedReader<'reader, R: Read> {
    None(R),
    Gzip(GzDecoder<R>),
    Lz4(FrameDecoder<R>),
-    Xz(XzDecoder<R>),
+    Xz(XZReader<'reader, R>),
 }

-impl<R: Read + Seek> CompressedReader<R> {
+impl<'reader, R: Read + Seek + 'reader> CompressedReader<'reader, R> {
    pub fn new(mut reader: R, raw_if_unknown: bool) -> Result<Self> {
        let magic = reader.read_array_exact::<6>().map_err(Error::AutoDetect)?;

@@ -132,7 +128,7 @@ impl<R: Read + Seek> CompressedReader<R> {
        } else if &magic[0..4] == LZ4_LEGACY_MAGIC {
            Ok(Self::Lz4(FrameDecoder::new(reader)))
        } else if &magic == XZ_MAGIC {
-            Ok(Self::Xz(XzDecoder::new(reader)))
+            Ok(Self::Xz(XZReader::new(reader, false)))
        } else if raw_if_unknown {
            Ok(Self::None(reader))
        } else {
@@ -159,7 +155,7 @@ impl<R: Read + Seek> CompressedReader<R> {
    }
 }

-impl<R: Read> Read for CompressedReader<R> {
+impl<'reader, R: Read + 'reader> Read for CompressedReader<'reader, R> {
    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
        match self {
            Self::None(r) => r.read(buf),
@@ -170,14 +166,15 @@ impl<R: Read> Read for CompressedReader<R> {
    }
 }

-pub enum CompressedWriter<W: Write> {
+#[allow(clippy::large_enum_variant)]
+pub enum CompressedWriter<'writer, W: Write> {
    None(W),
    Gzip(GzEncoder<W>),
    Lz4Legacy(Lz4LegacyEncoder<W>),
-    Xz(XzEncoder<W>),
+    Xz(XZWriter<'writer, W>),
 }

-impl<W: Write> CompressedWriter<W> {
+impl<'writer, W: Write + 'writer> CompressedWriter<'writer, W> {
    pub fn new(writer: W, format: CompressedFormat) -> Result<Self> {
        match format {
            CompressedFormat::None => Ok(Self::None(writer)),
@@ -190,8 +187,11 @@ impl<W: Write> CompressedWriter<W> {
            }
            CompressedFormat::Xz => {
                // Some kernels are compiled without support for the default CRC64.
-                let stream = Stream::new_easy_encoder(6, Check::Crc32).map_err(Error::XzInit)?;
-                Ok(Self::Xz(XzEncoder::new_stream(writer, stream)))
+                let mut options = XZOptions::with_preset(6);
+                options.set_check_sum_type(CheckType::Crc32);
+
+                let xz_writer = XZWriter::new(writer, options).map_err(Error::XzInit)?;
+                Ok(Self::Xz(xz_writer))
            }
        }
    }
@@ -215,7 +215,7 @@ impl<W: Write> CompressedWriter<W> {
    }
 }

-impl<W: Write> Write for CompressedWriter<W> {
+impl<'writer, W: Write + 'writer> Write for CompressedWriter<'writer, W> {
    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
        match self {
            Self::None(w) => w.write(buf),
@@ -76,7 +76,7 @@ pub struct InvalidHexCharError(RawHexU32, char);

 /// ASCII-encoded hex integer value used in cpio header fields.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHexU32([u8; 8]);

 impl fmt::Debug for RawHexU32 {
@@ -121,7 +121,7 @@ impl TryFrom<RawHexU32> for u32 {

 /// Raw on-disk layout for the cpio header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`MAGIC_NEW`] or [`MAGIC_NEW_CRC`].
    magic: [u8; 6],
@@ -771,11 +771,7 @@ pub fn sort(entries: &mut [CpioEntry]) {
 /// 300000.
 pub fn assign_inodes(entries: &mut [CpioEntry], missing_only: bool) -> Result<()> {
    fn next_non_zero(i: u32) -> u32 {
-        if i == u32::MAX {
-            1
-        } else {
-            i.wrapping_add(1)
-        }
+        if i == u32::MAX { 1 } else { i.wrapping_add(1) }
    }

    // (dev maj, dev min) -> (inode set, last assigned inode)
@@ -16,7 +16,7 @@ use rayon::{
    slice::{ParallelSlice, ParallelSliceMut},
 };
 use thiserror::Error;
-use zerocopy::{little_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, little_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
@@ -592,7 +592,7 @@ impl Fec {

 /// Raw on-disk layout for the FEC image header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`FEC_MAGIC`].
    magic: little_endian::U32,
@@ -827,7 +827,7 @@ impl<W: Write> ToWriter<W> for FecImage {
 mod tests {
    use std::{
        io::{Cursor, Seek},
-        sync::{atomic::AtomicBool, Arc},
+        sync::{Arc, atomic::AtomicBool},
    };

    use assert_matches::assert_matches;
@@ -16,7 +16,7 @@ use rayon::{
 };
 use ring::digest::{Algorithm, Context};
 use thiserror::Error;
-use zerocopy::{little_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, little_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
@@ -431,7 +431,7 @@ impl HashTree {

 /// Raw on-disk layout for our custom hash tree image header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`HashTreeImage::MAGIC`].
    magic: [u8; 16],
@@ -492,8 +492,8 @@ impl HashTreeImage {
    const MAGIC: &'static [u8; 16] = b"avbroot!hashtree";
    const VERSION: u16 = 1;

-    fn ring_algorithm(name: &str) -> Result<&'static Algorithm> {
-        avb::ring_algorithm(name, false)
+    fn digest_algorithm(name: &str) -> Result<&'static Algorithm> {
+        avb::digest_algorithm(name)
            .map_err(|_| Error::UnsupportedHashAlgorithm(name.to_owned().into_bytes()))
    }

@@ -509,8 +509,8 @@ impl HashTreeImage {
            .reopen_boxed()
            .and_then(|mut f| f.seek(SeekFrom::End(0)))
            .map_err(Error::InputReopen)?;
-        let ring_algorithm = Self::ring_algorithm(algorithm)?;
-        let hash_tree = HashTree::new(block_size, ring_algorithm, salt);
+        let digest_algorithm = Self::digest_algorithm(algorithm)?;
+        let hash_tree = HashTree::new(block_size, digest_algorithm, salt);
        let (root_digest, hash_tree_data) = hash_tree.generate(input, image_size, cancel_signal)?;

        Ok(Self {
@@ -530,8 +530,8 @@ impl HashTreeImage {
        ranges: &[Range<u64>],
        cancel_signal: &AtomicBool,
    ) -> Result<()> {
-        let ring_algorithm = Self::ring_algorithm(&self.algorithm)?;
-        let hash_tree = HashTree::new(self.block_size, ring_algorithm, &self.salt);
+        let digest_algorithm = Self::digest_algorithm(&self.algorithm)?;
+        let hash_tree = HashTree::new(self.block_size, digest_algorithm, &self.salt);

        self.root_digest = hash_tree.update(
            input,
@@ -550,8 +550,8 @@ impl HashTreeImage {
        input: &(dyn ReadSeekReopen + Sync),
        cancel_signal: &AtomicBool,
    ) -> Result<()> {
-        let ring_algorithm = Self::ring_algorithm(&self.algorithm)?;
-        let hash_tree = HashTree::new(self.block_size, ring_algorithm, &self.salt);
+        let digest_algorithm = Self::digest_algorithm(&self.algorithm)?;
+        let hash_tree = HashTree::new(self.block_size, digest_algorithm, &self.salt);

        hash_tree.verify(
            input,
@@ -1,8 +1,7 @@
-// SPDX-FileCopyrightText: 2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2024-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
-    cmp::Ordering,
    fmt,
    io::{self, Read, Seek, Write},
    mem,
@@ -14,7 +13,7 @@ use bitflags::bitflags;
 use bstr::ByteSlice;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
-use zerocopy::{byteorder::little_endian, FromBytes, FromZeros, Immutable, IntoBytes};
+use zerocopy::{FromBytes, FromZeros, Immutable, IntoBytes, byteorder::little_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
@@ -22,7 +21,7 @@ use crate::{
    stream::{
        CountingReader, FromReader, ReadDiscardExt, ReadFixedSizeExt, ToWriter, WriteZerosExt,
    },
-    util::{self, is_zero, DebugString},
+    util::{self, DebugString, is_zero},
 };

 /// Magic value for [`RawGeometry::magic`].
@@ -152,10 +151,8 @@ pub enum Error {
    ExtentTypeZeroNotEmpty { index: usize },
    #[error("Extent #{index}: Invalid type: {extent_type}")]
    ExtentInvalidType { index: usize, extent_type: u32 },
-    #[error("Extent #{index}: Overlaps previous extent")]
-    ExtentOverlapsPrevious { index: usize },
-    #[error("Extent #{index}: Earlier block device index than previous extent")]
-    ExtentDeviceNotConsecutive { index: usize },
+    #[error("Extent #{index}: Overlaps another extent: #{other}")]
+    ExtentOverlapsAnother { index: usize, other: usize },
    #[error("Extent #{index}: Block device index too large")]
    ExtentDeviceIndexTooLarge { index: usize },
    // Partition group errors.
@@ -253,7 +250,7 @@ impl PartitionAttributes {

 /// Raw on-disk layout for the metadata geometry.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawGeometry {
    /// Magic value. This should be equal to [`GEOMETRY_MAGIC`].
    magic: little_endian::U32,
@@ -335,7 +332,7 @@ impl RawGeometry {

 /// Raw on-disk layout for a table descriptor within a [`RawHeader`].
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawTableDescriptor {
    /// Offset relative to the end of the [`RawHeader`].
    offset: little_endian::U32,
@@ -394,7 +391,7 @@ impl RawTableDescriptor {

 /// Raw on-disk layout for the metadata header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`HEADER_MAGIC`].
    magic: little_endian::U32,
@@ -572,7 +569,7 @@ impl RawHeader {

 /// A potentially invalid raw partition name string.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct PartitionName([u8; 36]);

 impl fmt::Debug for PartitionName {
@@ -598,17 +595,15 @@ impl PartitionName {

    fn validate(&self) -> Result<()> {
        let (prefix, suffix) = self.split();
-        let mut has_alnum = false;

-        for b in prefix {
-            match b {
-                b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' => has_alnum = true,
-                b'_' => {}
-                _ => return Err(Error::PartitionNameInvalid(DebugString::new(self))),
-            }
-        }
+        // AOSP liblp's metadata_format.h says "Characters may only be
+        // alphanumeric or _", but AOSP creates partitions named like
+        // "system_b-cow".
+        let prefix_valid = prefix
+            .iter()
+            .all(|b| matches!(*b, b'a'..=b'z' | b'A'..=b'Z' | b'0'..=b'9' | b'_' | b'-'));

-        if has_alnum && is_zero(suffix) {
+        if prefix_valid && is_zero(suffix) {
            Ok(())
        } else {
            Err(Error::PartitionNameInvalid(DebugString::new(self)))
@@ -644,7 +639,7 @@ impl FromStr for PartitionName {

 /// Raw on-disk layout for an entry in the logical partitions table.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawPartition {
    /// Partition name in ASCII. This must be unique across all partitions.
    name: PartitionName,
@@ -706,7 +701,7 @@ impl RawPartition {
                    .first_extent_index
                    .get()
                    .checked_add(self.num_extents.get())
-                    .map_or(true, |n| n as usize > extents.len())
+                    .is_none_or(|n| n as usize > extents.len())
                {
                    return Err(Error::PartitionExtentIndicesTooLarge {
                        name: DebugString::new(self.name),
@@ -735,7 +730,7 @@ impl RawPartition {

 /// Raw on-disk layout for an entry in the extent table.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawExtent {
    /// Number of [`SECTOR_SIZE`]-byte sectors in this extent.
    num_sectors: little_endian::U64,
@@ -817,7 +812,7 @@ impl RawExtent {
                return Err(Error::ExtentInvalidType {
                    index,
                    extent_type: n,
-                })
+                });
            }
        }

@@ -827,7 +822,7 @@ impl RawExtent {

 /// Raw on-disk layout for an entry in the partition groups table.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawPartitionGroup {
    /// Partition group name in ASCII. This must be unique across all groups.
    name: PartitionName,
@@ -894,7 +889,7 @@ impl RawPartitionGroup {

 /// Raw on-disk layout for an entry in the block devices table.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawBlockDevice {
    /// The first [`SECTOR_SIZE`]-byte sector where actual data for the logical
    /// partitions can be allocated.
@@ -1010,23 +1005,29 @@ impl RawMetadataSlot {
            extent.validate(i, &self.block_devices)?;
        }

-        // Ensure that all extents are in increasing order and not overlapping.
-        let mut iter = self
+        // Ensure that all extents are not overlapping. We have to sort here
+        // because the extents may not be in order when loading the super
+        // partition on an actual device. Also, AOSP liblp's `metadata_format.h`
+        // says "Gaps between extents are not allowed", but AOSP frequently
+        // creates this situation after a virtual A/B CoW merge.
+        let mut sorted_extents = self
            .extents
            .iter()
-            .filter(|e| e.target_type.get() == RawExtent::TARGET_TYPE_LINEAR)
-            .enumerate();
-        while let (Some((_, a)), Some((i, b))) = (iter.next(), iter.next()) {
-            match a.target_source.get().cmp(&b.target_source.get()) {
-                Ordering::Equal => {
-                    if a.target_data.get() + a.num_sectors.get() > b.target_data.get() {
-                        return Err(Error::ExtentOverlapsPrevious { index: i });
-                    }
-                }
-                Ordering::Greater => {
-                    return Err(Error::ExtentDeviceNotConsecutive { index: i });
-                }
-                Ordering::Less => {}
+            .enumerate()
+            .filter(|(_, e)| e.target_type.get() == RawExtent::TARGET_TYPE_LINEAR)
+            .collect::<Vec<_>>();
+        sorted_extents.sort_by_key(|(_, e)| (e.target_source, e.target_data));
+
+        for window in sorted_extents.windows(2) {
+            let ((a_i, a), (b_i, b)) = (window[0], window[1]);
+
+            if a.target_source == b.target_source
+                && a.target_data.get() + a.num_sectors.get() > b.target_data.get()
+            {
+                return Err(Error::ExtentOverlapsAnother {
+                    index: b_i,
+                    other: a_i,
+                });
            }
        }

@@ -1060,14 +1061,19 @@ impl RawMetadata {
            .read_exact(&mut buf)
            .map_err(|e| Error::DataRead("geometry", e))?;

-        let image_type = if util::is_zero(&buf) {
-            ImageType::Normal
-        } else {
-            ImageType::Empty
-        };
+        // For non-empty images, AOSP says the first block is supposed to be
+        // filled with zeros, but Samsung puts their own SignerVer02 structure
+        // in there, so we can't rely on that.
+        let mut geometry = RawGeometry::ref_from_prefix(&buf).unwrap().0;

-        let geometry = match image_type {
-            ImageType::Normal => {
+        let image_type = match geometry.validate() {
+            Ok(()) => {
+                // This is an empty image for use with fastboot. These have no
+                // extra padding at the beginning of the file nor backup copies
+                // of the geometry and metadata structs.
+                ImageType::Empty
+            }
+            Err(Error::GeometryInvalidMagic(_)) => {
                // This is an normal non-empty image, which has extra padding at
                // the beginning to avoid having the geometry struct interpreted
                // as a boot sector.
@@ -1077,7 +1083,7 @@ impl RawMetadata {
                    .read_exact(&mut buf)
                    .map_err(|e| Error::DataRead("geometry_primary", e))?;

-                let mut geometry = RawGeometry::ref_from_prefix(&buf).unwrap().0;
+                geometry = RawGeometry::ref_from_prefix(&buf).unwrap().0;

                if geometry.validate().is_ok() {
                    // Skip the backup copy.
@@ -1094,17 +1100,9 @@ impl RawMetadata {
                    geometry.validate()?;
                }

-                geometry
-            }
-            ImageType::Empty => {
-                // This is an empty image for use with fastboot. These have no
-                // extra padding at the beginning of the file nor backup copies
-                // of the geometry and metadata structs.
-                let geometry = RawGeometry::ref_from_prefix(&buf).unwrap().0;
-                geometry.validate()?;
-
-                geometry
+                ImageType::Normal
            }
+            Err(e) => return Err(e),
        };

        Ok((image_type, geometry.to_owned()))
@@ -1642,7 +1640,7 @@ impl TryFrom<&RawMetadataSlot> for MetadataSlot {
    type Error = Error;

    fn try_from(raw_slot: &RawMetadataSlot) -> Result<Self> {
-        let mut slot = MetadataSlot {
+        let mut slot = Self {
            major_version: raw_slot.header.major_version.get(),
            minor_version: raw_slot.header.minor_version.get(),
            groups: Vec::with_capacity(raw_slot.groups.len()),
@@ -1722,7 +1720,7 @@ impl TryFrom<&MetadataSlot> for RawMetadataSlot {
    fn try_from(slot: &MetadataSlot) -> Result<Self> {
        let header_size = RawHeader::size_for_version(slot.major_version, slot.minor_version);

-        let mut raw_slot = RawMetadataSlot {
+        let mut raw_slot = Self {
            header: RawHeader {
                magic: HEADER_MAGIC.into(),
                major_version: slot.major_version.into(),
@@ -1939,7 +1937,7 @@ impl TryFrom<&Metadata> for RawMetadata {
        // We only do the bare minimum calculations needed here to fill out the
        // raw fields. There is no semantic validation.

-        let mut raw_metadata = RawMetadata {
+        let mut raw_metadata = Self {
            image_type: metadata.image_type,
            geometry: RawGeometry {
                magic: GEOMETRY_MAGIC.into(),
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 pub mod avb;
@@ -13,3 +13,4 @@ pub mod padding;
 pub mod payload;
 pub mod sparse;
 pub mod verityrs;
+pub mod zip;
@@ -2,29 +2,35 @@
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
+    cmp::Ordering,
    collections::BTreeMap,
-    fmt,
+    fmt::{self, Write as _},
    io::{self, Cursor, Read, Seek, SeekFrom, Write},
    iter,
    path::Path,
+    str::FromStr,
    sync::atomic::AtomicBool,
 };

 use clap::ValueEnum;
 use cms::signed_data::SignedData;
-use const_oid::{db::rfc5912, ObjectIdentifier};
+use const_oid::{ObjectIdentifier, db::rfc5912};
 use memchr::memmem;
 use prost::Message;
-use ring::digest::Context;
+use ring::digest::{Algorithm, Context};
 use thiserror::Error;
-use x509_cert::{der::Encode, Certificate};
-use zip::{result::ZipError, write::FileOptions, CompressionMethod, ZipArchive, ZipWriter};
+use x509_cert::{Certificate, der::Encode};
+use zip::{CompressionMethod, DateTime, ZipArchive, result::ZipError, write::SimpleFileOptions};

 use crate::{
    crypto::{self, RsaPublicKeyExt, RsaSigningKey, SignatureAlgorithm},
-    format::payload::{self, PayloadHeader},
-    protobuf::build::tools::releasetools::{ota_metadata::OtaType, OtaMetadata},
+    format::{
+        payload::{self, PayloadHeader},
+        zip::ZipWriterWrapper,
+    },
+    protobuf::build::tools::releasetools::{OtaMetadata, ota_metadata::OtaType},
    stream::{self, FromReader, HashingReader, HashingWriter, ReadFixedSizeExt},
+    util,
 };

 pub const PATH_METADATA: &str = "META-INF/com/android/metadata";
@@ -70,8 +76,12 @@ pub enum Error {
    InvalidLegacyMetadataLine(String),
    #[error("Unsupported legacy metadata field: {key:?} = {value:?}")]
    UnsupportedLegacyMetadataField { key: String, value: String },
-    #[error("Expected entry offsets {expected:?}, but have {actual:?}")]
-    MismatchedPropertyFiles { expected: String, actual: String },
+    #[error("Mismatched {key:?} entry offsets: zip only: {zip_only:?}, prop only: {prop_only:?}")]
+    MismatchedPropertyFiles {
+        key: String,
+        zip_only: String,
+        prop_only: String,
+    },
    #[error("Property files {value:?} exceed {reserved} byte reserved space")]
    InsufficientReservedSpace { value: String, reserved: usize },
    #[error("Invalid property file entry: {0:?}")]
@@ -280,16 +290,48 @@ fn serialize_metadata(metadata: &OtaMetadata) -> (String, Vec<u8>) {

 #[derive(Clone, Debug)]
 pub struct ZipEntry {
-    pub name: String,
+    pub path: String,
    pub offset: u64,
    pub size: u64,
 }

-/// Parse OTA property files string.
-pub fn parse_property_files(data: &str) -> Result<Vec<ZipEntry>> {
-    let mut result = vec![];
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct PropEntry {
+    name: String,
+    pub offset: u64,
+    pub size: u64,
+}

-    for entry in data.trim_end().split(',') {
+impl PropEntry {
+    pub fn new(path: &str, offset: u64, size: u64) -> Self {
+        Self {
+            name: property_file_name(path).to_owned(),
+            offset,
+            size,
+        }
+    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+}
+
+impl From<&ZipEntry> for PropEntry {
+    fn from(entry: &ZipEntry) -> Self {
+        Self::new(&entry.path, entry.offset, entry.size)
+    }
+}
+
+impl fmt::Display for PropEntry {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}:{}:{}", self.name, self.offset, self.size)
+    }
+}
+
+impl FromStr for PropEntry {
+    type Err = Error;
+
+    fn from_str(entry: &str) -> Result<Self> {
        let mut pieces = entry.split(':');

        let name = pieces
@@ -309,38 +351,63 @@ pub fn parse_property_files(data: &str) -> Result<Vec<ZipEntry>> {
            return Err(Error::InvalidPropertyFileEntry(entry.to_owned()));
        }

-        result.push(ZipEntry { name, offset, size });
+        Ok(Self { name, offset, size })
+    }
+}
+
+/// Parse OTA property files string.
+pub fn parse_property_files(data: &str) -> Result<Vec<PropEntry>> {
+    let mut result = vec![];
+
+    for entry in data.trim_end().split(',') {
+        result.push(entry.parse()?);
    }

    Ok(result)
 }

+/// Get the filename for use in property files entries.
+fn property_file_name(path: &str) -> &str {
+    path.rsplit_once('/').map_or(path, |p| p.1)
+}
+
 /// Compute the property files entries listing the offsets and sizes to every
 /// zip entry.
 fn compute_property_files(
    pf_name: &str,
-    entries: &[ZipEntry],
+    entries: &[PropEntry],
    max_length: Option<usize>,
    want_pb: bool,
 ) -> Result<String> {
-    let compute = |path: &'static str| -> Result<String> {
+    // AOSP's ota_utils.py reserves 15 bytes for the `<offset>:<size>`
+    // placeholder. Since the size of `metadata.pb` is almost always 4 digits,
+    // this prevents the offset from exceeding 10 digits. In the wild, there are
+    // OTA files larger than 10 GB. With ota_utils.py, this limit is never
+    // reached because it puts the OTA metadata files at the beginning of the
+    // zip. However, avbroot needs to put them at the end due to streaming
+    // writes, so we reserve an additional byte to allow offsets <100 GB.
+    const RESERVATION_SIZE: usize = 16;
+
+    let mut buf = String::new();
+
+    let mut append = |path: &'static str| -> Result<()> {
+        let name = property_file_name(path);
        let entry = entries
            .iter()
-            .find(|e| e.name == path)
+            .find(|e| e.name == name)
            .ok_or(Error::MissingZipEntry(path))?;
-        let name = path.rsplit_once('/').map_or(path, |p| p.1);

-        Ok(format!("{name}:{}:{}", entry.offset, entry.size))
+        let _ = write!(&mut buf, "{entry},");
+
+        Ok(())
    };

-    let mut tokens = vec![];
-
    if pf_name == PF_NAME {
-        tokens.push(compute(NAME_PAYLOAD_METADATA)?);
+        append(NAME_PAYLOAD_METADATA)?;
    }

    for path in [PATH_PAYLOAD, PATH_PROPERTIES] {
-        tokens.push(compute(path)?);
+        append(path)?;
    }

    for path in [
@@ -349,44 +416,51 @@ fn compute_property_files(
        "care_map.txt",
        "compatibility.zip",
    ] {
-        if let Ok(token) = compute(path) {
-            tokens.push(token);
-        }
+        // These are optional.
+        let _ = append(path);
    }

    if max_length.is_none() {
-        tokens.push(format!("metadata:{}", " ".repeat(15)));
+        buf.push_str(property_file_name(PATH_METADATA));
+        buf.push(':');
+        buf.extend(iter::repeat_n(' ', RESERVATION_SIZE));
+        buf.push(',');
+
        if want_pb {
-            tokens.push(format!("metadata.pb:{}", " ".repeat(15)));
+            buf.push_str(property_file_name(PATH_METADATA_PB));
+            buf.push(':');
+            buf.extend(iter::repeat_n(' ', RESERVATION_SIZE));
+            buf.push(',');
        }
    } else {
-        tokens.push(compute(PATH_METADATA)?);
+        append(PATH_METADATA)?;
        if want_pb {
-            tokens.push(compute(PATH_METADATA_PB)?);
+            append(PATH_METADATA_PB)?;
        }
    }

-    let mut joined = tokens.join(",");
+    // Strip final trailing comma.
+    buf.pop();

    if let Some(l) = max_length {
-        if joined.len() > l {
+        if buf.len() > l {
            return Err(Error::InsufficientReservedSpace {
-                value: joined,
+                value: buf,
                reserved: l,
            });
        }

-        let remain = l - joined.len();
-        joined.extend(iter::repeat(' ').take(remain));
+        let remain = l - buf.len();
+        buf.extend(iter::repeat_n(' ', remain));
    }

-    Ok(joined)
+    Ok(buf)
 }

 // Add fake payload_metadata.bin entry, covering the header + header signature
 // regions of the payload.
 fn add_payload_metadata_entry(
-    entries: &mut Vec<ZipEntry>,
+    entries: &mut Vec<PropEntry>,
    payload_metadata_size: u64,
 ) -> Result<()> {
    let payload_offset = entries
@@ -394,11 +468,11 @@ fn add_payload_metadata_entry(
        .find(|e| e.name == PATH_PAYLOAD)
        .ok_or(Error::MissingZipEntry(PATH_PAYLOAD))?
        .offset;
-    entries.push(ZipEntry {
-        name: NAME_PAYLOAD_METADATA.to_owned(),
-        offset: payload_offset,
-        size: payload_metadata_size,
-    });
+    entries.push(PropEntry::new(
+        NAME_PAYLOAD_METADATA,
+        payload_offset,
+        payload_metadata_size,
+    ));

    Ok(())
 }
@@ -426,17 +500,19 @@ impl fmt::Display for ZipMode {
 /// directory would start.
 pub fn add_metadata(
    zip_entries: &[ZipEntry],
-    zip_writer: &mut ZipWriter<impl Write>,
+    zip_writer: &mut ZipWriterWrapper<impl Write>,
    next_offset: u64,
    metadata: &OtaMetadata,
    payload_metadata_size: u64,
    zip_mode: ZipMode,
 ) -> Result<OtaMetadata> {
    let mut metadata = metadata.clone();
-    let options = FileOptions::default().compression_method(CompressionMethod::Stored);
+    let options = SimpleFileOptions::default()
+        .last_modified_time(DateTime::default())
+        .compression_method(CompressionMethod::Stored);

-    let mut zip_entries = zip_entries.to_owned();
-    add_payload_metadata_entry(&mut zip_entries, payload_metadata_size)?;
+    let mut prop_entries = zip_entries.iter().map(PropEntry::from).collect();
+    add_payload_metadata_entry(&mut prop_entries, payload_metadata_size)?;

    // Compute initial property files with reserved space as placeholders to
    // store the self-referential metadata entries later.
@@ -444,7 +520,7 @@ pub fn add_metadata(
    for pf in [PF_NAME, PF_STREAMING_NAME] {
        metadata.property_files.insert(
            pf.to_owned(),
-            compute_property_files(pf, &zip_entries, None, true)?,
+            compute_property_files(pf, &prop_entries, None, true)?,
        );
    }

@@ -453,68 +529,56 @@ pub fn add_metadata(
        let (legacy_raw, modern_raw) = serialize_metadata(&metadata);
        let raw_writer = Cursor::new(Vec::new());
        let mut writer = match zip_mode {
-            ZipMode::Streaming => ZipWriter::new_streaming(raw_writer),
-            ZipMode::Seekable => ZipWriter::new(raw_writer),
+            ZipMode::Streaming => ZipWriterWrapper::new_streaming(raw_writer),
+            ZipMode::Seekable => ZipWriterWrapper::new_seekable(raw_writer),
        };

-        writer
-            .start_file_with_extra_data(PATH_METADATA, options)
-            .map_err(|e| Error::ZipEntryStart(PATH_METADATA, e))?;
        let legacy_offset = writer
-            .end_extra_data()
+            .start_file(PATH_METADATA, options)
            .map_err(|e| Error::ZipEntryStart(PATH_METADATA, e))?;
        writer
            .write_all(legacy_raw.as_bytes())
            .map_err(|e| Error::ZipEntryWrite(PATH_METADATA, e))?;

-        writer
-            .start_file_with_extra_data(PATH_METADATA_PB, options)
-            .map_err(|e| Error::ZipEntryStart(PATH_METADATA_PB, e))?;
        let modern_offset = writer
-            .end_extra_data()
+            .start_file(PATH_METADATA_PB, options)
            .map_err(|e| Error::ZipEntryStart(PATH_METADATA_PB, e))?;
        writer
            .write_all(&modern_raw)
            .map_err(|e| Error::ZipEntryWrite(PATH_METADATA_PB, e))?;

-        zip_entries.push(ZipEntry {
-            name: PATH_METADATA.to_owned(),
-            offset: next_offset + legacy_offset,
-            size: legacy_raw.len() as u64,
-        });
-        zip_entries.push(ZipEntry {
-            name: PATH_METADATA_PB.to_owned(),
-            offset: next_offset + modern_offset,
-            size: modern_raw.len() as u64,
-        });
+        prop_entries.push(PropEntry::new(
+            PATH_METADATA,
+            next_offset + legacy_offset,
+            legacy_raw.len() as u64,
+        ));
+        prop_entries.push(PropEntry::new(
+            PATH_METADATA_PB,
+            next_offset + modern_offset,
+            modern_raw.len() as u64,
+        ));

        (next_offset + legacy_offset, next_offset + modern_offset)
    };

    // Compute the final property files using the offsets of the fake entries.
    for (key, value) in &mut metadata.property_files {
-        *value = compute_property_files(key, &zip_entries, Some(value.len()), true)?;
+        *value = compute_property_files(key, &prop_entries, Some(value.len()), true)?;
    }

    // Add the final metadata files to the real zip.
    {
        let (legacy_raw, modern_raw) = serialize_metadata(&metadata);

-        zip_writer
-            .start_file_with_extra_data(PATH_METADATA, options)
-            .map_err(|e| Error::ZipEntryStart(PATH_METADATA, e))?;
        let legacy_offset = zip_writer
-            .end_extra_data()
+            .start_file(PATH_METADATA, options)
            .map_err(|e| Error::ZipEntryStart(PATH_METADATA, e))?;
        zip_writer
            .write_all(legacy_raw.as_bytes())
            .map_err(|e| Error::ZipEntryWrite(PATH_METADATA, e))?;

-        zip_writer
-            .start_file_with_extra_data(PATH_METADATA_PB, options)
-            .map_err(|e| Error::ZipEntryStart(PATH_METADATA_PB, e))?;
        let modern_offset = zip_writer
-            .end_extra_data()
+            .start_file(PATH_METADATA_PB, options)
            .map_err(|e| Error::ZipEntryStart(PATH_METADATA_PB, e))?;
        zip_writer
            .write_all(&modern_raw)
@@ -540,24 +604,73 @@ pub fn verify_metadata(
        let entry = zip_reader
            .by_index(i)
            .map_err(|e| Error::ZipIndexOpen(i, e))?;
-        zip_entries.push(ZipEntry {
-            name: entry.name().to_owned(),
-            offset: entry.data_start(),
-            size: entry.size(),
-        });
+
+        if entry.compression() != CompressionMethod::Stored {
+            continue;
+        }
+
+        zip_entries.push(PropEntry::new(
+            entry.name(),
+            entry.data_start(),
+            entry.size(),
+        ));
    }

    add_payload_metadata_entry(&mut zip_entries, payload_metadata_size)?;

-    let metadata_pb = zip_entries.iter().find(|e| e.name == PATH_METADATA_PB);
+    zip_entries.sort_by(|a, b| a.name.cmp(&b.name));

    for (key, value) in &metadata.property_files {
-        let new_value =
-            compute_property_files(key, &zip_entries, Some(value.len()), metadata_pb.is_some())?;
-        if *value != new_value {
+        let mut prop_entries = parse_property_files(value)?;
+        prop_entries.sort_by(|a, b| a.name.cmp(&b.name));
+
+        // Check that this is a subset of the actual entries.
+        let mut zip_iter = zip_entries.iter().peekable();
+        let mut prop_iter = prop_entries.iter().peekable();
+        let mut zip_only = vec![];
+        let mut prop_only = vec![];
+
+        loop {
+            match (zip_iter.peek(), prop_iter.peek()) {
+                (Some(&zip), Some(&prop)) => match zip.name.cmp(&prop.name) {
+                    Ordering::Less => {
+                        // Exists in zip, but not in property files.
+                        zip_iter.next();
+                    }
+                    Ordering::Equal => {
+                        // If the zip had multiple files with the same filename,
+                        // but in different directories, this will fail.
+                        if zip != prop {
+                            zip_only.push(zip);
+                            prop_only.push(prop);
+                        }
+                        zip_iter.next();
+                        prop_iter.next();
+                    }
+                    Ordering::Greater => {
+                        // Exists in property files, but not in zip.
+                        prop_only.push(prop);
+                        prop_iter.next();
+                    }
+                },
+                (Some(_), None) => {
+                    // Exists in zip, but not in property files.
+                    zip_iter.next();
+                }
+                (None, Some(prop)) => {
+                    // Exists in property files, but not in zip.
+                    prop_only.push(prop);
+                    prop_iter.next();
+                }
+                (None, None) => break,
+            }
+        }
+
+        if !zip_only.is_empty() || !prop_only.is_empty() {
            return Err(Error::MismatchedPropertyFiles {
-                expected: value.clone(),
-                actual: new_value,
+                key: key.clone(),
+                zip_only: util::join(zip_only.into_iter().map(|e| e.to_string()), ","),
+                prop_only: util::join(prop_only.into_iter().map(|e| e.to_string()), ","),
            });
        }
    }
@@ -566,14 +679,14 @@ pub fn verify_metadata(
 }

 #[derive(Clone, Debug)]
-pub struct OtaSignature {
+struct RawOtaSignature {
    /// Decoded CMS structure.
-    pub signed_data: SignedData,
+    signed_data: SignedData,
    /// Length of the file (from the beginning) that's covered by the signature.
-    pub hashed_size: u64,
+    hashed_size: u64,
 }

-impl OtaSignature {
+impl RawOtaSignature {
    pub fn embedded_cert(&self) -> Result<&Certificate> {
        let mut iter = crypto::iter_cms_certs(&self.signed_data);

@@ -589,9 +702,107 @@ impl OtaSignature {
    }
 }

+#[derive(Clone, Debug)]
+pub struct OtaSignature {
+    pub cert: Certificate,
+    pub digest_algo: &'static Algorithm,
+    pub sig_algo: SignatureAlgorithm,
+    pub sig: Vec<u8>,
+    pub data_size: u64,
+}
+
+impl TryFrom<RawOtaSignature> for OtaSignature {
+    type Error = Error;
+
+    fn try_from(raw_ota_sig: RawOtaSignature) -> Result<Self> {
+        let cert = raw_ota_sig.embedded_cert()?;
+
+        // Make sure this is a signature scheme we can handle. There's currently
+        // no Rust library to verify arbitrary CMS signatures for large files
+        // without fully reading them into memory.
+        let signers_len = raw_ota_sig.signed_data.signer_infos.0.len();
+        if signers_len != 1 {
+            return Err(Error::NotOneCmsSignerInfo(signers_len));
+        }
+
+        let signer = raw_ota_sig.signed_data.signer_infos.0.get(0).unwrap();
+        if signer.digest_alg.oid != rfc5912::ID_SHA_256
+            && signer.digest_alg.oid != rfc5912::ID_SHA_1
+        {
+            return Err(Error::UnsupportedDigestAlgorithm(signer.digest_alg.oid));
+        } else if signer.signature_algorithm.oid != rfc5912::RSA_ENCRYPTION
+            && signer.signature_algorithm.oid != rfc5912::SHA_256_WITH_RSA_ENCRYPTION
+        {
+            return Err(Error::UnsupportedSignatureAlgorithm(
+                signer.signature_algorithm.oid,
+            ));
+        }
+
+        // We support SHA1 for verification only.
+        let (digest_algo, sig_algo) = if signer.digest_alg.oid == rfc5912::ID_SHA_256 {
+            (&ring::digest::SHA256, SignatureAlgorithm::Sha256WithRsa)
+        } else {
+            (
+                &ring::digest::SHA1_FOR_LEGACY_USE_ONLY,
+                SignatureAlgorithm::Sha1WithRsa,
+            )
+        };
+
+        Ok(Self {
+            cert: cert.clone(),
+            digest_algo,
+            sig_algo,
+            sig: signer.signature.as_bytes().to_vec(),
+            data_size: raw_ota_sig.hashed_size,
+        })
+    }
+}
+
+impl OtaSignature {
+    /// Verify an OTA zip against its embedded certificate. This function makes
+    /// no assertion about whether the certificate is actually trusted.
+    ///
+    /// CMS signed attributes are intentionally not supported because AOSP
+    /// recovery does not support them either. It expects the CMS [`SignedData`]
+    /// structure to be used for nothing more than a raw signature transport
+    /// mechanism.
+    pub fn verify_ota(
+        &self,
+        mut reader: impl Read + Seek,
+        cancel_signal: &AtomicBool,
+    ) -> Result<()> {
+        let public_key = crypto::get_public_key(&self.cert).map_err(Error::OtaCertExtractPubKey)?;
+
+        // Manually hash the parts of the file covered by the signature.
+        reader
+            .seek(SeekFrom::Start(0))
+            .map_err(|e| Error::DataRead("raw_data", e))?;
+
+        let mut hashing_reader = HashingReader::new(reader, Context::new(self.digest_algo));
+
+        stream::copy_n(
+            &mut hashing_reader,
+            io::sink(),
+            self.data_size,
+            cancel_signal,
+        )
+        .map_err(|e| Error::DataRead("raw_data", e))?;
+
+        let (_, context) = hashing_reader.finish();
+        let digest = context.finish();
+
+        // Verify the signature against the public key.
+        public_key
+            .verify_sig(self.sig_algo, digest.as_ref(), &self.sig)
+            .map_err(Error::CmsVerify)?;
+
+        Ok(())
+    }
+}
+
 /// Parse the CMS signature from the OTA zip comment. This does not perform any
 /// parsing of zip data structures.
-pub fn parse_ota_sig(mut reader: impl Read + Seek) -> Result<OtaSignature> {
+fn parse_raw_ota_sig(mut reader: impl Read + Seek) -> Result<RawOtaSignature> {
    let file_size = reader
        .seek(SeekFrom::End(0))
        .map_err(|e| Error::DataRead("file_size", e))?;
@@ -642,77 +853,16 @@ pub fn parse_ota_sig(mut reader: impl Read + Seek) -> Result<OtaSignature> {
    // length field.
    let hashed_size = file_size - 2 - u64::from(comment_size);

-    Ok(OtaSignature {
+    Ok(RawOtaSignature {
        signed_data,
        hashed_size,
    })
 }

-/// Verify an OTA zip against its embedded certificates. This function makes no
-/// assertion about whether the certificate is actually trusted. Returns the
-/// embedded certificate.
-///
-/// CMS signed attributes are intentionally not supported because AOSP recovery
-/// does not support them either. It expects the CMS [`SignedData`] structure to
-/// be used for nothing more than a raw signature transport mechanism.
-pub fn verify_ota(mut reader: impl Read + Seek, cancel_signal: &AtomicBool) -> Result<Certificate> {
-    let ota_sig = parse_ota_sig(&mut reader)?;
-    let cert = ota_sig.embedded_cert()?;
-    let public_key = crypto::get_public_key(cert).map_err(Error::OtaCertExtractPubKey)?;
-
-    // Make sure this is a signature scheme we can handle. There's currently no
-    // Rust library to verify arbitrary CMS signatures for large files without
-    // fully reading them into memory.
-    let signers_len = ota_sig.signed_data.signer_infos.0.len();
-    if signers_len != 1 {
-        return Err(Error::NotOneCmsSignerInfo(signers_len));
-    }
-
-    let signer = ota_sig.signed_data.signer_infos.0.get(0).unwrap();
-    if signer.digest_alg.oid != rfc5912::ID_SHA_256 && signer.digest_alg.oid != rfc5912::ID_SHA_1 {
-        return Err(Error::UnsupportedDigestAlgorithm(signer.digest_alg.oid));
-    } else if signer.signature_algorithm.oid != rfc5912::RSA_ENCRYPTION
-        && signer.signature_algorithm.oid != rfc5912::SHA_256_WITH_RSA_ENCRYPTION
-    {
-        return Err(Error::UnsupportedSignatureAlgorithm(
-            signer.signature_algorithm.oid,
-        ));
-    }
-
-    // Manually hash the parts of the file covered by the signature.
-    reader
-        .seek(SeekFrom::Start(0))
-        .map_err(|e| Error::DataRead("raw_data", e))?;
-
-    // We support SHA1 for verification only.
-    let (algorithm, algo) = if signer.digest_alg.oid == rfc5912::ID_SHA_256 {
-        (&ring::digest::SHA256, SignatureAlgorithm::Sha256WithRsa)
-    } else {
-        (
-            &ring::digest::SHA1_FOR_LEGACY_USE_ONLY,
-            SignatureAlgorithm::Sha1WithRsa,
-        )
-    };
-
-    let mut hashing_reader = HashingReader::new(reader, Context::new(algorithm));
-
-    stream::copy_n(
-        &mut hashing_reader,
-        io::sink(),
-        ota_sig.hashed_size,
-        cancel_signal,
-    )
-    .map_err(|e| Error::DataRead("raw_data", e))?;
-
-    let (_, context) = hashing_reader.finish();
-    let digest = context.finish();
-
-    // Verify the signature against the public key.
-    public_key
-        .verify_sig(algo, digest.as_ref(), signer.signature.as_bytes())
-        .map_err(Error::CmsVerify)?;
-
-    Ok(cert.clone())
+/// Parse the signature information from the CMS signature embedded in the OTA
+/// zip archive comment.
+pub fn parse_ota_sig(reader: impl Read + Seek) -> Result<OtaSignature> {
+    parse_raw_ota_sig(reader)?.try_into()
 }

 /// Get and parse the protobuf-encoded OTA metadata, the PEM-encoded otacert,
@@ -1,22 +1,22 @@
-// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2022-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    collections::{HashMap, HashSet},
    fmt,
    io::{self, Cursor, Read, Seek, SeekFrom, Write},
-    ops::Range,
+    num::NonZeroU32,
+    ops::{Add, Range},
+    str::FromStr,
    sync::atomic::AtomicBool,
 };

-use base64::engine::general_purpose::STANDARD;
 use base64::Engine;
+use base64::engine::general_purpose::STANDARD;
 use bzip2::write::BzDecoder;
-use liblzma::{
-    stream::{Check, Stream},
-    write::XzDecoder,
-    write::XzEncoder,
-};
+use flate2::{Compression, write::GzEncoder};
+use lzma_rust2::{CheckType, XZOptions, XZReader, XZWriter};
+use num_traits::CheckedAdd;
 use prost::Message;
 use rayon::{
    iter::{IndexedParallelIterator, IntoParallelRefMutIterator},
@@ -26,18 +26,18 @@ use ring::digest::{Context, Digest};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use x509_cert::Certificate;
-use zerocopy::{big_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, big_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::{
    crypto::{self, RsaPublicKeyExt, RsaSigningKey, SignatureAlgorithm},
    protobuf::chromeos_update_engine::{
-        install_operation::Type, signatures::Signature, DeltaArchiveManifest, Extent,
-        InstallOperation, PartitionInfo, PartitionUpdate, Signatures,
+        DeltaArchiveManifest, Extent, InstallOperation, PartitionInfo, PartitionUpdate, Signatures,
+        install_operation::Type, signatures::Signature,
    },
    stream::{
-        self, CountingReader, FromReader, HashingWriter, ReadDiscardExt, ReadFixedSizeExt,
-        ReadSeekReopen, WriteSeek, WriteSeekReopen,
+        self, CountingReader, FromReader, HashingReader, HashingWriter, ReadDiscardExt,
+        ReadFixedSizeExt, ReadSeekReopen, WriteSeek, WriteSeekReopen,
    },
    util::{self, OutOfBoundsError},
 };
@@ -47,6 +47,11 @@ const PAYLOAD_VERSION: u64 = 2;

 const MANIFEST_MAX_SIZE: usize = 4 * 1024 * 1024;

+/// Size of each extent. This matches what AOSP's delta_generator does. We also
+/// require this to be a multiple of the block size and a multiple of the
+/// maximum CoW compression chunk size.
+const CHUNK_SIZE: u64 = 2 * 1024 * 1024;
+
 #[derive(Debug, Error)]
 pub enum Error {
    #[error("Unknown magic: {0:?}")]
@@ -76,6 +81,10 @@ pub enum Error {
        expected: Option<String>,
        actual: String,
    },
+    #[error("Invalid block size: {0}")]
+    InvalidBlockSize(u32),
+    #[error("Invalid maximum CoW compression chunk size: {0}")]
+    InvalidMaxCompressionChunkSize(u32),
    #[error("Size of {name} ({size}) is not aligned to the block size ({block_size})")]
    InvalidPartitionSize {
        name: String,
@@ -108,7 +117,9 @@ pub enum Error {
    DataWrite(&'static str, #[source] io::Error),
    #[error("Expected {expected} bytes, but only wrote {actual} bytes")]
    UnwrittenData { actual: u64, expected: u64 },
-    #[error("I/O error when applying {op_type:?} operation for {num_blocks} blocks starting at {start_block}")]
+    #[error(
+        "I/O error when applying {op_type:?} operation for {num_blocks} blocks starting at {start_block}"
+    )]
    OperationApply {
        op_type: Type,
        start_block: u64,
@@ -121,8 +132,10 @@ pub enum Error {
    InputOpen(String, #[source] io::Error),
    #[error("Failed to open output file for partition: {0}")]
    OutputOpen(String, #[source] io::Error),
+    #[error("Failed to GZ compress partition image chunk")]
+    GzCompress(#[source] io::Error),
    #[error("Failed to initialize XZ encoder")]
-    XzInit(#[source] liblzma::stream::Error),
+    XzInit(#[source] io::Error),
    #[error("Failed to XZ compress partition image chunk")]
    XzCompress(#[source] io::Error),
    #[error("Failed to read uncompressed input partition image chunk")]
@@ -135,7 +148,7 @@ type Result<T> = std::result::Result<T, Error>;

 /// Raw on-disk layout for the payload header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`PAYLOAD_MAGIC`].
    magic: [u8; 4],
@@ -801,16 +814,14 @@ pub fn apply_operation(
                        .map_err(error_fn)?;
                    }
                    Type::ReplaceXz => {
-                        let mut decoder = XzDecoder::new(&mut writer);
-                        stream::copy_n_inspect(
-                            &mut reader,
-                            &mut decoder,
-                            data_length,
-                            |data| hasher.update(data),
-                            cancel_signal,
-                        )
-                        .and_then(|()| decoder.finish())
-                        .map_err(error_fn)?;
+                        // lzma_rust2 does not have a Write API, so we limit the
+                        // reader and read till EOF.
+                        let limited_reader = (&mut reader).take(data_length);
+                        let hashing_reader = HashingReader::new(limited_reader, hasher);
+                        let mut decoder = XZReader::new(hashing_reader, false);
+                        stream::copy(&mut decoder, &mut writer, cancel_signal).map_err(error_fn)?;
+
+                        (_, hasher) = decoder.into_inner().finish();
                    }
                    _ => return Err(Error::UnsupportedOperation(op.r#type())),
                }
@@ -919,6 +930,8 @@ pub fn extract_images<'a>(
        .collect()
 }

+/// Compress raw data into a chunk to be used with a [`Type::ReplaceXz`]
+/// [`InstallOperation`].
 fn compress_chunk(raw_data: &[u8], cancel_signal: &AtomicBool) -> Result<(Vec<u8>, Digest)> {
    let reader = Cursor::new(raw_data);
    let writer = Cursor::new(Vec::new());
@@ -928,8 +941,9 @@ fn compress_chunk(raw_data: &[u8], cancel_signal: &AtomicBool) -> Result<(Vec<u8
    // decompression. Also, we intentionally pick the lowest compression level
    // since we primarily care about squishing zeros. The non-zero portions of
    // boot images are usually already-compressed kernels and ramdisks.
-    let stream = Stream::new_easy_encoder(0, Check::None).map_err(Error::XzInit)?;
-    let mut xz_writer = XzEncoder::new_stream(hashing_writer, stream);
+    let mut options = XZOptions::with_preset(0);
+    options.set_check_sum_type(CheckType::None);
+    let mut xz_writer = XZWriter::new(hashing_writer, options).map_err(Error::XzInit)?;

    stream::copy_n(reader, &mut xz_writer, raw_data.len() as u64, cancel_signal)
        .map_err(Error::XzCompress)?;
@@ -943,51 +957,390 @@ fn compress_chunk(raw_data: &[u8], cancel_signal: &AtomicBool) -> Result<(Vec<u8
 }

 #[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
-pub enum VabcAlgo {
+pub enum CowVersion {
+    V2,
+    V3,
+}
+
+impl CowVersion {
+    /// Compute the size overhead required to store the headers and footers
+    /// needed for this version of the on-disk CoW format.
+    fn size_overhead(self, cow_replace_ops: u64, payload_install_ops: u64) -> u64 {
+        const BUFFER_REGION_DEFAULT_SIZE: u64 = 2 * 1024 * 1024;
+        const CLUSTER_OPS: u64 = 200;
+        const NUM_RESUME_POINTS: u64 = 4;
+        const SIZEOF_COW_FOOTER_V2: u64 = 84;
+        const SIZEOF_COW_HEADER_V2: u64 = 38;
+        const SIZEOF_COW_HEADER_V3: u64 = SIZEOF_COW_HEADER_V2 + 40;
+        const SIZEOF_COW_OPERATION_V2: u64 = 20;
+        const SIZEOF_COW_OPERATION_V3: u64 = 16;
+        const SIZEOF_RESUME_POINT_V3: u64 = 16;
+
+        let mut overhead = 0;
+
+        match self {
+            Self::V2 => {
+                // sizeof(CowHeader).
+                // AOSP: CowWriterV2::InitPos()
+                overhead += SIZEOF_COW_HEADER_V2;
+
+                // header_.buffer_size. update_engine uses the default value.
+                // AOSP: CowWriterV2::InitPos()
+                overhead += BUFFER_REGION_DEFAULT_SIZE;
+
+                // Add all the CoW operation headers:
+                //
+                // - There is a kCowReplaceOp for each compressed chunk.
+                // - There is a kCowLabelOp for each InstallOperation in the
+                //   payload. This is added by delta_generator in CowDryRun().
+                // - There is a kCowClusterOp at the end of each cluster of
+                //   operations (which includes the kCowClusterOp itself). The
+                //   cluster size used to be 200, but was changed to 1024 in
+                //   5e8e488c13cbff9e0a305ce7c22fd6a13aabb886. We'll use the
+                //   smaller value because it's better to overestimate.
+                //
+                // AOSP: CowWriterV2::EmitClusterIfNeeded()
+                let cow_label_ops = payload_install_ops;
+                let cow_cluster_ops = (cow_replace_ops + cow_label_ops).div_ceil(CLUSTER_OPS - 1);
+
+                // A cluster cannot be truncated, so round up to the nearest
+                // cluster boundary.
+                // AOSP: CowWriterV2::AddOperation()
+                overhead += cow_cluster_ops * CLUSTER_OPS * SIZEOF_COW_OPERATION_V2;
+
+                // sizeof(CowFooter).
+                // AOSP: CowWriterV2::GetCowSizeInfo()
+                overhead += SIZEOF_COW_FOOTER_V2;
+            }
+            Self::V3 => {
+                // AOSP: CowWriterV3::OpenForWrite() -> GetDataOffset()
+                overhead += SIZEOF_COW_HEADER_V3;
+                overhead += BUFFER_REGION_DEFAULT_SIZE;
+                overhead += NUM_RESUME_POINTS * SIZEOF_RESUME_POINT_V3;
+
+                // Add an operation header (sizeof(CowOperationV3)) for each
+                // chunk of compressed data.
+                // AOSP: CowWriterV3::WriteOperation()
+                overhead += cow_replace_ops * SIZEOF_COW_OPERATION_V3;
+            }
+        }
+
+        overhead
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+enum ChunkingMethod {
+    /// Compress data in block sized chunks each iteration.
+    Exact,
+    /// Compress data in chunks where each chunk is sized at the largest power
+    /// of 2 that's `<=` the specified size and the remaining input size.
+    MaxPowerOf2(NonZeroU32),
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+struct ChunkingParams {
+    block_size: u32,
+    method: ChunkingMethod,
+}
+
+impl ChunkingParams {
+    fn chunk_size(self, num_blocks: u64) -> u32 {
+        match self.method {
+            ChunkingMethod::Exact => self.block_size,
+            ChunkingMethod::MaxPowerOf2(max_chunk_size) => {
+                assert!(
+                    max_chunk_size.is_power_of_two() && max_chunk_size.get() % self.block_size == 0
+                );
+
+                let mut chunk_size = max_chunk_size.get();
+                while chunk_size > self.block_size {
+                    let min_blocks = chunk_size / self.block_size;
+                    if num_blocks >= u64::from(min_blocks) {
+                        return chunk_size;
+                    }
+
+                    chunk_size >>= 1;
+                }
+
+                self.block_size
+            }
+        }
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub struct CowEstimate {
+    /// Size of estimate in bytes.
+    pub size: u64,
+    /// Number of CoW operations (v3 only).
+    pub num_ops: u64,
+}
+
+impl CowEstimate {
+    /// Add fudge factor to account for overhead.
+    fn fudged(&self, payload_install_ops: u64, cow_version: CowVersion) -> Option<Self> {
+        let version_overhead = cow_version.size_overhead(self.num_ops, payload_install_ops);
+
+        let mut size = self.size.checked_add(version_overhead)?;
+
+        // delta_generator adds 1% overhead to the original CoW size estimate,
+        // even if compression is disabled. We'll do the same too. For the
+        // compressed scenario, we rely on this more because lz4_flex and
+        // zlib-rs usually compress better than the lz4 and zlib implementations
+        // used by libsnapshot_cow.
+        size += size / 100;
+
+        // AOSP: PartitionProcessor::Run()
+        let num_ops = self.num_ops.max(25);
+
+        Some(Self { size, num_ops })
+    }
+}
+
+impl Add for CowEstimate {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self {
+            size: self.size + rhs.size,
+            num_ops: self.num_ops + rhs.num_ops,
+        }
+    }
+}
+
+impl CheckedAdd for CowEstimate {
+    fn checked_add(&self, rhs: &Self) -> Option<Self> {
+        Some(Self {
+            size: self.size.checked_add(rhs.size)?,
+            num_ops: self.num_ops.checked_add(rhs.num_ops)?,
+        })
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
+pub enum VabcAlgoKind {
+    None,
    Lz4,
-    Gzip,
+    Gz,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)]
+pub struct VabcAlgo {
+    /// Compression algorithm.
+    pub kind: VabcAlgoKind,
+    /// Compression level. AOSP allows this to be present even if the algorithm
+    /// can't use it.
+    pub level: Option<u32>,
 }

 impl VabcAlgo {
-    pub fn new(name: &str) -> Option<Self> {
-        match name {
-            "lz4" => Some(Self::Lz4),
-            "gz" => Some(Self::Gzip),
-            _ => None,
-        }
-    }
+    /// Compute the compressed size of the raw data when split into chunks based
+    /// on the specified [`ChunkingParams`]. The length of `raw_data` must be a
+    /// multiple of the block size or else this will panic. The compressed data
+    /// for each chunk is temporarily stored in memory, but discarded after each
+    /// loop iteration.
+    fn compressed_size(self, mut raw_data: &[u8], chunking: ChunkingParams) -> Result<CowEstimate> {
+        assert!(raw_data.len() as u64 % u64::from(chunking.block_size) == 0);

-    fn compressed_size(self, mut raw_data: &[u8], block_size: u32) -> u64 {
-        let mut total = 0;
+        let mut size = 0;
+        let mut num_ops = 0;

        while !raw_data.is_empty() {
-            let n = raw_data.len().min(block_size as usize);
-            let compressed = match self {
-                Self::Lz4 => lz4_flex::block::compress(&raw_data[..n]),
-                // We use the miniz_oxide backend for flate2, but flate2 doesn't
-                // expose a nice function for compressing to a vec, so just use
-                // miniz_oxide directly.
-                Self::Gzip => miniz_oxide::deflate::compress_to_vec_zlib(&raw_data[..n], 9),
+            let num_blocks = raw_data.len() as u64 / u64::from(chunking.block_size);
+            let chunk_size = chunking.chunk_size(num_blocks) as usize;
+            let (chunk, remaining) = raw_data.split_at(chunk_size);
+
+            // This should match CompressWorker::GetDefaultCompressionLevel() in
+            // AOSP's libsnapshot.
+            //
+            // CoW v3 uses the raw data instead of the compressed data if the
+            // raw data is smaller. Because we use a different implementation of
+            // the compression algorithms, we don't implement this. It's safer
+            // to just overestimate and use the (larger) compressed size.
+            size += match self.kind {
+                VabcAlgoKind::None => chunk_size as u64,
+                VabcAlgoKind::Lz4 => lz4_flex::block::compress(chunk).len() as u64,
+                VabcAlgoKind::Gz => {
+                    let level = self.level.map_or(Compression::best(), Compression::new);
+                    let mut encoder = GzEncoder::new(Vec::new(), level);
+                    encoder.write_all(chunk).map_err(Error::GzCompress)?;
+                    encoder.finish().map_err(Error::GzCompress)?.len() as u64
+                }
            };

-            total += compressed.len().min(n) as u64;
-
-            raw_data = &raw_data[n..];
+            num_ops += 1;
+            raw_data = remaining;
        }

-        total
+        Ok(CowEstimate { size, num_ops })
    }
 }

 impl fmt::Display for VabcAlgo {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Lz4 => f.write_str("lz4"),
-            Self::Gzip => f.write_str("gz"),
+        let name = match self.kind {
+            VabcAlgoKind::None => "none",
+            VabcAlgoKind::Lz4 => "lz4",
+            VabcAlgoKind::Gz => "gz",
+        };
+
+        f.write_str(name)?;
+
+        if let Some(level) = self.level {
+            write!(f, ",{level}")?;
        }
+
+        Ok(())
    }
 }

+#[derive(Clone, Debug, Error)]
+#[error("Invalid VABC algorithm: {0:?} (must be {{none|lz4|gz}}[,<level>])")]
+pub struct InvalidVabcAlgo(String);
+
+impl FromStr for VabcAlgo {
+    type Err = InvalidVabcAlgo;
+
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        let (prefix, suffix) = s.split_once(',').unwrap_or((s, ""));
+
+        // AOSP allows any algorithm to accept a level, even if it's unused.
+        let level = if !suffix.is_empty() {
+            Some(suffix.parse().map_err(|_| InvalidVabcAlgo(s.to_owned()))?)
+        } else {
+            None
+        };
+
+        let kind = match prefix {
+            "" | "none" => VabcAlgoKind::None,
+            "lz4" => VabcAlgoKind::Lz4,
+            "gz" => VabcAlgoKind::Gz,
+            _ => return Err(InvalidVabcAlgo(s.to_owned())),
+        };
+
+        Ok(Self { kind, level })
+    }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct VabcParams {
+    /// CoW on-disk format version.
+    pub version: CowVersion,
+    /// CoW compression algorithm.
+    pub algo: VabcAlgo,
+    /// The maximum number of bytes to compress at a time.
+    pub compression_factor: u32,
+}
+
+/// Ensure that the partition size is aligned to the block size and that the
+/// block size and compression factor are factors of our [`CHUNK_SIZE`].
+fn validate_partition_size(
+    partition_name: &str,
+    file_size: u64,
+    block_size: u32,
+    compression_factor: u32,
+) -> Result<()> {
+    if block_size == 0 || !block_size.is_power_of_two() || CHUNK_SIZE % u64::from(block_size) != 0 {
+        return Err(Error::InvalidBlockSize(block_size));
+    }
+
+    if compression_factor == 0
+        || !compression_factor.is_power_of_two()
+        || CHUNK_SIZE % u64::from(compression_factor) != 0
+    {
+        return Err(Error::InvalidMaxCompressionChunkSize(compression_factor));
+    }
+
+    if file_size % u64::from(block_size) != 0 {
+        return Err(Error::InvalidPartitionSize {
+            name: partition_name.to_owned(),
+            size: file_size,
+            block_size,
+        });
+    }
+
+    Ok(())
+}
+
+/// Compute the VABC CoW size estimate. For a more accurate size estimate with
+/// CoW version 2, `payload_install_ops` must be equal to the number of
+/// [`InstallOperation`]s in the payload. The caller must update
+/// [`PartitionUpdate::estimate_cow_size`] and
+/// [`PartitionUpdate::estimate_op_count_max`] or else update_engine may fail to
+/// flash the partition due to running out of space on the CoW block device.
+pub fn compute_cow_estimate(
+    input: &(dyn ReadSeekReopen + Sync),
+    payload_install_ops: u64,
+    partition_name: &str,
+    block_size: u32,
+    vabc_params: VabcParams,
+    cancel_signal: &AtomicBool,
+) -> Result<CowEstimate> {
+    let file_size = input
+        .reopen_boxed()
+        .and_then(|mut r| r.seek(SeekFrom::End(0)))
+        .map_err(|e| Error::InputOpen(partition_name.to_owned(), e))?;
+    let final_chunk_different = file_size % CHUNK_SIZE != 0;
+
+    validate_partition_size(
+        partition_name,
+        file_size,
+        block_size,
+        vabc_params.compression_factor,
+    )?;
+
+    let chunking = ChunkingParams {
+        block_size,
+        method: match vabc_params.version {
+            CowVersion::V2 => ChunkingMethod::Exact,
+            CowVersion::V3 => {
+                ChunkingMethod::MaxPowerOf2(vabc_params.compression_factor.try_into().unwrap())
+            }
+        },
+    };
+
+    let chunks_total = file_size.div_ceil(CHUNK_SIZE);
+
+    let initial_estimate = (0..chunks_total)
+        .into_par_iter()
+        .map(|chunk| -> Result<CowEstimate> {
+            let data = (|| {
+                let mut reader = input.reopen_boxed()?;
+                reader.seek(SeekFrom::Start(chunk * CHUNK_SIZE))?;
+
+                let chunk_size = if final_chunk_different && chunk == chunks_total - 1 {
+                    file_size % CHUNK_SIZE
+                } else {
+                    CHUNK_SIZE
+                };
+
+                stream::check_cancel(cancel_signal)?;
+                reader.read_vec_exact(chunk_size as usize)
+            })()
+            .map_err(Error::ChunkRead)?;
+
+            vabc_params.algo.compressed_size(&data, chunking)
+        })
+        .try_fold(
+            CowEstimate::default,
+            |total, chunk_estimate| -> Result<CowEstimate> {
+                total
+                    .checked_add(&chunk_estimate?)
+                    .ok_or(Error::IntOverflow("initial_estimate"))
+            },
+        )
+        .try_reduce(CowEstimate::default, |total, partial| {
+            total
+                .checked_add(&partial)
+                .ok_or(Error::IntOverflow("initial_estimate"))
+        })?;
+
+    initial_estimate
+        .fudged(payload_install_ops, vabc_params.version)
+        .ok_or(Error::IntOverflow("fudged_estimate"))
+}
+
 /// Compress the image and return the corresponding information to insert into
 /// the payload manifest's [`PartitionUpdate`] instance. The uncompressed data
 /// is split into 2 MiB chunks, which are read and compressed in parallel, and
@@ -996,21 +1349,17 @@ impl fmt::Display for VabcAlgo {
 /// update [`InstallOperation::data_offset`] in each operation manually because
 /// the initial values are relative to 0.
 ///
-/// If `vabc_algo` is set, the VABC CoW v2 size estimate will be computed. The
-/// caller must update [`PartitionUpdate::estimate_cow_size`] with this value or
-/// else update_engine may fail to flash the partition due to running out of
-/// space on the CoW block device. CoW v2 + other algorithms and also CoW v3 are
-/// currently unsupported because there currently are no known OTAs that use
-/// those configurations.
+/// If `vabc_algo` is set, the VABC CoW size estimate will also be computed.
+/// This is more efficient than separately calling [`compute_cow_estimate`]
+/// since the input does not need to be read twice.
 pub fn compress_image(
    input: &(dyn ReadSeekReopen + Sync),
    output: &(dyn WriteSeekReopen + Sync),
    partition_name: &str,
    block_size: u32,
-    vabc_algo: Option<VabcAlgo>,
+    vabc_params: Option<VabcParams>,
    cancel_signal: &AtomicBool,
-) -> Result<(PartitionInfo, Vec<InstallOperation>, Option<u64>)> {
-    const CHUNK_SIZE: u64 = 2 * 1024 * 1024;
+) -> Result<(PartitionInfo, Vec<InstallOperation>, Option<CowEstimate>)> {
    const CHUNK_GROUP: u64 = 32;

    let file_size = input
@@ -1019,18 +1368,23 @@ pub fn compress_image(
        .map_err(|e| Error::InputOpen(partition_name.to_owned(), e))?;
    let final_chunk_different = file_size % CHUNK_SIZE != 0;

-    if file_size % u64::from(block_size) != 0 || CHUNK_SIZE % u64::from(block_size) != 0 {
-        return Err(Error::InvalidPartitionSize {
-            name: partition_name.to_owned(),
-            size: file_size,
-            block_size,
-        });
-    }
+    let compression_factor = vabc_params.map_or(block_size, |p| p.compression_factor);
+    validate_partition_size(partition_name, file_size, block_size, compression_factor)?;
+
+    let chunking = ChunkingParams {
+        block_size,
+        method: match vabc_params.map(|p| p.version) {
+            Some(CowVersion::V3) => {
+                ChunkingMethod::MaxPowerOf2(compression_factor.try_into().unwrap())
+            }
+            _ => ChunkingMethod::Exact,
+        },
+    };

    let chunks_total = file_size.div_ceil(CHUNK_SIZE);
-    let mut bytes_compressed = 0;
+    let mut bytes_compressed = 0u64;
    let mut context_uncompressed = Context::new(&ring::digest::SHA256);
-    let mut cow_estimate = 0;
+    let mut initial_estimate = CowEstimate::default();
    let mut operations = vec![];

    // Read the file one group at a time. This allows for some parallelization
@@ -1067,10 +1421,12 @@ pub fn compress_image(
        let mut compressed_data_group = uncompressed_data_group
            .into_par_iter()
            .map(
-                |(raw_offset, raw_data)| -> Result<(Vec<u8>, InstallOperation, u64)> {
+                |(raw_offset, raw_data)| -> Result<(Vec<u8>, InstallOperation, CowEstimate)> {
                    let (data, digest_compressed) = compress_chunk(&raw_data, cancel_signal)?;
-                    let cow_size =
-                        vabc_algo.map_or(0, |a| a.compressed_size(&raw_data, block_size));
+                    let cow_estimate = vabc_params
+                        .map(|p| p.algo.compressed_size(&raw_data, chunking))
+                        .transpose()?
+                        .unwrap_or_default();

                    let extent = Extent {
                        start_block: Some(raw_offset / u64::from(block_size)),
@@ -1083,15 +1439,19 @@ pub fn compress_image(
                    operation.dst_extents.push(extent);
                    operation.data_sha256_hash = Some(digest_compressed.as_ref().to_vec());

-                    Ok((data, operation, cow_size))
+                    Ok((data, operation, cow_estimate))
                },
            )
            .collect::<Result<Vec<_>>>()?;

-        for (data, operation, cow_size) in &mut compressed_data_group {
+        for (data, operation, cow_estimate) in &mut compressed_data_group {
            operation.data_offset = Some(bytes_compressed);
-            bytes_compressed += data.len() as u64;
-            cow_estimate += *cow_size;
+            bytes_compressed = bytes_compressed
+                .checked_add(data.len() as u64)
+                .ok_or(Error::IntOverflow("bytes_compressed"))?;
+            initial_estimate = initial_estimate
+                .checked_add(cow_estimate)
+                .ok_or(Error::IntOverflow("initial_estimate"))?;
        }

        let group_operations = compressed_data_group
@@ -1115,25 +1475,12 @@ pub fn compress_image(
        hash: Some(digest_uncompressed.as_ref().to_vec()),
    };

-    let cow_estimate = if vabc_algo.is_some() {
-        // lz4_flex and miniz_oxide usually compress better than the lz4 and
-        // zlib implementations used by libsnapshot_cow. Make up for this by
-        // adding percentage-based overhead.
-        cow_estimate += cow_estimate / 100;
-
-        // We also need to account for constant overhead, especially with
-        // smaller partitions. We can match what delta_generator normally adds
-        // in CowWriterV2::InitPos() exactly. Since we only ever create full
-        // OTAs, we can assume that all CoW operations are kCowReplaceOp.
-
-        // sizeof(CowHeader).
-        cow_estimate += 38;
-        // header_.buffer_size (equal to BUFFER_REGION_DEFAULT_SIZE).
-        cow_estimate += 2 * 1024 * 1024;
-        // CowOptions::cluster_ops * sizeof(CowOperationV2).
-        cow_estimate += 200 * 20;
-
-        Some(cow_estimate)
+    let cow_estimate = if let Some(p) = vabc_params {
+        Some(
+            initial_estimate
+                .fudged(operations.len() as u64, p.version)
+                .ok_or(Error::IntOverflow("fudged_estimate"))?,
+        )
    } else {
        None
    };
@@ -1280,6 +1627,8 @@ pub fn compress_modified_image(
                writer.seek(SeekFrom::Start(operation.data_offset.unwrap()))?;
                writer.write_all(&data)?;

+                // Clippy doesn't know we're returning a Range.
+                #[allow(clippy::range_plus_one)]
                Ok(i..i + 1)
            })
            .collect::<io::Result<Vec<_>>>()
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2024-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
@@ -11,7 +11,7 @@ use std::{
 use crc32fast::Hasher;
 use dlv_list::{Index, VecList};
 use thiserror::Error;
-use zerocopy::{byteorder::little_endian, FromBytes, IntoBytes};
+use zerocopy::{FromBytes, IntoBytes, byteorder::little_endian};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned};

 use crate::stream::ReadDiscardExt;
@@ -106,7 +106,7 @@ type Result<T> = std::result::Result<T, Error>;

 /// Raw on-disk layout for the header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawHeader {
    /// Magic value. This should be equal to [`HEADER_MAGIC`].
    magic: little_endian::U32,
@@ -159,7 +159,7 @@ impl RawHeader {
            return Err(Error::UnsupportedMajorVersion(self.major_version.get()));
        }

-        if self.file_hdr_sz.get() < mem::size_of::<RawHeader>() as u16 {
+        if self.file_hdr_sz.get() < mem::size_of::<Self>() as u16 {
            return Err(Error::InvalidFileHeaderSize(self.file_hdr_sz.get()));
        } else if self.chunk_hdr_sz.get() < mem::size_of::<RawChunk>() as u16 {
            return Err(Error::InvalidChunkHeaderSize(self.chunk_hdr_sz.get()));
@@ -173,7 +173,7 @@ impl RawHeader {
    }

    fn excess_raw_header_bytes(&self) -> u16 {
-        self.file_hdr_sz.get() - mem::size_of::<RawHeader>() as u16
+        self.file_hdr_sz.get() - mem::size_of::<Self>() as u16
    }

    fn excess_raw_chunk_bytes(&self) -> u16 {
@@ -183,7 +183,7 @@ impl RawHeader {

 /// Raw on-disk layout for the chunk header.
 #[derive(Clone, Copy, FromBytes, IntoBytes, KnownLayout, Immutable, Unaligned)]
-#[repr(packed)]
+#[repr(C, packed)]
 struct RawChunk {
    /// Chunk type. Must be [`CHUNK_TYPE_RAW`], [`CHUNK_TYPE_FILL`],
    /// [`CHUNK_TYPE_DONT_CARE`], or [`CHUNK_TYPE_CRC32`].
@@ -225,7 +225,7 @@ impl RawChunk {
                return Err(Error::InvalidChunkType {
                    index,
                    chunk_type: t,
-                })
+                });
            }
        };

@@ -374,6 +374,9 @@ impl fmt::Debug for ChunkData {
 /// metadata they contain.
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct Chunk {
+    /// When [`Self::data`] is [`ChunkData::Data`], this is guaranteed to not
+    /// exceed the bounds of [`u32`] when multiplied by [`Header::block_size`].
+    /// For other types of data, a 64-bit signed or unsigned integer is needed.
    pub bounds: ChunkBounds,
    pub data: ChunkData,
 }
@@ -519,11 +522,11 @@ impl ChunkList {
        // entire list every time.
        let mut insert_before = self.chunks.front_index();

-        if let Some(last_used) = self.last_used {
-            if chunk.bounds.start >= self.chunks.get(last_used).unwrap().bounds.start {
-                // The new chunk starts after the last used chunk.
-                insert_before = Some(last_used);
-            }
+        if let Some(last_used) = self.last_used
+            && chunk.bounds.start >= self.chunks.get(last_used).unwrap().bounds.start
+        {
+            // The new chunk starts after the last used chunk.
+            insert_before = Some(last_used);
        }

        while let Some(index) = insert_before {
@@ -811,7 +814,7 @@ impl<R: Read> SparseReader<R> {
                data = ChunkData::Crc32(expected.get());
            }
            _ => unreachable!(),
-        };
+        }

        let chunk = Chunk {
            bounds: ChunkBounds {
@@ -0,0 +1,103 @@
+// SPDX-FileCopyrightText: 2025 Andrew Gunnerson
+// SPDX-License-Identifier: GPL-3.0-only
+
+use std::io::{self, Seek, SeekFrom, Write};
+
+use zip::{
+    ZipWriter,
+    result::ZipResult,
+    write::{FileOptionExtension, FileOptions, StreamWriter},
+};
+
+/// A wrapper around a seekable writer. `W` must implement [`Seek`], but only
+/// during the creation of a new instance. The resulting type can be stored in a
+/// parent container where the generic type does not implement [`Seek`].
+pub struct SeekWriter<W: Write> {
+    inner: W,
+    seek_fn: fn(&mut W, SeekFrom) -> io::Result<u64>,
+}
+
+impl<W: Write> SeekWriter<W> {
+    pub fn into_inner(self) -> W {
+        self.inner
+    }
+}
+
+impl<W: Write + Seek> SeekWriter<W> {
+    pub fn new(inner: W) -> Self {
+        Self {
+            inner,
+            seek_fn: W::seek,
+        }
+    }
+}
+
+impl<W: Write> Write for SeekWriter<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.inner.write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.inner.flush()
+    }
+}
+
+impl<W: Write> Seek for SeekWriter<W> {
+    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
+        (self.seek_fn)(&mut self.inner, pos)
+    }
+}
+
+/// This is an ugly hack to have a single type represent both seekable and
+/// streaming [`ZipWriter`]s. `W` only needs to implement [`Seek`] when creating
+/// a seekable instance via [`Self::new_seekable`].
+pub enum ZipWriterWrapper<W: Write> {
+    Streaming(ZipWriter<StreamWriter<W>>),
+    Seekable(ZipWriter<SeekWriter<W>>),
+}
+
+impl<W: Write + Seek> ZipWriterWrapper<W> {
+    pub fn new_seekable(inner: W) -> Self {
+        Self::Seekable(ZipWriter::new(SeekWriter::new(inner)))
+    }
+}
+
+impl<W: Write> ZipWriterWrapper<W> {
+    pub fn new_streaming(inner: W) -> Self {
+        Self::Streaming(ZipWriter::new_stream(inner))
+    }
+
+    pub fn start_file(
+        &mut self,
+        name: impl ToString,
+        options: FileOptions<impl FileOptionExtension>,
+    ) -> ZipResult<u64> {
+        match self {
+            Self::Streaming(z) => z.start_file(name, options),
+            Self::Seekable(z) => z.start_file(name, options),
+        }
+    }
+
+    pub fn finish(self) -> ZipResult<W> {
+        match self {
+            Self::Streaming(z) => Ok(z.finish()?.into_inner()),
+            Self::Seekable(z) => Ok(z.finish()?.into_inner()),
+        }
+    }
+}
+
+impl<W: Write> Write for ZipWriterWrapper<W> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        match self {
+            Self::Streaming(z) => z.write(buf),
+            Self::Seekable(z) => z.write(buf),
+        }
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        match self {
+            Self::Streaming(z) => z.flush(),
+            Self::Seekable(z) => z.flush(),
+        }
+    }
+}
@@ -4,8 +4,8 @@
 use std::{
    process::ExitCode,
    sync::{
-        atomic::{AtomicBool, Ordering},
        Arc,
+        atomic::{AtomicBool, Ordering},
    },
 };

@@ -10,7 +10,7 @@ use std::{
 };

 use num_traits::{Num, PrimInt};
-use serde::{de::Visitor, Deserializer, Serializer};
+use serde::{Deserializer, Serializer, de::Visitor};

 pub fn serialize<S, T>(data: &T, serializer: S) -> Result<S::Ok, S::Error>
 where
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2022-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
@@ -15,18 +15,15 @@ use std::{
 };

 use bstr::ByteSlice;
-use liblzma::{
-    stream::{Check, Stream},
-    write::XzEncoder,
-};
+use lzma_rust2::{CheckType, XZOptions, XZWriter};
 use rayon::iter::{IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator};
 use regex::bytes::Regex;
 use ring::digest::Context;
 use rsa::RsaPublicKey;
 use thiserror::Error;
-use tracing::{debug, debug_span, trace, warn, Span};
+use tracing::{Span, debug, debug_span, trace, warn};
 use x509_cert::Certificate;
-use zip::{result::ZipError, ZipArchive};
+use zip::{ZipArchive, result::ZipError};

 use crate::{
    crypto::{self, RsaSigningKey},
@@ -38,6 +35,7 @@ use crate::{
    },
    patch::otacert::{self, OtaCertBuildFlags},
    stream::{self, FromReader, HashingWriter, ReadSeek, SectionReader, ToWriter, WriteSeek},
+    util,
 };

 #[derive(Debug, Error)]
@@ -83,7 +81,7 @@ pub enum Error {
    #[error("Failed to generate replacement otacerts zip")]
    OtaCertZip(#[source] otacert::Error),
    #[error("Failed to initialize XZ encoder")]
-    XzInit(#[source] liblzma::stream::Error),
+    XzInit(#[source] io::Error),
    #[error("Failed to XZ compress entry: {:?}", .0.as_bstr())]
    XzCompress(Vec<u8>, #[source] io::Error),
    #[error("Failed to open zip file: {0:?}")]
@@ -194,7 +192,7 @@ impl MagiskRootPatcher {
    //   replaced by PREINITDEVICE
    // - Versions newer than the latest supported version are assumed to support
    //   the same features as the latest version
-    const VERS_SUPPORTED: &'static [Range<u32>] = &[25102..25207, 25211..28200];
+    const VERS_SUPPORTED: &'static [Range<u32>] = &[25102..25207, 25211..30300];
    const VER_PREINIT_DEVICE: RangeFrom<u32> = 25211..;
    const VER_RANDOM_SEED: Range<u32> = 25211..26103;
    const VER_PATCH_VBMETA: Range<u32> = Self::VERS_SUPPORTED[0].start..26202;
@@ -288,9 +286,11 @@ impl MagiskRootPatcher {
    }

    fn xz_compress(name: &[u8], reader: impl Read, cancel_signal: &AtomicBool) -> Result<Vec<u8>> {
-        let stream = Stream::new_easy_encoder(9, Check::Crc32).map_err(Error::XzInit)?;
+        let mut options = XZOptions::with_preset(9);
+        options.set_check_sum_type(CheckType::None);
+
        let raw_writer = Cursor::new(Vec::new());
-        let mut writer = XzEncoder::new_stream(raw_writer, stream);
+        let mut writer = XZWriter::new(raw_writer, options).map_err(Error::XzInit)?;

        let raw_writer = stream::copy(reader, &mut writer, cancel_signal)
            .and_then(|_| writer.finish())
@@ -378,14 +378,12 @@ impl MagiskRootPatcher {

            let mut new_data = None;

-            if xz_compress {
-                if let CpioEntryData::Data(data) = &old_entry.data {
-                    new_path.extend(b".xz");
+            if xz_compress && let CpioEntryData::Data(data) = &old_entry.data {
+                new_path.extend(b".xz");

-                    let reader = Cursor::new(data);
-                    let buf = Self::xz_compress(&new_path, reader, cancel_signal)?;
-                    new_data = Some(CpioEntryData::Data(buf));
-                }
+                let reader = Cursor::new(data);
+                let buf = Self::xz_compress(&new_path, reader, cancel_signal)?;
+                new_data = Some(CpioEntryData::Data(buf));
            }

            new_entries.push(CpioEntry {
@@ -432,7 +430,7 @@ impl BootImagePatch for MagiskRootPatcher {
            targets.push("init_boot");
        } else if boot_images.contains_key("boot") {
            targets.push("boot");
-        };
+        }

        Ok(targets)
    }
@@ -544,10 +542,10 @@ impl BootImagePatch for MagiskRootPatcher {

        magisk_config.push_str("RECOVERYMODE=false\n");

-        if Self::VER_PREINIT_DEVICE.contains(&self.version) {
-            if let Some(device) = &self.preinit_device {
-                writeln!(&mut magisk_config, "PREINITDEVICE={device}").unwrap();
-            }
+        if Self::VER_PREINIT_DEVICE.contains(&self.version)
+            && let Some(device) = &self.preinit_device
+        {
+            writeln!(&mut magisk_config, "PREINITDEVICE={device}").unwrap();
        }

        // Magisk normally saves the original SHA1 digest in its config file. It
@@ -781,7 +779,7 @@ impl DsuPubKeyPatcher {
            e.data = data;
        } else {
            entries.push(CpioEntry::new_file(Self::AVBROOT_KEY_PATH, 0o644, data));
-        };
+        }

        *ramdisk = save_ramdisk(&entries, ramdisk_format, cancel_signal)?;

@@ -930,16 +928,17 @@ impl PrepatchedImagePatcher {
            return Ok(None);
        };

-        let kmi_version = captures
-            .iter()
-            // Capture #0 is the entire match.
-            .skip(1)
-            .flatten()
-            .map(|c| c.as_bytes())
-            // Our regex only matches ASCII bytes.
-            .map(|c| std::str::from_utf8(c).unwrap())
-            .collect::<Vec<_>>()
-            .join("-");
+        let kmi_version = util::join(
+            captures
+                .iter()
+                // Capture #0 is the entire match.
+                .skip(1)
+                .flatten()
+                .map(|c| c.as_bytes())
+                // Our regex only matches ASCII bytes.
+                .map(|c| std::str::from_utf8(c).unwrap()),
+            "-",
+        );

        Ok(Some(kmi_version))
    }
@@ -971,7 +970,7 @@ impl BootImagePatch for PrepatchedImagePatcher {
            targets.push("init_boot");
        } else if boot_images.contains_key("boot") {
            targets.push("boot");
-        };
+        }

        Ok(targets)
    }
@@ -6,8 +6,8 @@ use std::{borrow::Cow, cmp::Ordering, io::Cursor, path::Path};
 use bitflags::bitflags;
 use thiserror::Error;
 use tracing::trace;
-use x509_cert::{der::asn1::BitString, Certificate};
-use zip::{result::ZipError, write::FileOptions, CompressionMethod, ZipWriter};
+use x509_cert::{Certificate, der::asn1::BitString};
+use zip::{CompressionMethod, DateTime, ZipWriter, result::ZipError, write::SimpleFileOptions};

 use crate::{crypto, format::ota};

@@ -79,7 +79,9 @@ pub fn create_zip(cert: &Certificate, flags: OtaCertBuildFlags) -> Result<Vec<u8
        CompressionMethod::Stored
    };

-    let options = FileOptions::default().compression_method(compression_method);
+    let options = SimpleFileOptions::default()
+        .last_modified_time(DateTime::default())
+        .compression_method(compression_method);
    let name = "ota.x509.pem";
    writer.start_file(name, options).map_err(Error::ZipWrite)?;

@@ -93,10 +95,10 @@ pub fn create_zip(cert: &Certificate, flags: OtaCertBuildFlags) -> Result<Vec<u8
            modified.signature =
                BitString::from_bytes(&[]).expect("Empty ASN.1 bit string was invalid");
        }
-        if flags.contains(OtaCertBuildFlags::REMOVE_EXTENSIONS) {
-            if let Some(extensions) = &mut modified.tbs_certificate.extensions {
-                extensions.clear();
-            }
+        if flags.contains(OtaCertBuildFlags::REMOVE_EXTENSIONS)
+            && let Some(extensions) = &mut modified.tbs_certificate.extensions
+        {
+            extensions.clear();
        }
        if flags.contains(OtaCertBuildFlags::REMOVE_ISSUER) {
            modified.tbs_certificate.issuer.0.clear();
@@ -10,7 +10,7 @@ use std::{
 use memchr::memmem;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use thiserror::Error;
-use tracing::{debug, debug_span, trace, Span};
+use tracing::{Span, debug, debug_span, trace};
 use x509_cert::Certificate;
 use zip::ZipArchive;

@@ -190,23 +190,9 @@ pub fn patch_system_image(
        return Err(Error::OldZipNotFound);
    }

-    let update_ranges = if descriptor.hash_algorithm == "sha1" {
-        // Promote to a secure algorithm. SHA1 is allowed for verification only.
-        // The entire hash tree and FEC data will need to be recomputed.
-        let new_algorithm = "sha256".to_owned();
-
-        debug!(
-            "Changing insecure hash algorithm {} to {new_algorithm}",
-            descriptor.hash_algorithm,
-        );
-
-        descriptor.hash_algorithm = new_algorithm;
-        None
-    } else {
-        // Only need to update the hash tree and FEC data corresponding to the
-        // modified regions.
-        Some(modified_ranges.as_slice())
-    };
+    // Only need to update the hash tree and FEC data corresponding to the
+    // modified regions.
+    let update_ranges = Some(modified_ranges.as_slice());

    descriptor
        .update(input, output, update_ranges, cancel_signal)
@@ -1,3 +1,4 @@
+#![allow(clippy::all)]
 #![allow(clippy::nursery)]
 #![allow(clippy::pedantic)]

@@ -1,12 +1,12 @@
-// SPDX-FileCopyrightText: 2023 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    fs::File,
    io::{self, BufReader, BufWriter, Cursor, Read, Seek, SeekFrom, Write},
    sync::{
-        atomic::{AtomicBool, Ordering},
        Arc, Mutex, RwLock,
+        atomic::{AtomicBool, Ordering},
    },
 };

@@ -603,12 +603,14 @@ pub fn copy_n(
    copy_n_inspect(reader, writer, size, |_| {}, cancel_signal)
 }

-/// Copy data from `reader` to `writer` until `reader` reaches EOF. If `writer`
-/// reaches EOF before `reader` does, an error is returned. The operation is
-/// cancelled on the next loop iteration if `cancel_signal` is set to `true`.
-pub fn copy(
+/// Copy data from `reader` to `writer` until `reader` reaches EOF, invoking
+/// `inspect` after every buffer read iteration. If `writer` reaches EOF before
+/// `reader` does, an error is returned. The operation is cancelled on the next
+/// loop iteration if `cancel_signal` is set to `true`.
+pub fn copy_inspect(
    mut reader: impl Read,
    mut writer: impl Write,
+    mut inspect: impl FnMut(&[u8]),
    cancel_signal: &AtomicBool,
 ) -> io::Result<u64> {
    let mut buf = [0u8; 16384];
@@ -622,6 +624,8 @@ pub fn copy(
            break;
        }

+        inspect(&buf[..n]);
+
        writer.write_all(&buf[..n])?;

        copied += n as u64;
@@ -630,6 +634,11 @@ pub fn copy(
    Ok(copied)
 }

+/// Copy data from `reader` to `writer` until `reader` reaches EOF.
+pub fn copy(reader: impl Read, writer: impl Write, cancel_signal: &AtomicBool) -> io::Result<u64> {
+    copy_inspect(reader, writer, |_| {}, cancel_signal)
+}
+
 #[cfg(test)]
 mod tests {
    use std::{
@@ -822,21 +831,19 @@ mod tests {
        let mut reader = Cursor::new(b"foobar");
        let mut writer = Cursor::new([0u8; 6]);

-        super::copy_n_inspect(&mut reader, &mut writer, 6, |_| {}, &cancel_signal).unwrap();
+        super::copy_n(&mut reader, &mut writer, 6, &cancel_signal).unwrap();
        assert_eq!(writer.get_ref(), b"foobar");

        // Reader early EOF.
        reader.seek(SeekFrom::Start(3)).unwrap();
        writer.rewind().unwrap();
-        let err =
-            super::copy_n_inspect(&mut reader, &mut writer, 6, |_| {}, &cancel_signal).unwrap_err();
+        let err = super::copy_n(&mut reader, &mut writer, 6, &cancel_signal).unwrap_err();
        assert_eq!(err.kind(), io::ErrorKind::UnexpectedEof);

        // Writer early EOF.
        reader.rewind().unwrap();
        writer.seek(SeekFrom::Start(3)).unwrap();
-        let err =
-            super::copy_n_inspect(&mut reader, &mut writer, 6, |_| {}, &cancel_signal).unwrap_err();
+        let err = super::copy_n(&mut reader, &mut writer, 6, &cancel_signal).unwrap_err();
        assert_eq!(err.kind(), io::ErrorKind::WriteZero);

        reader.rewind().unwrap();
@@ -860,8 +867,7 @@ mod tests {
        reader.rewind().unwrap();
        writer.rewind().unwrap();
        cancel_signal.store(true, Ordering::SeqCst);
-        let err =
-            super::copy_n_inspect(&mut reader, &mut writer, 6, |_| {}, &cancel_signal).unwrap_err();
+        let err = super::copy_n(&mut reader, &mut writer, 6, &cancel_signal).unwrap_err();
        assert_eq!(err.kind(), io::ErrorKind::Interrupted);
        let err = super::copy(&mut reader, &mut writer, &cancel_signal).unwrap_err();
        assert_eq!(err.kind(), io::ErrorKind::Interrupted);
@@ -1,13 +1,14 @@
-// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    cmp::Ordering,
-    fmt, mem,
+    fmt::{self, Display},
+    mem,
    ops::{
        Bound, Range, RangeBounds, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
    },
-    path::Path,
+    path::{Component, Path, PathBuf},
 };

 use num_traits::{NumCast, PrimInt};
@@ -303,15 +304,76 @@ pub fn is_zero(mut buf: &[u8]) -> bool {
 /// Get the non-empty parent of a path. If the path has no parent in the string,
 /// then `.` is returned. This does not perform any filesystem operations.
 pub fn parent_path(path: &Path) -> &Path {
-    if let Some(parent) = path.parent() {
-        if !parent.as_os_str().is_empty() {
-            return parent;
-        }
+    if let Some(parent) = path.parent()
+        && !parent.as_os_str().is_empty()
+    {
+        return parent;
    }

    Path::new(".")
 }

+/// Path safety-related errors.
+#[derive(Clone, Debug, Error)]
+pub enum PathSafetyError {
+    #[error("Path contains multiple components: {0:?}")]
+    NotSingle(PathBuf),
+    #[error("Path contains '..': {0:?}")]
+    HasDotDot(PathBuf),
+}
+
+/// Join `parent` with `child`, disallowing unsafe child paths. Absolute child
+/// paths are converted into relative paths and `..` components result in an
+/// error.
+pub fn path_join(
+    parent: impl AsRef<Path>,
+    child: impl AsRef<Path>,
+) -> Result<PathBuf, PathSafetyError> {
+    fn inner(parent: &Path, child: &Path) -> Result<PathBuf, PathSafetyError> {
+        let mut result = parent.to_owned();
+
+        for component in child.components() {
+            match component {
+                // Make absolute paths relative.
+                Component::Prefix(_) | Component::RootDir | Component::CurDir => continue,
+                // Unsafe path. We block this even if it wouldn't escape the parent.
+                Component::ParentDir => {
+                    return Err(PathSafetyError::HasDotDot(child.to_path_buf()));
+                }
+                Component::Normal(os_str) => result.push(os_str),
+            }
+        }
+
+        Ok(result)
+    }
+
+    inner(parent.as_ref(), child.as_ref())
+}
+
+/// Ensure that the path has no directory components.
+pub fn path_ensure_single(name: impl AsRef<Path>) -> Result<(), PathSafetyError> {
+    fn inner(name: &Path) -> Result<(), PathSafetyError> {
+        // Path::file_name() already checks for `.` and `..`.
+        if name.file_name() != Some(name.as_os_str()) {
+            return Err(PathSafetyError::NotSingle(name.to_path_buf()));
+        }
+
+        Ok(())
+    }
+
+    inner(name.as_ref())
+}
+
+/// Like [`path_join`], but ensures that the child path contains no directory
+/// components with [`path_ensure_single`].
+pub fn path_join_single(
+    parent: impl AsRef<Path>,
+    child: impl AsRef<Path>,
+) -> Result<PathBuf, PathSafetyError> {
+    path_ensure_single(child.as_ref())?;
+    path_join(parent.as_ref(), child.as_ref())
+}
+
 /// Sort and merge overlapping intervals.
 pub fn merge_overlapping<T>(sections: &[Range<T>]) -> Vec<Range<T>>
 where
@@ -325,11 +387,11 @@ where
    for section in sections {
        if section.start >= section.end {
            continue;
-        } else if let Some(last) = result.last_mut() {
-            if section.start <= last.end {
-                last.end = last.end.max(section.end);
-                continue;
-            }
+        } else if let Some(last) = result.last_mut()
+            && section.start <= last.end
+        {
+            last.end = last.end.max(section.end);
+            continue;
        }

        result.push(section);
@@ -378,6 +440,30 @@ where
        .is_ok()
 }

+/// Join arbitrary displayable items with a separator.
+pub fn join(into_iter: impl IntoIterator<Item = impl Display>, sep: &str) -> String {
+    use std::fmt::Write;
+
+    let mut result = String::new();
+
+    for (i, item) in into_iter.into_iter().enumerate() {
+        if i > 0 {
+            result.push_str(sep);
+        }
+
+        write!(result, "{item}").expect("Failed to allocate");
+    }
+
+    result
+}
+
+/// Sort arbitrary sequence of sortable items.
+pub fn sort<T: Ord>(iter: impl Iterator<Item = T>) -> Vec<T> {
+    let mut items = iter.collect::<Vec<_>>();
+    items.sort();
+    items
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
@@ -37,8 +37,8 @@ allow = [
    "GPL-3.0",
    "ISC",
    "MIT",
-    "OpenSSL",
    "Unicode-3.0",
+    "Zlib",
 ]

 [[licenses.clarify]]
@@ -63,12 +63,14 @@ include-workspace = true
 bypass = [
    # Copies of unmodified crashwrangler objects for old macOS versions.
    { name = "honggfuzz", allow-globs = ["honggfuzz/third_party/mac/CrashReport_*.o"] },
+    # Only used in tests.
+    { name = "libloading", allow-globs = ["tests/nagisa*.dll"] },
 ]

 [sources]
 unknown-registry = "deny"
 unknown-git = "deny"
 allow-git = [
-    "https://github.com/chenxiaolong/zip",
-    "https://github.com/trifectatechfoundation/bzip2-rs",
+    "https://github.com/chenxiaolong/system-properties",
+    "https://github.com/chenxiaolong/zip2",
 ]
@@ -14,24 +14,23 @@ avbroot = { path = "../avbroot" }
 clap = { version = "4.4.1", features = ["derive"] }
 ctrlc = "3.4.0"
 hex = { version = "0.4.3", features = ["serde"] }
-ring = "0.17.0"
+ring = "0.17.14"
 rsa = { version = "0.9.6", features = ["hazmat"] }
 serde = { version = "1.0.188", features = ["derive"] }
 tempfile = "3.8.0"
-toml_edit = { version = "0.22.9", features = ["serde"] }
+toml_edit = { version = "0.23.3", features = ["serde"] }
 topological-sort = "0.2.2"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 x509-cert = "0.2.5"

-# https://github.com/zip-rs/zip/pull/383
+# https://github.com/zip-rs/zip2/pull/367
+# https://github.com/zip-rs/zip2/pull/368
+# For getting the data offset when writing new zip entries.
 [dependencies.zip]
-git = "https://github.com/chenxiaolong/zip"
-rev = "989101f9384b9e94e36e6e9e0f51908fdf98bde6"
+git = "https://github.com/chenxiaolong/zip2"
+rev = "59685f4dadbfee8cb3ea74c8fbb402b60d8137e8"
 default-features = false

-[features]
-static = ["avbroot/static"]
-
 [lints]
 workspace = true
@@ -12,8 +12,10 @@ security_patch_level = "2024-01-01"
 # Google Pixel 7 Pro
 # What's unique: init_boot (boot v4) + vendor_boot (vendor v4)

-[profile.pixel_v4_gki]
-vabc_algo = "Lz4"
+[profile.pixel_v4_gki.vabc]
+# CoW v3 is used starting with the Google Pixel 9a.
+version = "V3"
+algo = { kind = "Lz4" }

 [profile.pixel_v4_gki.partitions.boot]
 avb.signed = true
@@ -49,18 +51,19 @@ data.version = "vendor_v4"
 data.ramdisks = [["otacerts", "first_stage", "dsu_key_dir"]]

 [profile.pixel_v4_gki.hashes_streaming]
-original = "c00f891f941f3dddb28966f7b07f3acea773bee104dace82b37c2d1341f09422"
-patched = "ce9d8ee97828d233809742a5d3f23aa27b042675b1935ca9e3df0592c55788fd"
+original = "4e283ad1e3450795a32f46445bf626f6af983f52bd0a3484b49f8740c1029653"
+patched = "837861bf64e9387380e02d740b21c94e60c41bba4161d85ab44fc5ce86f19631"

 [profile.pixel_v4_gki.hashes_seekable]
-original = "96a6c366b5de1c3b10d4d6cb4ca503c83ac4cd9ca952a965cceb041990ba7022"
-patched = "e7b4609ba7a23609211dcae143bc43f091f286fbbb3a9301c02ee25614d35deb"
+original = "0ab2403a2634f00063c44f9a477a672205922ede189442e18850dd8efceb5d6f"
+patched = "2d94841c3be6cc1739f4c7ad5d9db048301b3f93f8ccd510e2c825bf13ecff90"

 # Google Pixel 6a
 # What's unique: boot (boot v4, no ramdisk) + vendor_boot (vendor v4, 2 ramdisks)

-[profile.pixel_v4_non_gki]
-vabc_algo = "Lz4"
+[profile.pixel_v4_non_gki.vabc]
+version = "V2"
+algo = { kind = "Lz4" }

 [profile.pixel_v4_non_gki.partitions.boot]
 avb.signed = true
@@ -90,18 +93,19 @@ data.version = "vendor_v4"
 data.ramdisks = [["init", "otacerts", "first_stage", "dsu_key_dir"], ["dlkm"]]

 [profile.pixel_v4_non_gki.hashes_streaming]
-original = "4d692bc777b568b0626d3c08d2e6f83f1b472db5ad903486daaec6a78d0cc26e"
-patched = "e27673e4f30933710c11d51f0e73849068cbe9bc9f54e6076bdd93f9a5c8ea0a"
+original = "c3a978b7225632875d3b1e87e852494b1a69019f5ba4099cf3981503623facca"
+patched = "cf0ef7429c4657875018d10d7302aaca371b21c5968af234aabd941304f0035b"

 [profile.pixel_v4_non_gki.hashes_seekable]
-original = "ea27ecd9718c17b63400b2548680bb3cee93ce63b4fc44ff9654ca0d9c5372a8"
-patched = "3456b14e014cf565a808a9e834d9105a23539f07b2c460db19c9384aadbc3b93"
+original = "cc11ee5a5be66bf34dcb6834a9a635016fa9f82dd0d9a2fb1029aa4f218d1d2e"
+patched = "e2fb7d3ce2c697372fb342ae5cd7bb606cd764f06a2aa8a2d6d7bd2c88456780"

 # Google Pixel 4a 5G
 # What's unique: boot (boot v3) + vendor_boot (vendor v3)

-[profile.pixel_v3]
-vabc_algo = "Lz4"
+[profile.pixel_v3.vabc]
+version = "V2"
+algo = { kind = "Gz" }

 [profile.pixel_v3.partitions.boot]
 avb.signed = true
@@ -132,19 +136,16 @@ data.version = "vendor_v3"
 data.ramdisks = [["otacerts", "first_stage", "dsu_key_dir"]]

 [profile.pixel_v3.hashes_streaming]
-original = "f432dc7931520feb238474aa707dd5299747562ffe6129f3f763b5f11ac473ab"
-patched = "3850a2e73bd783a1ec4a70c59f37d2374e017c20df7ab4b591182b14d187c18e"
+original = "d12d92c051bcc832cc9ceef1d46c415af80a09808a984db4c42a88d65d644a8b"
+patched = "408496eb2cca51c0563eceaa3a9def95a5c42acff938850a8577aaa047331284"

 [profile.pixel_v3.hashes_seekable]
-original = "7d29ecc6780953c22052a576b8dc85066c8667a875e918a786a08ff4545b47d1"
-patched = "9f6342940b7cfbeb27b0567f006bb35cbee910ef038ec535403c662d5252ca71"
+original = "63505cfd7c2c9d948a5ee150cf53f448f11c83cdce3919fd43231640bf002812"
+patched = "b246497de1588d41b919ba002b37dff13cb565682aa3e086e543b25ead7d7aaf"

 # Google Pixel 4a
 # What's unique: boot (boot v2)

-[profile.pixel_v2]
-vabc_algo = "Gzip"
-
 [profile.pixel_v2.partitions.boot]
 avb.signed = false
 data.type = "boot"
@@ -168,9 +169,9 @@ data.type = "vbmeta"
 data.deps = ["system"]

 [profile.pixel_v2.hashes_streaming]
-original = "1b45235b58054009cc496f6c3ee11d3dc16ed5c388c861761e26a6fce83103a0"
-patched = "193b2dc70dd465d686f35c7b7f74d2cc1b06a55e48cf5c2e4df0f667e03032fc"
+original = "c303728f4ee9c42ef990bb576bd0688635b263a67127d2a986caf574c9eedd63"
+patched = "e907db408767f81223e3ae53dd8a44c6f59f4702a016093cd6983499c9391ff0"

 [profile.pixel_v2.hashes_seekable]
-original = "52284308fae10cbaf09ade14e92f3bbe6149751a42bff15432982fcef8d890ab"
-patched = "7ad74ac87ddcaf34938017e6149a646041d70926e31ecda93e156e9397467b3b"
+original = "951b1f70bef7736b9e06f3215357fcebf8a4925872cd31691198fdda9d7c04ce"
+patched = "2b1bfe46f41942be88e09b40000745c68ed133900d7970f57d15019683a1ba87"
@@ -1,14 +1,14 @@
-// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{collections::BTreeMap, fs, path::Path};

 use anyhow::{Context, Result};
-use avbroot::format::payload::VabcAlgo;
+use avbroot::format::payload::{CowVersion, VabcAlgo};
 use serde::{Deserialize, Serialize};
 use toml_edit::DocumentMut;

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize)]
 pub struct Sha256Hash(
    #[serde(
        serialize_with = "hex::serialize",
@@ -17,7 +17,7 @@ pub struct Sha256Hash(
    pub [u8; 32],
 );

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct OtaInfo {
    pub device: String,
@@ -29,7 +29,7 @@ pub struct OtaInfo {
    pub security_patch_level: String,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Avb {
    pub signed: bool,
@@ -55,7 +55,7 @@ pub enum BootVersion {
    VendorV4,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct BootData {
    pub version: BootVersion,
@@ -71,19 +71,19 @@ pub enum DmVerityContent {
    SystemOtacerts,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct DmVerityData {
    pub content: DmVerityContent,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct VbmetaData {
    pub deps: Vec<String>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum Data {
    Boot(BootData),
@@ -91,30 +91,37 @@ pub enum Data {
    Vbmeta(VbmetaData),
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Hashes {
    pub original: Sha256Hash,
    pub patched: Sha256Hash,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Partition {
    pub avb: Avb,
    pub data: Data,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
+pub struct VabcSettings {
+    pub version: CowVersion,
+    pub algo: VabcAlgo,
+}
+
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Profile {
-    pub vabc_algo: Option<VabcAlgo>,
+    pub vabc: Option<VabcSettings>,
    pub partitions: BTreeMap<String, Partition>,
    pub hashes_streaming: Hashes,
    pub hashes_seekable: Hashes,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Clone, Serialize, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct Config {
    pub ota_info: OtaInfo,
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023-2024 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-FileCopyrightText: 2023 Pascal Roeleven
 // SPDX-License-Identifier: GPL-3.0-only

@@ -14,12 +14,12 @@ use std::{
    path::{Path, PathBuf},
    slice,
    sync::{
-        atomic::{AtomicBool, Ordering},
        Arc,
+        atomic::{AtomicBool, Ordering},
    },
 };

-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{Context, Result, anyhow, bail};
 use avbroot::{
    cli::ota::{ExtractCli, PatchCli, VerifyCli},
    crypto::{self, PassphraseSource, RsaSigningKey},
@@ -36,24 +36,26 @@ use avbroot::{
        cpio::{self, CpioEntry, CpioEntryData},
        ota::{self, SigningWriter, ZipEntry, ZipMode},
        padding,
-        payload::{self, PayloadHeader, PayloadWriter},
+        payload::{self, CowVersion, PayloadHeader, PayloadWriter, VabcParams},
+        zip::ZipWriterWrapper,
    },
    patch::otacert::{self, OtaCertBuildFlags},
    protobuf::{
-        build::tools::releasetools::{ota_metadata::OtaType, DeviceState, OtaMetadata},
+        build::tools::releasetools::{DeviceState, OtaMetadata, ota_metadata::OtaType},
        chromeos_update_engine::{
            DeltaArchiveManifest, DynamicPartitionGroup, DynamicPartitionMetadata, PartitionUpdate,
        },
    },
    stream::{self, CountingWriter, FromReader, HashingReader, PSeekFile, Reopen, ToWriter},
+    util,
 };
 use clap::Parser;
-use rsa::{rand_core::OsRng, traits::PublicKeyParts, BigUint};
+use rsa::{BigUint, rand_core::OsRng, traits::PublicKeyParts};
 use tempfile::TempDir;
 use topological_sort::TopologicalSort;
 use tracing::{info, info_span};
 use x509_cert::Certificate;
-use zip::{write::FileOptions, CompressionMethod, ZipWriter};
+use zip::{CompressionMethod, DateTime, ZipWriter, write::SimpleFileOptions};

 use crate::{
    cli::{Cli, Command, HelperCli, ListCli, PassSource, ProfileGroup, TestCli},
@@ -97,7 +99,7 @@ fn verify_hash(path: &Path, sha256: &[u8; 32], cancel_signal: &AtomicBool) -> Re
 fn append_avb(
    file: &mut PSeekFile,
    name: &str,
-    avb: &Avb,
+    avb: Avb,
    hash_tree: bool,
    ota_info: &OtaInfo,
    key_avb: &RsaSigningKey,
@@ -295,7 +297,7 @@ fn create_ramdisk(
 fn create_boot_image(
    file: &mut PSeekFile,
    name: &str,
-    avb: &Avb,
+    avb: Avb,
    boot_data: &BootData,
    ota_info: &OtaInfo,
    key_avb: &RsaSigningKey,
@@ -374,7 +376,7 @@ fn create_boot_image(
                        .ramdisks
                        .iter()
                        .map(|c_list| {
-                            if c_list.iter().any(|c| *c == RamdiskContent::Dlkm) {
+                            if c_list.contains(&RamdiskContent::Dlkm) {
                                RamdiskMeta {
                                    ramdisk_type: bootimage::VENDOR_RAMDISK_TYPE_DLKM,
                                    ramdisk_name: "dlkm".to_owned(),
@@ -422,8 +424,8 @@ fn create_boot_image(
 fn create_dm_verity_image(
    file: &mut PSeekFile,
    name: &str,
-    avb: &Avb,
-    dm_verity_data: &DmVerityData,
+    avb: Avb,
+    dm_verity_data: DmVerityData,
    ota_info: &OtaInfo,
    key_avb: &RsaSigningKey,
    cert_ota: &Certificate,
@@ -451,7 +453,7 @@ fn create_dm_verity_image(
 fn create_vbmeta_image(
    file: &mut PSeekFile,
    name: &str,
-    avb: &Avb,
+    avb: Avb,
    vbmeta_data: &VbmetaData,
    inputs: &BTreeMap<String, PSeekFile>,
    key: &RsaSigningKey,
@@ -537,7 +539,7 @@ fn create_partition_images(
                create_boot_image(
                    &mut file,
                    name,
-                    &partition.avb,
+                    partition.avb,
                    data,
                    ota_info,
                    key_avb,
@@ -550,8 +552,8 @@ fn create_partition_images(
                create_dm_verity_image(
                    &mut file,
                    name,
-                    &partition.avb,
-                    data,
+                    partition.avb,
+                    *data,
                    ota_info,
                    key_avb,
                    cert_ota,
@@ -560,7 +562,7 @@ fn create_partition_images(
                .with_context(|| format!("Failed to create dm-verity image: {name}"))?;
            }
            Data::Vbmeta(data) => {
-                create_vbmeta_image(&mut file, name, &partition.avb, data, &files, key_avb)
+                create_vbmeta_image(&mut file, name, partition.avb, data, &files, key_avb)
                    .with_context(|| format!("Failed to create vbmeta image: {name}"))?;
            }
        }
@@ -580,6 +582,8 @@ fn create_payload(
    key_ota: &RsaSigningKey,
    cancel_signal: &AtomicBool,
 ) -> Result<(String, u64)> {
+    const COMPRESSION_FACTOR: u32 = 64 * 1024;
+
    let dynamic_partitions_names = partitions
        .iter()
        .filter(|(_, p)| matches!(&p.data, Data::DmVerity(_)))
@@ -594,17 +598,23 @@ fn create_payload(
            .map(PSeekFile::new)
            .with_context(|| format!("Failed to create temp file for: {name}"))?;

-        let vabc_algo = if dynamic_partitions_names.contains(name) {
-            profile.vabc_algo
+        let vabc_params = if dynamic_partitions_names.contains(name) {
+            profile.vabc.map(|v| VabcParams {
+                version: v.version,
+                algo: v.algo,
+                compression_factor: COMPRESSION_FACTOR,
+            })
        } else {
            None
        };

        let (partition_info, operations, cow_estimate) =
-            payload::compress_image(file, &writer, name, 4096, vabc_algo, cancel_signal)?;
+            payload::compress_image(file, &writer, name, 4096, vabc_params, cancel_signal)?;

        compressed.insert(name, writer);

+        let is_v3 = profile.vabc.is_some_and(|e| e.version == CowVersion::V3);
+
        payload_partitions.push(PartitionUpdate {
            partition_name: name.clone(),
            run_postinstall: None,
@@ -624,8 +634,8 @@ fn create_payload(
            fec_roots: None,
            version: None,
            merge_operations: vec![],
-            estimate_cow_size: cow_estimate,
-            estimate_op_count_max: None,
+            estimate_cow_size: cow_estimate.map(|e| e.size),
+            estimate_op_count_max: cow_estimate.and_then(|e| is_v3.then_some(e.num_ops)),
        });
    }

@@ -645,11 +655,16 @@ fn create_payload(
                    partition_names: dynamic_partitions_names,
                }],
                snapshot_enabled: Some(true),
-                vabc_enabled: Some(true),
-                vabc_compression_param: profile.vabc_algo.map(|a| a.to_string()),
-                cow_version: Some(2),
+                // Everything below is meant to be unset if VABC is not
+                // supported.
+                vabc_enabled: profile.vabc.map(|_| true),
+                vabc_compression_param: profile.vabc.map(|v| v.algo.to_string()),
+                cow_version: profile.vabc.map(|v| match v.version {
+                    CowVersion::V2 => 2,
+                    CowVersion::V3 => 3,
+                }),
                vabc_feature_set: None,
-                compression_factor: None,
+                compression_factor: profile.vabc.map(|_| COMPRESSION_FACTOR.into()),
            }),
            partial_update: None,
            apex_info: vec![],
@@ -728,14 +743,15 @@ fn create_ota(
    let mut zip_writer = match zip_mode {
        ZipMode::Streaming => {
            let signing_writer = SigningWriter::new_streaming(raw_writer);
-            ZipWriter::new_streaming(signing_writer)
+            ZipWriterWrapper::new_streaming(signing_writer)
        }
        ZipMode::Seekable => {
            let signing_writer = SigningWriter::new_seekable(raw_writer);
-            ZipWriter::new(signing_writer)
+            ZipWriterWrapper::new_seekable(signing_writer)
        }
    };
-    let options = FileOptions::default()
+    let options = SimpleFileOptions::default()
+        .last_modified_time(DateTime::default())
        .compression_method(CompressionMethod::Stored)
        .large_file(false);

@@ -745,12 +761,9 @@ fn create_ota(

    for path in [ota::PATH_OTACERT, ota::PATH_PAYLOAD, ota::PATH_PROPERTIES] {
        // All remaining entries are written immediately.
-        zip_writer
-            .start_file_with_extra_data(path, options)
-            .with_context(|| format!("Failed to begin new zip entry: {path}"))?;
        let offset = zip_writer
-            .end_extra_data()
-            .with_context(|| format!("Failed to end new zip entry: {path}"))?;
+            .start_file(path, options)
+            .with_context(|| format!("Failed to begin new zip entry: {path}"))?;
        let mut writer = CountingWriter::new(&mut zip_writer);

        match path {
@@ -785,7 +798,7 @@ fn create_ota(
        let size = writer.stream_position()?;

        entries.push(ZipEntry {
-            name: path.to_owned(),
+            path: path.to_owned(),
            offset,
            size,
        });
@@ -851,6 +864,7 @@ fn create_fake_magisk(output: &Path) -> Result<()> {
    let raw_writer =
        File::create(output).with_context(|| format!("Failed to open for writing: {output:?}"))?;
    let mut zip_writer = ZipWriter::new(raw_writer);
+    let options = SimpleFileOptions::default().last_modified_time(DateTime::default());

    for path in [
        "assets/stub.apk",
@@ -867,12 +881,12 @@ fn create_fake_magisk(output: &Path) -> Result<()> {
        "lib/x86_64/libmagisk64.so",
        "lib/x86_64/libmagiskinit.so",
    ] {
-        zip_writer.start_file(path, FileOptions::default())?;
+        zip_writer.start_file(path, options)?;
        write!(zip_writer, "dummy contents for {path}")?;
    }

    // avbroot looks for the version number in this file.
-    zip_writer.start_file("assets/util_functions.sh", FileOptions::default())?;
+    zip_writer.start_file("assets/util_functions.sh", options)?;
    zip_writer.write_all(b"MAGISK_VER_CODE=27000\n")?;

    Ok(())
@@ -1127,7 +1141,7 @@ fn clean_boot_image_certs(path: &Path, cancel_signal: &AtomicBool) -> Result<()>
        .iter_mut()
        .find(|e| e.path == b"system/etc/security/otacerts.zip")
    {
-        let mut zip_writer = ZipWriter::new(Cursor::new(Vec::new()));
+        let zip_writer = ZipWriter::new(Cursor::new(Vec::new()));
        let empty_zip = zip_writer.finish()?.into_inner();

        entry.data = CpioEntryData::Data(empty_zip);
@@ -1189,6 +1203,7 @@ fn test_subcommand(cli: &TestCli, cancel_signal: &AtomicBool) -> Result<()> {
        Some(_) => None,
        None => Some(TempDir::new().context("Failed to create temp directory")?),
    };
+    #[allow(clippy::option_if_let_else)]
    let work_dir = match &cli.config.work_dir {
        Some(w) => w.as_path(),
        None => work_temp_dir.as_ref().unwrap().path(),
@@ -1208,10 +1223,6 @@ fn test_subcommand(cli: &TestCli, cancel_signal: &AtomicBool) -> Result<()> {
    ];

    for name in profiles {
-        if Path::new(name).file_name() != Some(OsStr::new(name)) {
-            bail!("Unsafe profile name: {name}");
-        }
-
        let profile = &config.profile[name];

        for (zip_mode, hashes) in [
@@ -1220,8 +1231,9 @@ fn test_subcommand(cli: &TestCli, cancel_signal: &AtomicBool) -> Result<()> {
        ] {
            let _span = info_span!("profile", name, %zip_mode).entered();

-            // Can't used NamedTempFile because avbroot does atomic replaces.
-            let profile_dir = work_dir.join(name);
+            // Can't use NamedTempFile because avbroot does atomic replaces.
+            let mut profile_dir = util::path_join_single(work_dir, name)?;
+            profile_dir.push(zip_mode.to_string());
            let out_original = profile_dir.join("ota.zip");
            let out_magisk = profile_dir.join("ota_magisk.zip");
            let out_prepatched = profile_dir.join("ota_prepatched.zip");
@@ -1324,7 +1336,7 @@ fn helper_mode() -> Result<()> {
    let cli = HelperCli::parse();

    let private_key_path = {
-        let parent = cli.public_key.parent().unwrap_or(Path::new("."));
+        let parent = cli.public_key.parent().unwrap_or_else(|| Path::new("."));
        let name = cli
            .public_key
            .file_name()
@@ -1398,7 +1410,10 @@ fn main() -> Result<()> {
    if env::var_os(ENV_HELPER_MODE).is_some() {
        return helper_mode();
    }
-    env::set_var(ENV_HELPER_MODE, "true");
+    // SAFETY: No multithreading at this point.
+    unsafe {
+        env::set_var(ENV_HELPER_MODE, "true");
+    }

    // Set up a cancel signal so we can properly clean up any temporary files.
    let cancel_signal = Arc::new(AtomicBool::new(false));
@@ -12,7 +12,7 @@ publish = false
 anyhow = "1.0.75"
 clap = { version = "4.4.1", features = ["derive"] }
 regex = { version = "1.9.4", default-features = false, features = ["perf", "std"] }
-toml_edit = "0.22.9"
+toml_edit = "0.23.3"

 [lints]
 workspace = true
@@ -1,15 +1,15 @@
-// SPDX-FileCopyrightText: 2023 Andrew Gunnerson
+// SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
 // SPDX-License-Identifier: GPL-3.0-only

 use std::{
    collections::BTreeMap,
-    fmt,
+    fmt::{self, Write as _},
    fs::{self, File},
    io::{BufRead, BufReader},
    path::Path,
 };

-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use regex::Regex;

 use crate::WORKSPACE_DIR;
@@ -108,7 +108,7 @@ fn update_changelog_links(path: &Path, base_url: &str) -> Result<()> {
    }

    for (link_ref, link) in links {
-        result.push_str(&format!("{link_ref}: {link}\n"));
+        let _ = writeln!(result, "{link_ref}: {link}");
    }

    fs::write(path, result)?;
@@ -7,9 +7,9 @@ use std::{
    path::Path,
 };

-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
-use toml_edit::{value, DocumentMut};
+use toml_edit::{DocumentMut, value};

 use crate::WORKSPACE_DIR;