Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update AndroidConfig #389

Merged
merged 3 commits into from
Dec 28, 2017
Merged

Update AndroidConfig #389

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88ca91c
Add EdDSA signature for AndroidConfig.
eidottermihi Dec 20, 2017
eef9167
Initialize KeyExchange- and FileKeyProviderFactories with registered …
eidottermihi Dec 21, 2017
ee857ab
Merge branch 'master' into update-android-config
hierynomus Dec 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/main/java/net/schmizz/sshj/AndroidConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down