mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-30 13:47:41 +00:00
Code Issues Releases Wiki Activity

BouncyCastle doesn't work on Android 2.3, but spongy does

Browse Source 
Now we have to make sshd work with spongy
This commit is contained in:
Albert Vaca
2016-03-03 11:11:39 -08:00
parent 9a2167774b
commit 4d553518f6
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -61,9 +61,9 @@ dependencies {
compile 'com.android.support:design:23.2.0' compile 'com.android.support:design:23.2.0'
compile 'org.apache.sshd:sshd-core:0.8.0' compile 'org.apache.sshd:sshd-core:0.8.0'
//compile 'com.madgag.spongycastle:pkix:1.54.0.0' //compile 'org.bouncycastle:bcprov-jdk15on:1.54'
compile 'org.bouncycastle:bcpkix-jdk15on:1.54'
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'io.netty:netty-handler:4.1.0.CR3' compile 'io.netty:netty-handler:4.1.0.CR3'
androidTestCompile 'org.mockito:mockito-core:1.10.19' androidTestCompile 'org.mockito:mockito-core:1.10.19'

6
src/org/kde/kdeconnect/Device.java
View File

@@ -41,9 +41,9 @@ import org.kde.kdeconnect.Plugins.Plugin;
import org.kde.kdeconnect.Plugins.PluginFactory; import org.kde.kdeconnect.Plugins.PluginFactory;
import org.kde.kdeconnect.UserInterface.MaterialActivity; import org.kde.kdeconnect.UserInterface.MaterialActivity;
import org.kde.kdeconnect_tp.R; import org.kde.kdeconnect_tp.R;
import org.bouncycastle.cert.X509CertificateHolder; import org.spongycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; import org.spongycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.jce.provider.BouncyCastleProvider;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.PrivateKey; import java.security.PrivateKey;

18
src/org/kde/kdeconnect/Helpers/SecurityHelpers/SslHelper.java
View File

@@ -28,15 +28,15 @@ import android.provider.Settings;
import android.util.Base64; import android.util.Base64;
import android.util.Log; import android.util.Log;
import org.bouncycastle.asn1.x500.X500NameBuilder; import org.spongycastle.asn1.x500.X500NameBuilder;
import org.bouncycastle.asn1.x500.style.BCStyle; import org.spongycastle.asn1.x500.style.BCStyle;
import org.bouncycastle.cert.X509CertificateHolder; import org.spongycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.X509v3CertificateBuilder; import org.spongycastle.cert.X509v3CertificateBuilder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; import org.spongycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.operator.ContentSigner; import org.spongycastle.operator.ContentSigner;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.spongycastle.operator.jcajce.JcaContentSignerBuilder;
import org.kde.kdeconnect.Helpers.RandomHelper; import org.kde.kdeconnect.Helpers.RandomHelper;
import java.math.BigInteger; import java.math.BigInteger;