update tests

obfusk · Dec 27, 2024 · 145c8df · 145c8df
1 parent 8f5499c
commit 145c8df
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/test/test-compare-self.out b/test/test-compare-self.out
@@ -343,7 +343,8 @@ apksigcopier: success
 
 apks/apks/v1-only-11-signers.apk
 apksigner: verified
-apksigcopier: success
+Error: Invalid v1_sig: too many signers.
+apksigcopier: failure
 
 apks/apks/v1-only-max-sized-eocd-comment.apk
 apksigner: verified

diff --git a/test/test-compare-self.out.build-tools.patch b/test/test-compare-self.out.build-tools.patch
@@ -1,16 +1,17 @@
 --- a/test/test-compare-self.out
 +++ b/test/test-compare-self.out
-@@ -342,8 +342,7 @@ apksigner: verified
+@@ -342,9 +342,7 @@ apksigner: verified
  apksigcopier: success
 
  apks/apks/v1-only-11-signers.apk
 -apksigner: verified
--apksigcopier: success
+-Error: Invalid v1_sig: too many signers.
+-apksigcopier: failure
 +apksigner: not verified
 
  apks/apks/v1-only-max-sized-eocd-comment.apk
  apksigner: verified
-@@ -997,8 +996,7 @@ apksigner: verified
+@@ -998,8 +996,7 @@ apksigner: verified
  apksigcopier: success
 
  apks/apks/v2-only-11-signers.apk
@@ -20,7 +21,7 @@
 
  apks/apks/v2-only-apk-sig-block-size-mismatch.apk
  apksigner: not verified
-@@ -1371,8 +1369,7 @@ apks/apks/v31-2elem-lineage-incorrect-digest.apk
+@@ -1372,8 +1369,7 @@ apks/apks/v31-2elem-lineage-incorrect-digest.apk
  apksigner: not verified
 
  apks/apks/v31-block-stripped-v3-attr-value-33.apk
@@ -30,7 +31,7 @@
 
  apks/apks/v31-ec-p256-2-tgt-33-1-tgt-28-targetSdk-30.apk
  apksigner: verified
-@@ -1406,8 +1403,7 @@ apks/apks/v31-tgt-33-no-v3-block.apk
+@@ -1407,8 +1403,7 @@ apks/apks/v31-tgt-33-no-v3-block.apk
  apksigner: not verified
 
  apks/apks/v31-tgt-34-v3-attr-value-33.apk

diff --git a/test/test-compare-self.out.legacy.patch b/test/test-compare-self.out.legacy.patch
@@ -11,7 +11,17 @@
 
  apks/apks/original-minSdk32.apk
  apksigner: verified
-@@ -352,10 +352,12 @@ apksigcopier: failure
+@@ -343,8 +343,7 @@ apksigcopier: success
+
+ apks/apks/v1-only-11-signers.apk
+ apksigner: verified
+-Error: Invalid v1_sig: too many signers.
+-apksigcopier: failure
++apksigcopier: success
+
+ apks/apks/v1-only-max-sized-eocd-comment.apk
+ apksigner: verified
+@@ -353,10 +352,12 @@ apksigcopier: failure
 
  apks/apks/v1-only-no-uses-sdk.apk
  apksigner: verified
@@ -24,15 +34,15 @@
  apksigcopier: success
 
  apks/apks/v1-only-targetSandboxVersion-2.apk
-@@ -363,6 +365,7 @@ apksigner: not verified
+@@ -364,6 +365,7 @@ apksigner: not verified
 
  apks/apks/v1-only-two-signers.apk
  apksigner: verified
 +Warning: SHA-256 mismatch: expected 'f753f6d42052d12997e3650750e9d96f4a45b3cf31e650ec3c90ba6375233162', actual '5cc0bb9924ccc86544cbbd61b46388070e06fd362565aa7a9fc25b1f21c4691f'.
  apksigcopier: success
 
  apks/apks/v1-only-with-cr-in-entry-name.apk
-@@ -370,74 +373,92 @@ apksigner: not verified
+@@ -371,74 +373,92 @@ apksigner: not verified
 
  apks/apks/v1-only-with-dsa-sha1-1.2.840.10040.4.1-1024.apk
  apksigner: verified
@@ -125,7 +135,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-dsa-sha384-2.16.840.1.101.3.4.3.3-1024.apk
-@@ -460,122 +481,152 @@ apksigner: not verified
+@@ -461,122 +481,152 @@ apksigner: not verified
 
  apks/apks/v1-only-with-ecdsa-sha1-1.2.840.10045.2.1-p256.apk
  apksigner: verified
@@ -278,7 +288,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-lf-in-entry-name.apk
-@@ -583,18 +634,24 @@ apksigner: not verified
+@@ -584,18 +634,24 @@ apksigner: not verified
 
  apks/apks/v1-only-with-nul-in-entry-name.apk
  apksigner: verified
@@ -304,7 +314,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-2048.apk
-@@ -603,26 +660,32 @@ apksigcopier: success
+@@ -604,26 +660,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-md5-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified
@@ -337,7 +347,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-md5-1.2.840.113549.1.1.4-1024.apk
-@@ -651,26 +714,32 @@ apksigcopier: success
+@@ -652,26 +714,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha1-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified
@@ -370,7 +380,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha1-1.2.840.113549.1.1.5-1024.apk
-@@ -699,26 +768,32 @@ apksigcopier: success
+@@ -700,26 +768,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha224-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified
@@ -403,7 +413,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha224-1.2.840.113549.1.1.14-1024.apk
-@@ -747,26 +822,32 @@ apksigcopier: success
+@@ -748,26 +822,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha256-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified
@@ -436,7 +446,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha256-1.2.840.113549.1.1.11-1024.apk
-@@ -795,26 +876,32 @@ apksigcopier: success
+@@ -796,26 +876,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha384-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified
@@ -469,7 +479,7 @@
  apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha384-1.2.840.113549.1.1.12-1024.apk
-@@ -843,26 +930,32 @@ apksigcopier: success
+@@ -844,26 +930,32 @@ apksigcopier: success
 
  apks/apks/v1-only-with-rsa-pkcs1-sha512-1.2.840.113549.1.1.1-1024.apk
  apksigner: verified