From 88ca91cd02bdc3e59aadbd36564edc158ff11838 Mon Sep 17 00:00:00 2001 From: Michael Prankl Date: Thu, 21 Dec 2017 00:59:09 +0100 Subject: [PATCH 1/2] Add EdDSA signature for AndroidConfig. --- src/main/java/net/schmizz/sshj/AndroidConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/schmizz/sshj/AndroidConfig.java b/src/main/java/net/schmizz/sshj/AndroidConfig.java index 235d9fab9..ed6e57e4f 100644 --- a/src/main/java/net/schmizz/sshj/AndroidConfig.java +++ b/src/main/java/net/schmizz/sshj/AndroidConfig.java @@ -15,6 +15,8 @@ */ package net.schmizz.sshj; +import com.hierynomus.sshj.signature.SignatureEdDSA; + import net.schmizz.sshj.common.SecurityUtils; import net.schmizz.sshj.signature.SignatureDSA; import net.schmizz.sshj.signature.SignatureRSA; @@ -30,7 +32,9 @@ public class AndroidConfig // don't add ECDSA protected void initSignatureFactories() { - setSignatureFactories(new SignatureRSA.Factory(), new SignatureDSA.Factory()); + setSignatureFactories(new SignatureRSA.Factory(), new SignatureDSA.Factory(), + // but add EdDSA + new SignatureEdDSA.Factory()); } @Override From eef9167c33732a7bc59a0af52d0c9870c36aa130 Mon Sep 17 00:00:00 2001 From: Michael Prankl Date: Thu, 21 Dec 2017 01:03:41 +0100 Subject: [PATCH 2/2] Initialize KeyExchange- and FileKeyProviderFactories with registered "bouncyCastle" (in fact, SpongyCastle is registered). See #308 for discussion. --- src/main/java/net/schmizz/sshj/AndroidConfig.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/net/schmizz/sshj/AndroidConfig.java b/src/main/java/net/schmizz/sshj/AndroidConfig.java index ed6e57e4f..9c230dd53 100644 --- a/src/main/java/net/schmizz/sshj/AndroidConfig.java +++ b/src/main/java/net/schmizz/sshj/AndroidConfig.java @@ -30,6 +30,13 @@ public class AndroidConfig SecurityUtils.registerSecurityProvider("org.spongycastle.jce.provider.BouncyCastleProvider"); } + public AndroidConfig(){ + super(); + initKeyExchangeFactories(true); + initRandomFactory(true); + initFileKeyProviderFactories(true); + } + // don't add ECDSA protected void initSignatureFactories() { setSignatureFactories(new SignatureRSA.Factory(), new SignatureDSA.Factory(),