diff options
| author | Khaled Abdelmohsen <khelmy@google.com> | 2020-07-07 13:10:49 +0100 |
|---|---|---|
| committer | Michael Groover <mpgroover@google.com> | 2020-09-24 19:47:53 -0700 |
| commit | 9f0e49e0a57bd1c12a86b6dca47b6ee9378d6cbe (patch) | |
| tree | 9e7a90c19dcae6ec474ebfbe8183cdac3d5e798c | |
| parent | 49f89a1c2f074261b70346d6c68be5952f0d7349 (diff) | |
| download | apksig-9f0e49e0a57bd1c12a86b6dca47b6ee9378d6cbe.tar.gz | |
Stamp refactorings
Bug: 169094510
Test: N/A
Change-Id: Ib04f1852c8acea6c013402facbc73b1325e026d1
Merged-In: Ib04f1852c8acea6c013402facbc73b1325e026d1
| -rw-r--r-- | src/main/java/com/android/apksig/internal/apk/stamp/SourceStampVerifier.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/android/apksig/internal/apk/stamp/V2SourceStampSigner.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/com/android/apksig/internal/apk/stamp/SourceStampVerifier.java b/src/main/java/com/android/apksig/internal/apk/stamp/SourceStampVerifier.java index 2f4c3ba..ddae129 100644 --- a/src/main/java/com/android/apksig/internal/apk/stamp/SourceStampVerifier.java +++ b/src/main/java/com/android/apksig/internal/apk/stamp/SourceStampVerifier.java @@ -138,7 +138,7 @@ class SourceStampVerifier { sourceStampCertificate, signedSignatureSchemeData.get(signatureSchemeApkDigest.getKey()), result); - if (result.containsWarnings() || result.containsWarnings()) { + if (result.containsWarnings() || result.containsErrors()) { return; } } diff --git a/src/main/java/com/android/apksig/internal/apk/stamp/V2SourceStampSigner.java b/src/main/java/com/android/apksig/internal/apk/stamp/V2SourceStampSigner.java index 16062bf..0d37d81 100644 --- a/src/main/java/com/android/apksig/internal/apk/stamp/V2SourceStampSigner.java +++ b/src/main/java/com/android/apksig/internal/apk/stamp/V2SourceStampSigner.java @@ -33,6 +33,7 @@ import java.security.NoSuchAlgorithmException; import java.security.SignatureException; import java.security.cert.CertificateEncodingException; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -81,7 +82,7 @@ public abstract class V2SourceStampSigner { signatureSchemeDigestInfos, sourceStampSignerConfig, signatureSchemeDigests); - signatureSchemeDigests.sort(Comparator.comparing(Pair::getFirst)); + Collections.sort(signatureSchemeDigests, Comparator.comparing(Pair::getFirst)); SourceStampBlock sourceStampBlock = new SourceStampBlock(); @@ -130,7 +131,7 @@ public abstract class V2SourceStampSigner { for (Map.Entry<ContentDigestAlgorithm, byte[]> digest : digestInfo.entrySet()) { digests.add(Pair.of(digest.getKey().getId(), digest.getValue())); } - digests.sort(Comparator.comparing(Pair::getFirst)); + Collections.sort(digests, Comparator.comparing(Pair::getFirst)); // FORMAT: // * length-prefixed sequence of length-prefixed digests: |