From 5de9653149345ce586b5ae52ded2fd341a404119 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 28 Jan 2022 12:32:10 -0500
Subject: [PATCH] Force bouncycastle version to 1.70

---
 app/build.gradle                 |  6 +--
 dependencies.gradle              |  1 +
 gradle/verification-metadata.xml | 85 ++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+), 3 deletions(-)

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 @@
             <sha256 value="6d7539a6ae29bd6f21ad50da86ab9427c69e5cae9075b5324584d9372aa73191" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.android.support" name="animated-vector-drawable" version="25.3.1">
+         <artifact name="animated-vector-drawable-25.3.1.aar">
+            <sha256 value="4bc46edf1946b32d518b41416d1734e915e0cbb28021de3b340527419b070691" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="appcompat-v7" version="25.3.1">
+         <artifact name="appcompat-v7-25.3.1.aar">
+            <sha256 value="ac1ebbc46589195dda3e0b1becfe410bafd75bdf3edd1cd9acf04850f3895830" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="exifinterface" version="27.1.0">
+         <artifact name="exifinterface-27.1.0.aar">
+            <sha256 value="941b5f1c85bab0f999e63a003993acb7dad6c01ad19104ad53e63529ee2d82e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="multidex" version="1.0.3">
+         <artifact name="multidex-1.0.3.aar">
+            <sha256 value="ecf6098572e23b5155bab3b9a82b2fd1530eda6c6c157745e0f5287c66eec60c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="recyclerview-v7" version="25.3.1">
+         <artifact name="recyclerview-v7-25.3.1.aar">
+            <sha256 value="375974a8724e359d97d77fa8522c614f813a3ac4583c1807f154a3f9a054b0a1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-annotations" version="25.3.1">
+         <artifact name="support-annotations-25.3.1.jar">
+            <sha256 value="aedf76962584adfaed2bd3fcaa22406461c4310237fc27e301128edaa2dba2fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-compat" version="25.3.1">
+         <artifact name="support-compat-25.3.1.aar">
+            <sha256 value="e02d781268dc60aab6638d8dc20156ea11ca20b962d294b85e6f1e8418cabfa7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-core-ui" version="25.3.1">
+         <artifact name="support-core-ui-25.3.1.aar">
+            <sha256 value="6182278a6653e6c111c888963626cbb16f2d0022571cb239760475119e0b92a8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-core-utils" version="25.3.1">
+         <artifact name="support-core-utils-25.3.1.aar">
+            <sha256 value="32fac02eb2c20a77fa3e3bc3ede62392a19613f72b8f8e10f5dfa84bb4c89ea1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-fragment" version="25.3.1">
+         <artifact name="support-fragment-25.3.1.aar">
+            <sha256 value="541d6393c1e024453aca2a14f31bea0c7270ff4e2a02783f3528aa426367444d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-media-compat" version="25.3.1">
+         <artifact name="support-media-compat-25.3.1.aar">
+            <sha256 value="cbed07d07e0e84fdb4b75712f5fd946229a8af155933c9a92e41db64d00791e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-v13" version="25.3.1">
+         <artifact name="support-v13-25.3.1.aar">
+            <sha256 value="edd86bab8578e24443b56ee115b38023dacaacb8bb3188c9de3fdbb8e15023d3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-v4" version="25.3.1">
+         <artifact name="support-v4-25.3.1.aar">
+            <sha256 value="07d389154bcf73b47e514964df1578136b26cba78257b8a577a3ccb54beff0ae" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.android.support" name="support-vector-drawable" version="25.3.1">
+         <artifact name="support-vector-drawable-25.3.1.aar">
+            <sha256 value="13728f337f36d1c02d52198a6c20724edb447a0875454d829f95cb9eb4aa293b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.android.tools" name="annotations" version="26.6.3">
          <artifact name="annotations-26.6.3.jar">
             <sha256 value="9bb9e1aef699819309fb30ab9094d7beb04fb09da184ddabc14ca3ec21c7f14a" origin="Generated by Gradle"/>
@@ -2544,6 +2614,11 @@
             <sha256 value="e78f96eb59066c94c94fb2d6b5eb80f52feac6f5f9776898634f8addec6e2137" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.70">
+         <artifact name="bcprov-jdk15on-1.70.jar">
+            <sha256 value="8f3c20e3e2d565d26f33e8d4857a37d0d7f8ac39b62a7026496fcab1bdac30d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
          <artifact name="checker-compat-qual-2.5.5.jar">
             <sha256 value="11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a" origin="Generated by Gradle"/>
@@ -3029,6 +3104,11 @@
             <sha256 value="5f801e75ca27d8791c14b07943c608da27620d910a8093022af57f543d5d98b6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.5.0">
+         <artifact name="kotlin-stdlib-jdk7-1.5.0.jar">
+            <sha256 value="ac12f092f12b575c1f9e0ab5025b1e610b0fe95663e26371c16c328895711bae" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.5.10">
          <artifact name="kotlin-stdlib-jdk7-1.5.10.jar">
             <sha256 value="75ed5680aaacfd94b93c3695d8eb8bfa7cf83893d2e46ca9788345c52d393f8a" origin="Generated by Gradle"/>
@@ -3054,6 +3134,11 @@
             <sha256 value="adc43e54757b106e0cd7b3b7aa257dff471b61efdabe067fc02b2f57e2396262" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.5.0">
+         <artifact name="kotlin-stdlib-jdk8-1.5.0.jar">
+            <sha256 value="15e6c81b9e845eefe58d51a04670bb90418046f458264ec0e61ee9bdbc1bfae7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.5.10">
          <artifact name="kotlin-stdlib-jdk8-1.5.10.jar">
             <sha256 value="270b05aa3cc92f157a7ed71ff09cf136ee3fb18cbac94f71a12931009c49f550" origin="Generated by Gradle"/>