diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2022-09-09 18:58:54 +0100 |
|---|---|---|
| committer | Ivan Gavrilovic <gavra@google.com> | 2022-09-09 19:15:07 +0100 |
| commit | 3a417211e8f11480be69b714309c1576d3082489 (patch) | |
| tree | 9e31880da55d7e9cc5b405cab5c2112d8cc452d1 | |
| parent | 7bcb75c2f9111d63ea37c0fd5ac924dda0d2afa9 (diff) | |
| download | apksig-3a417211e8f11480be69b714309c1576d3082489.tar.gz | |
Add missing apksig dependenices and clean up codestudio-2022.3.1-rc1studio-2022.3.1-canary8studio-2022.3.1-canary1studio-2022.3.1-beta2studio-2022.3.1studio-main
Add missing bouncycastle and conscrypt test dependencies
and remove google3 specific code.
Bug: 173422058
Test: bazel test ...
Change-Id: Ia15c9a830cde13eebe30893e904677fa5aab5a3c
| -rw-r--r-- | BUILD | 4 | ||||
| -rw-r--r-- | src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -2,7 +2,7 @@ licenses(["notice"]) # Apache License 2.0 -load("//tools/base/bazel:coverage.bzl", "coverage_java_test", "coverage_java_library") +load("//tools/base/bazel:coverage.bzl", "coverage_java_library", "coverage_java_test") # Public API of the apksig library coverage_java_library( @@ -69,5 +69,7 @@ coverage_java_test( deps = [ ":apksig-all", "@maven//:junit.junit", + "@maven//:org.bouncycastle.bcprov-jdk15on", + "@maven//:org.conscrypt.conscrypt-openjdk-uber", ], ) diff --git a/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java b/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java index e335873..0ebef0e 100644 --- a/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java +++ b/src/main/java/com/android/apksig/internal/apk/v1/V1SchemeVerifier.java @@ -52,8 +52,6 @@ import com.android.apksig.util.DataSinks; import com.android.apksig.util.DataSource; import com.android.apksig.zip.ZipFormatException; -import com.google.security.annotations.SuppressInsecureCipherModeCheckerReviewed; - import java.io.IOException; import java.nio.ByteBuffer; import java.security.InvalidKeyException; @@ -592,7 +590,6 @@ public abstract class V1SchemeVerifier { * Returns the signing certificate if the provided {@link SignerInfo} verifies against the * contents of the provided signature file, or {@code null} if it does not verify. */ - @SuppressInsecureCipherModeCheckerReviewed private X509Certificate verifySignerInfoAgainstSigFile( SignedData signedData, Collection<X509Certificate> signedDataCertificates, |