From: AsamK <asamk@gmx.de>
Date: Sun, 3 Apr 2016 12:08:46 +0000 (+0200)
Subject: Use original bouncycastle instead of spongycastle
X-Git-Tag: v0.3.1~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/edf5c9eb43917eb7231906d8d1a6b9d2b1f43627?ds=inline

Use original bouncycastle instead of spongycastle

spongycastle is used by Signal-Android, because android has a crippled
bouncycastle. Spongycastle seems to have a problem with Oracle JDK 8.

Fixes #9
---

diff --git a/build.gradle b/build.gradle
index 69d30afc..2064f360 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     compile 'org.whispersystems:signal-service-java:2.1.1fetchMessages'
-    compile 'com.madgag.spongycastle:prov:1.54.0.0'
+    compile 'org.bouncycastle:bcprov-jdk15on:1.54'
     compile 'commons-io:commons-io:2.4'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 696f24ce..00366e5a 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -48,7 +48,7 @@ public class Main {
 
     public static void main(String[] args) {
         // Workaround for BKS truststore
-        Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+        Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(), 1);
 
         Namespace ns = parseArgs(args);
         if (ns == null) {