Add missing apksig dependenices and clean up code
Add missing bouncycastle and conscrypt test dependencies
and remove google3 specific code.
Bug: 173422058
Test: bazel test ...
Change-Id: Ia15c9a830cde13eebe30893e904677fa5aab5a3c
diff --git a/BUILD b/BUILD
index e5f0b80..7be1088 100644
--- a/BUILD
+++ b/BUILD
@@ -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 @@
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.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 @@
* 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,
