Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "APK signature verification: use FileChannel#size" am: a54768b010

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782428

Change-Id: Ie35b54a6475dc811b684714d32c5e1bf2050132f
This commit is contained in:
Jooyung Han
2021-08-03 00:35:21 +00:00
committed by Automerger Merge Worker
parent 869a79b105 a54768b010
commit 3ea4035bf1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
View File

@@ -210,7 +210,7 @@ public class ApkSignatureSchemeV2Verifier {
if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) { if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) {
byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256); byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256);
verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength( verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength(
verityDigest, apk.length(), signatureInfo); verityDigest, apk.getChannel().size(), signatureInfo);
} }
byte[] digest = pickBestDigestForV4(contentDigests); byte[] digest = pickBestDigestForV4(contentDigests);

2
core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java
View File

@@ -209,7 +209,7 @@ public class ApkSignatureSchemeV3Verifier {
if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) { if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) {
byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256); byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256);
result.verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength( result.verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength(
verityDigest, apk.length(), signatureInfo); verityDigest, apk.getChannel().size(), signatureInfo);
} }
result.digest = pickBestDigestForV4(contentDigests); result.digest = pickBestDigestForV4(contentDigests);

2
core/java/android/util/apk/ApkSigningBlockUtils.java
View File

@@ -349,7 +349,7 @@ final class ApkSigningBlockUtils {
SignatureInfo signatureInfo) throws SecurityException { SignatureInfo signatureInfo) throws SecurityException {
try { try {
byte[] expectedRootHash = parseVerityDigestAndVerifySourceLength(expectedDigest, byte[] expectedRootHash = parseVerityDigestAndVerifySourceLength(expectedDigest,
apk.length(), signatureInfo); apk.getChannel().size(), signatureInfo);
VerityBuilder.VerityResult verity = VerityBuilder.generateApkVerityTree(apk, VerityBuilder.VerityResult verity = VerityBuilder.generateApkVerityTree(apk,
signatureInfo, new ByteBufferFactory() { signatureInfo, new ByteBufferFactory() {
@Override @Override

8
core/java/android/util/apk/VerityBuilder.java
View File

@@ -90,7 +90,7 @@ public abstract class VerityBuilder {
throws IOException, SecurityException, NoSuchAlgorithmException, DigestException { throws IOException, SecurityException, NoSuchAlgorithmException, DigestException {
long signingBlockSize = long signingBlockSize =
signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset; signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset;
long dataSize = apk.length() - signingBlockSize; long dataSize = apk.getChannel().size() - signingBlockSize;
int[] levelOffset = calculateVerityLevelOffset(dataSize); int[] levelOffset = calculateVerityLevelOffset(dataSize);
int merkleTreeSize = levelOffset[levelOffset.length - 1]; int merkleTreeSize = levelOffset[levelOffset.length - 1];
@@ -108,7 +108,7 @@ public abstract class VerityBuilder {
@NonNull SignatureInfo signatureInfo, @NonNull ByteBuffer footerOutput) @NonNull SignatureInfo signatureInfo, @NonNull ByteBuffer footerOutput)
throws IOException { throws IOException {
footerOutput.order(ByteOrder.LITTLE_ENDIAN); footerOutput.order(ByteOrder.LITTLE_ENDIAN);
generateApkVerityHeader(footerOutput, apk.length(), DEFAULT_SALT); generateApkVerityHeader(footerOutput, apk.getChannel().size(), DEFAULT_SALT);
long signingBlockSize = long signingBlockSize =
signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset; signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset;
generateApkVerityExtensions(footerOutput, signatureInfo.apkSigningBlockOffset, generateApkVerityExtensions(footerOutput, signatureInfo.apkSigningBlockOffset,
@@ -310,11 +310,11 @@ public abstract class VerityBuilder {
eocdCdOffsetFieldPosition + ZIP_EOCD_CENTRAL_DIR_OFFSET_FIELD_SIZE; eocdCdOffsetFieldPosition + ZIP_EOCD_CENTRAL_DIR_OFFSET_FIELD_SIZE;
consumeByChunk(digester, consumeByChunk(digester,
new MemoryMappedFileDataSource(apk.getFD(), offsetAfterEocdCdOffsetField, new MemoryMappedFileDataSource(apk.getFD(), offsetAfterEocdCdOffsetField,
apk.length() - offsetAfterEocdCdOffsetField), apk.getChannel().size() - offsetAfterEocdCdOffsetField),
MMAP_REGION_SIZE_BYTES); MMAP_REGION_SIZE_BYTES);
// 5. Pad 0s up to the nearest 4096-byte block before hashing. // 5. Pad 0s up to the nearest 4096-byte block before hashing.
int lastIncompleteChunkSize = (int) (apk.length() % CHUNK_SIZE_BYTES); int lastIncompleteChunkSize = (int) (apk.getChannel().size() % CHUNK_SIZE_BYTES);
if (lastIncompleteChunkSize != 0) { if (lastIncompleteChunkSize != 0) {
digester.consume(ByteBuffer.allocate(CHUNK_SIZE_BYTES - lastIncompleteChunkSize)); digester.consume(ByteBuffer.allocate(CHUNK_SIZE_BYTES - lastIncompleteChunkSize));
} }