From 54018a4a81bd1f30ed5871a64ff5ad9e8f626c3d Mon Sep 17 00:00:00 2001 From: Michael Prankl Date: Thu, 28 Dec 2017 11:55:36 +0100 Subject: [PATCH] Update AndroidConfig (#389) * Add EdDSA signature for AndroidConfig. * Initialize KeyExchange- and FileKeyProviderFactories with registered "bouncyCastle" (in fact, SpongyCastle is registered). See #308 for discussion. --- src/main/java/net/schmizz/sshj/AndroidConfig.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/schmizz/sshj/AndroidConfig.java b/src/main/java/net/schmizz/sshj/AndroidConfig.java index 235d9fab..9c230dd5 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; @@ -28,9 +30,18 @@ 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()); + setSignatureFactories(new SignatureRSA.Factory(), new SignatureDSA.Factory(), + // but add EdDSA + new SignatureEdDSA.Factory()); } @Override