commit 2616b964950b591d92247b3e11f7a97e7396c936
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 23 22:07:56 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 23 22:07:56 2018 +0000
tree ca0c201cb0a45dfbf13a42310102f5d9c8873a9f
parent ac023c95f53bcda0d69503c181fcd7da32feb294
parent 39a28bd4ba894920d0e5602526c2622cbe7b4f83

Merge "Check Signing Block size and alignment requirements"

src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java

diff --git a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
index 2330f6d..c9cc4c1 100644
--- a/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
+++ b/src/main/java/com/android/apksig/internal/apk/ApkSigningBlockUtils.java
@@ -178,6 +178,22 @@
                             beforeApkSigningBlock,
                             centralDir,
                             new ByteBufferDataSource(modifiedEocd));
+            // Special checks for the verity algorithm requirements.
+            if (actualContentDigests.containsKey(ContentDigestAlgorithm.VERITY_CHUNKED_SHA256)) {
+                if ((beforeApkSigningBlock.size() % ANDROID_COMMON_PAGE_ALIGNMENT_BYTES != 0)) {
+                    throw new RuntimeException(
+                            "APK Signing Block is not aligned on 4k boundary: " +
+                            beforeApkSigningBlock.size());
+                }
+
+                long centralDirOffset = ZipUtils.getZipEocdCentralDirectoryOffset(eocd);
+                long signingBlockSize = centralDirOffset - beforeApkSigningBlock.size();
+                if (signingBlockSize % ANDROID_COMMON_PAGE_ALIGNMENT_BYTES != 0) {
+                    throw new RuntimeException(
+                            "APK Signing Block size is not multiple of page size: " +
+                            signingBlockSize);
+                }
+            }
         } catch (DigestException e) {
             throw new RuntimeException("Failed to compute content digests", e);
         }