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

SSHD gets confused if spongycastle is present. Changed to BouncyCastle.

Browse Source 
It sees it as bouncycastle, tries to load some clases by they classpath and
fails.
This commit is contained in:
Albert Vaca 2016-01-10 08:46:52 -08:00
parent 2421abea22
commit d07ff5a802
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -61,9 +61,8 @@ dependencies {
compile 'com.android.support:design:23.1.1'
compile 'org.apache.sshd:sshd-core:0.8.0'
compile 'com.madgag.spongycastle:pkix:1.54.0.0'
//compile 'org.bouncycastle:bcpkix-jdk15on:1.54'
//compile 'org.bouncycastle:bcprov-jdk15on:1.54'
//compile 'com.madgag.spongycastle:pkix:1.54.0.0'
compile 'org.bouncycastle:bcpkix-jdk15on:1.54'
compile 'io.netty:netty-handler:4.0.33.Final' // Update to 4.1 when released, for compat with Android 5.0

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.UserInterface.MaterialActivity;
import org.kde.kdeconnect_tp.R;
import org.spongycastle.cert.X509CertificateHolder;
import org.spongycastle.cert.jcajce.JcaX509CertificateConverter;
import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import java.security.KeyFactory;
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.Log;
import org.spongycastle.asn1.x500.X500NameBuilder;
import org.spongycastle.asn1.x500.style.BCStyle;
import org.spongycastle.cert.X509CertificateHolder;
import org.spongycastle.cert.X509v3CertificateBuilder;
import org.spongycastle.cert.jcajce.JcaX509CertificateConverter;
import org.spongycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.spongycastle.operator.ContentSigner;
import org.spongycastle.operator.jcajce.JcaContentSignerBuilder;
import org.bouncycastle.asn1.x500.X500NameBuilder;
import org.bouncycastle.asn1.x500.style.BCStyle;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.X509v3CertificateBuilder;
import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import java.math.BigInteger;
import java.security.KeyStore;