25195132a85c94debfa34e263364dc8d8bd4d1ac - platform/frameworks/base

commit	25195132a85c94debfa34e263364dc8d8bd4d1ac	[log] [tgz]
author	Victor Hsieh <victorhsieh@google.com>	Thu Sep 06 16:32:06 2018 -0700
committer	Victor Hsieh <victorhsieh@google.com>	Thu Sep 13 14:00:35 2018 -0700
tree	5cd0026315bb43973f30d44fbfbf42df84d805d1
parent	59c1d01b857bb72bb1a36f11137d0029929795b2 [diff]

Refactor: break fs-verity data gen into 2 parts

Break fs-verity generation method into Merkle tree generation and
fs-verity footer (was called header + extension) generation.  This makes
them easier to reuse later.

Also:
 * Add some null-ness annotations.
 * Move generateApkVerity from ApkSigningBlockUtils to ApkVerityBuilder,
   since it's more related to verity but not APK signing format.
 * Rename some of "fs-verity" to "apk-verity" to disambiguate between
   our experimental implementation (deprecated) and upstream.

Test: atest PtsApkVerityTestCases
Bug: 112037636

Change-Id: I0d70121071a3e78f80ae059a60e193afbadea337

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java[diff]
core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java[diff]
core/java/android/util/apk/ApkSignatureVerifier.java[diff]
core/java/android/util/apk/ApkSigningBlockUtils.java[diff]
core/java/android/util/apk/ApkVerityBuilder.java[diff]
services/core/java/com/android/server/security/VerityUtils.java[diff]

6 files changed

tree: 5cd0026315bb43973f30d44fbfbf42df84d805d1