From ea9a5decac7c7837e3823976a996cd2d0d53fc73 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 20 Nov 2014 16:46:35 -0800 Subject: [PATCH] Update gradle-witness and actually use spongycastle. // FREEBIE --- build.gradle | 7 +++++-- libs/gradle-witness.jar | Bin 20429 -> 20436 bytes libtextsecure/build.gradle | 2 +- .../securesms/ApplicationContext.java | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9fe241177..815056470 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,7 @@ dependencies { compile 'org.apache.httpcomponents:httpclient-android:4.3.5' compile 'com.github.chrisbanes.photoview:library:1.2.3' compile 'com.android.support:appcompat-v7:21.0.2' + compile 'com.madgag.spongycastle:prov:1.51.0.0' compile ('com.android.support:support-v4-preferencefragment:1.0.0@aar'){ exclude module: 'support-v4' } @@ -57,14 +58,16 @@ dependencyVerification { 'com.astuetz:pagerslidingtabstrip:f1641396732c7132a7abb837e482e5ee2b0ebb8d10813fc52bbaec2c15c184c2', 'org.w3c:smil:085dc40f2bb249651578bfa07499fd08b16ad0886dbe2c4078586a408da62f9b', 'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1', + 'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc', 'com.android.support:appcompat-v7:b760fd3d0b0b0547a1bcef9031b40939f31049ba955f04c8fdc5aa09a25d19e9', + 'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a', 'com.android.support:support-v4-preferencefragment:5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad', 'com.squareup.dagger:dagger:789aca24537022e49f91fc6444078d9de8f1dd99e1bfb090f18491b186967883', + 'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f', + 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74', - 'com.madgag:sc-light-jdk15on:931f39d351429fb96c2f749e7ecb1a256a8ebbf5edca7995c9cc085b94d1841d', 'com.googlecode.libphonenumber:libphonenumber:eba17eae81dd622ea89a00a3a8c025b2f25d342e0d9644c5b62e16f15687c3ab', 'org.whispersystems:gson:08f4f7498455d1539c9233e5aac18e9b1805815ef29221572996508eb512fe51', - 'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc', 'com.android.support:support-v4:126a4c291f41f75f3fff4968e9d397bc8454cdff4d8f994cbe0524e3bad76e72', 'com.android.support:support-annotations:7e37f00e3d932c4d9a6dd84604a99133bb5ae7d81cbd1aee69861fcf2f91e5e9', ] diff --git a/libs/gradle-witness.jar b/libs/gradle-witness.jar index ef9038c7827abfd28fe005576f15178918433884..561041d3661895d48bd396b342d9c043ecd741ae 100644 GIT binary patch delta 7523 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 diff --git a/libtextsecure/build.gradle b/libtextsecure/build.gradle index a0788db8e..688225623 100644 --- a/libtextsecure/build.gradle +++ b/libtextsecure/build.gradle @@ -20,7 +20,7 @@ repositories { dependencies { compile 'com.google.protobuf:protobuf-java:2.5.0' - compile 'com.madgag:sc-light-jdk15on:1.47.0.2' +// compile 'com.madgag:sc-light-jdk15on:1.47.0.2' compile 'com.googlecode.libphonenumber:libphonenumber:6.1' compile 'org.whispersystems:gson:2.2.4' diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 80aa395bf..d197acaa3 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -32,6 +32,8 @@ import org.whispersystems.jobqueue.JobManager; import org.whispersystems.jobqueue.dependencies.DependencyInjector; import org.whispersystems.jobqueue.requirements.NetworkRequirementProvider; +import java.security.Security; + import dagger.ObjectGraph; /** @@ -72,6 +74,7 @@ public class ApplicationContext extends Application implements DependencyInjecto private void initializeRandomNumberFix() { + Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1); PRNGFixes.apply(); }