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

Made sshd use spongycastle instead of bouncycastle

Browse Source 
We have to add the DHG14 key exchange factory by hand because when calling
setUpDefaultServer with Bouncy Castle disabled, it assumes DHG14 is not
supported (but it is, because we are adding spongycastle).
This commit is contained in:
Albert Vaca
2016-03-03 12:22:22 -08:00
parent 6ed3a18f53
commit 87e214761f
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/kde/kdeconnect/Plugins/SftpPlugin/SftpImpl.java
View File

@@ -24,6 +24,7 @@ import android.content.Context;
import android.util.Log;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.KeyExchange;
import org.apache.sshd.common.NamedFactory;
import org.apache.sshd.common.Session;
import org.apache.sshd.common.file.FileSystemFactory;
@@ -36,6 +37,8 @@ import org.apache.sshd.server.Command;
import org.apache.sshd.server.PasswordAuthenticator;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.command.ScpCommandFactory;
import org.apache.sshd.server.kex.DHG1;
import org.apache.sshd.server.kex.DHG14;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.sftp.SftpSubsystem;
@@ -48,6 +51,7 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.security.PublicKey;
import java.security.Security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -102,10 +106,18 @@ class SimpleSftpServer {
public final SimplePasswordAuthenticator passwordAuth = new SimplePasswordAuthenticator();
public final SimplePublicKeyAuthenticator keyAuth = new SimplePublicKeyAuthenticator();
static {
Security.insertProviderAt( new org.spongycastle.jce.provider.BouncyCastleProvider(), 1);
SecurityUtils.setRegisterBouncyCastle(false);
}
private final SshServer sshd = SshServer.setUpDefaultServer();
public void init(Context ctx, Device device) {
sshd.setKeyExchangeFactories(Arrays.asList(
new DHG14.Factory(),
new DHG1.Factory()));
passwordAuth.setUser(USER);
sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(ctx.getFilesDir() + "/sftpd.ser"));
@@ -134,6 +146,7 @@ class SimpleSftpServer {
sshd.start();
started = true;
} catch(Exception e) {
e.printStackTrace();
port++;
if (port >= ENDPORT) {
port = -1;