Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-06 15:20:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added curve25519-sha256@libssh.org to the default config

Browse Source
This commit is contained in:
Jeroen van Erp
2015-11-03 16:22:18 +01:00
parent 29a6cf6f79
commit afdfa91eb7
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.adoc
View File

@@ -63,7 +63,7 @@ ciphers::
key exchange:: key exchange::
`diffie-hellman-group1-sha1`, `diffie-hellman-group14-sha1`, `diffie-hellman-group-exhange-sha1`, `diffie-hellman-group-exchange-sha256`, `diffie-hellman-group1-sha1`, `diffie-hellman-group14-sha1`, `diffie-hellman-group-exhange-sha1`, `diffie-hellman-group-exchange-sha256`,
`ecdh-sha2-nistp256`, `ecdh-sha2-nistp384`, `ecdh-sha2-nistp521` `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384`, `ecdh-sha2-nistp521`, `curve25519-sha256@libssh.org`
signatures:: signatures::
`ssh-rsa`, `ssh-dss` `ssh-rsa`, `ssh-dss`
@@ -94,7 +94,8 @@ Fork away!
== Release history == Release history
SSHJ 0.14.0 (2015-??-??):: SSHJ 0.14.0 (2015-??-??)::
* Added support for `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384` and `ecdh-sha2-nistp521` * Fixed https://github.com/hierynomus/sshj/issues/171[#171]: Added support for `curve25519-sha256@libssh.org` key exchange algorithm
* Added support for `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384` and `ecdh-sha2-nistp521` key exchange algorithms
* Fixed https://github.com/hierynomus/sshj/issues/167[#167]: Added support for `diffie-hellman-group-exhange-sha1` and `diffie-hellman-group-exhange-sha256` key exchange methods * Fixed https://github.com/hierynomus/sshj/issues/167[#167]: Added support for `diffie-hellman-group-exhange-sha1` and `diffie-hellman-group-exhange-sha256` key exchange methods
* Fixed https://github.com/hierynomus/sshj/issues/212[#212]: Configure path escaping to enable shell expansion to work correctly * Fixed https://github.com/hierynomus/sshj/issues/212[#212]: Configure path escaping to enable shell expansion to work correctly
* Merged https://github.com/hierynomus/sshj/issues/210[#210]: RemoteFileInputStream.skip returns wrong value (Fixes https://github.com/hierynomus/sshj/issues/209[#209]) * Merged https://github.com/hierynomus/sshj/issues/210[#210]: RemoteFileInputStream.skip returns wrong value (Fixes https://github.com/hierynomus/sshj/issues/209[#209])

13
src/main/java/net/schmizz/sshj/DefaultConfig.java
View File

@@ -80,7 +80,7 @@ public class DefaultConfig
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private static final String VERSION = "SSHJ_0_13_0"; private static final String VERSION = "SSHJ_0_14_0";
public DefaultConfig() { public DefaultConfig() {
setVersion(VERSION); setVersion(VERSION);
@@ -97,13 +97,14 @@ public class DefaultConfig
protected void initKeyExchangeFactories(boolean bouncyCastleRegistered) { protected void initKeyExchangeFactories(boolean bouncyCastleRegistered) {
if (bouncyCastleRegistered) if (bouncyCastleRegistered)
setKeyExchangeFactories(new DHG14.Factory(), setKeyExchangeFactories(new Curve25519SHA256.Factory(),
new DHG1.Factory(),
new DHGexSHA1.Factory(),
new DHGexSHA256.Factory(), new DHGexSHA256.Factory(),
new ECDHNistP.Factory256(), new ECDHNistP.Factory521(),
new ECDHNistP.Factory384(), new ECDHNistP.Factory384(),
new ECDHNistP.Factory521()); new ECDHNistP.Factory256(),
new DHGexSHA1.Factory(),
new DHG14.Factory(),
new DHG1.Factory());
else else
setKeyExchangeFactories(new DHG1.Factory(), new DHGexSHA1.Factory()); setKeyExchangeFactories(new DHG1.Factory(), new DHGexSHA1.Factory());
} }