Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ea4035b authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ie35b54a6475dc811b684714d32c5e1bf2050132f
parents 869a79b1 a54768b0

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public class ApkSignatureSchemeV2Verifier { 
        if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) {

            byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256);

            verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength(

                    verityDigest, apk.length(), signatureInfo);

                    verityDigest, apk.getChannel().size(), signatureInfo);

        }



        byte[] digest = pickBestDigestForV4(contentDigests);

core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class ApkSignatureSchemeV3Verifier { 
        if (contentDigests.containsKey(CONTENT_DIGEST_VERITY_CHUNKED_SHA256)) {

            byte[] verityDigest = contentDigests.get(CONTENT_DIGEST_VERITY_CHUNKED_SHA256);

            result.verityRootHash = ApkSigningBlockUtils.parseVerityDigestAndVerifySourceLength(

                    verityDigest, apk.length(), signatureInfo);

                    verityDigest, apk.getChannel().size(), signatureInfo);

        }



        result.digest = pickBestDigestForV4(contentDigests);

core/java/android/util/apk/ApkSigningBlockUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ final class ApkSigningBlockUtils { 
            SignatureInfo signatureInfo) throws SecurityException {

        try {

            byte[] expectedRootHash = parseVerityDigestAndVerifySourceLength(expectedDigest,

                    apk.length(), signatureInfo);

                    apk.getChannel().size(), signatureInfo);

            VerityBuilder.VerityResult verity = VerityBuilder.generateApkVerityTree(apk,

                    signatureInfo, new ByteBufferFactory() {

                        @Override

core/java/android/util/apk/VerityBuilder.java

+4 −4
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public abstract class VerityBuilder { 
            throws IOException, SecurityException, NoSuchAlgorithmException, DigestException {

        long signingBlockSize =

                signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset;

        long dataSize = apk.length() - signingBlockSize;

        long dataSize = apk.getChannel().size() - signingBlockSize;

        int[] levelOffset = calculateVerityLevelOffset(dataSize);

        int merkleTreeSize = levelOffset[levelOffset.length - 1];
@@ -108,7 +108,7 @@ public abstract class VerityBuilder { 
            @NonNull SignatureInfo signatureInfo, @NonNull ByteBuffer footerOutput)

            throws IOException {

        footerOutput.order(ByteOrder.LITTLE_ENDIAN);

        generateApkVerityHeader(footerOutput, apk.length(), DEFAULT_SALT);

        generateApkVerityHeader(footerOutput, apk.getChannel().size(), DEFAULT_SALT);

        long signingBlockSize =

                signatureInfo.centralDirOffset - signatureInfo.apkSigningBlockOffset;

        generateApkVerityExtensions(footerOutput, signatureInfo.apkSigningBlockOffset,
@@ -310,11 +310,11 @@ public abstract class VerityBuilder { 
                eocdCdOffsetFieldPosition + ZIP_EOCD_CENTRAL_DIR_OFFSET_FIELD_SIZE;

        consumeByChunk(digester,

                new MemoryMappedFileDataSource(apk.getFD(), offsetAfterEocdCdOffsetField,

                    apk.length() - offsetAfterEocdCdOffsetField),

                    apk.getChannel().size() - offsetAfterEocdCdOffsetField),

                MMAP_REGION_SIZE_BYTES);



        // 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) {

            digester.consume(ByteBuffer.allocate(CHUNK_SIZE_BYTES - lastIncompleteChunkSize));

        }