diff --git a/app/build.gradle b/app/build.gradle
index d3f3af418..f529d33f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -218,8 +218,6 @@ android {
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
exclude 'META-INF/proguard/androidx-annotations.pro'
- exclude '/org/spongycastle/x509/CertPathReviewerMessages.properties'
- exclude '/org/spongycastle/x509/CertPathReviewerMessages_de.properties'
}
buildTypes {
@@ -237,7 +235,6 @@ android {
'proguard/proguard-appcompat-v7.pro',
'proguard/proguard-square-okhttp.pro',
'proguard/proguard-square-okio.pro',
- 'proguard/proguard-spongycastle.pro',
'proguard/proguard-rounded-image-view.pro',
'proguard/proguard-glide.pro',
'proguard/proguard-shortcutbadger.pro',
@@ -526,6 +523,9 @@ dependencies {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
testImplementation testLibs.robolectric.shadows.multidex
+ testImplementation (testLibs.bouncycastle.bcprov.jdk15on) {
+ force = true
+ }
testImplementation testLibs.hamcrest.hamcrest
testImplementation(testFixtures(project(":libsignal-service")))
diff --git a/dependencies.gradle b/dependencies.gradle
index 8ee7be5a1..991da2cff 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -133,6 +133,7 @@ dependencyResolutionManagement {
alias('mockito-core').to('org.mockito:mockito-core:2.23.4')
alias('robolectric-robolectric').to('org.robolectric', 'robolectric').versionRef('robolectric')
alias('robolectric-shadows-multidex').to('org.robolectric', 'shadows-multidex').versionRef('robolectric')
+ alias('bouncycastle-bcprov-jdk15on').to('org.bouncycastle:bcprov-jdk15on:1.70')
alias('hamcrest-hamcrest').to('org.hamcrest:hamcrest:2.2')
alias('assertj-core').to('org.assertj:assertj-core:3.11.1')
alias('powermock-api-mockito').to('org.powermock', 'powermock-api-mockito2').versionRef('powermock')
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4b951b1e1..d13c5b2ea 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -859,6 +859,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2544,6 +2614,11 @@
+
+
+
+
+
@@ -3029,6 +3104,11 @@
+
+
+
+
+
@@ -3054,6 +3134,11 @@
+
+
+
+
+