From 6d3d351ed78ace54b5a7a53569a95c2dfaf40990 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Sun, 4 Jan 2015 22:21:06 +0000
Subject: [PATCH] Use SpongyCastle for crypto

Requires i2p.i2p-bote rev 474ac06823cf555f824fdf914fe40247e38eab55
---
 app/build.gradle                                       | 7 +++++++
 app/src/main/java/i2p/bote/android/InitActivities.java | 6 ++++++
 botejars/build.gradle                                  | 1 -
 botejars/build.xml                                     | 2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4e514aa..6aa4143 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,9 @@ android {
     packagingOptions {
         exclude 'LICENSE.txt'
     }
+    dexOptions {
+        jumboMode = true
+    }
 }
 
 dependencies {
@@ -43,6 +46,8 @@ dependencies {
     // Remote dependencies
     compile 'net.i2p.android:client:0.4@aar'
     compile 'net.i2p.android.ext:floatingactionbutton:1.5.1'
+    compile 'com.madgag.spongycastle:core:1.51.0.0'
+    compile 'com.madgag.spongycastle:prov:1.51.0.0'
     compile ('com.mcxiaoke.viewpagerindicator:library:2.4.1') {
         exclude group: 'com.android.support', module: 'support-v4'
     }
@@ -62,6 +67,8 @@ dependencyVerification {
             'com.android.support:appcompat-v7:5dbeb5316d0a6027d646ae552804c3baa5e3bd53f7f33db50904d51505c8a0e5',
             'net.i2p.android:client:9176b5e32f74929856eeedf1dbe7e9f0a64fbb8a58a62b13f929c362353773d3',
             'net.i2p.android.ext:floatingactionbutton:ea904b3f290498d6184c5b9affa87949ed5dfe76c5b6a0a307f62313ec094249',
+            'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
+            'com.madgag.spongycastle:prov:b8c3fec3a59aac1aa04ccf4dad7179351e54ef7672f53f508151b614c131398a',
             'com.mcxiaoke.viewpagerindicator:library:470bbd2bec1ede64ad21efd6f02676807d22f1b526c4ac6a5b41a428c6e47e67',
             'com.google.zxing:core:f00b32f7a1b0edc914a8f74301e8dc34f189afc4698e9c8cc54e5d46772734a5',
             'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4',
diff --git a/app/src/main/java/i2p/bote/android/InitActivities.java b/app/src/main/java/i2p/bote/android/InitActivities.java
index 448ac37..f7b72f0 100644
--- a/app/src/main/java/i2p/bote/android/InitActivities.java
+++ b/app/src/main/java/i2p/bote/android/InitActivities.java
@@ -2,7 +2,13 @@ package i2p.bote.android;
 
 import android.content.Context;
 
+import java.security.Security;
+
 public class InitActivities {
+    static {
+        Security.insertProviderAt(new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
+    }
+
     private final String myDir;
 
     public InitActivities(Context c) {
diff --git a/botejars/build.gradle b/botejars/build.gradle
index 7fa72eb..15b4a8e 100644
--- a/botejars/build.gradle
+++ b/botejars/build.gradle
@@ -9,7 +9,6 @@ task buildJars(type: Exec) {
 
 artifacts {
     'default' file: file('libs/router.jar'), builtBy: buildJars
-    'default' file: file('libs/bcprov-ecc-jdk16-146.jar'), builtBy: buildJars
     'default' file: file('libs/flexi-gmss-1.7p1.jar'), builtBy: buildJars
     'default' file: file('libs/lzma-9.20.jar'), builtBy: buildJars
     'default' file: file('libs/ntruenc-1.2.jar'), builtBy: buildJars
diff --git a/botejars/build.xml b/botejars/build.xml
index 387e758..d5bd6a9 100644
--- a/botejars/build.xml
+++ b/botejars/build.xml
@@ -89,6 +89,7 @@
         <jar destfile="${jar.libs.dir}/i2pbote.jar" >
             <!-- remove classes that are overridden or stubbed out -->
             <zipfileset src="${botelib}/i2pbote.jar" >
+                <exclude name="i2p/bote/crypto/ECUtils.class" />
                 <exclude name="i2p/bote/imap/" />
                 <exclude name="i2p/bote/service/seedless/" />
                 <exclude name="i2p/bote/smtp/" />
@@ -106,7 +107,6 @@
         <!-- bote deps -->
         <copy todir="${jar.libs.dir}">
             <fileset dir="${botelib}">
-                <include name="bcprov-ecc-jdk16-146.jar" />
                 <!-- Regular JavaMail currently doesn't work on Android
                 <include name="mailapi.jar" />-->
                 <include name="lzma-9.20.jar" />