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 69d30afc6733e635d3745ac6b7337bb87c6e52e0..2064f3605214d65a627ba57186259185b0d8e211 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     compile 'org.whispersystems:signal-service-java:2.1.1fetchMessages'
 
 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'
     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 696f24ce0fae50c2dd71fc6667153305c028b62b..00366e5a3ba275b9e8d4bf6c0ca244deae6e3fe3 100644 (file)
--- 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
 
     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) {
 
         Namespace ns = parseArgs(args);
         if (ns == null) {