Skip to content
Permalink
Browse files

Merge pull request #13 from jenkinsci/JENKINS-42959-support-ED25519-keys

Support Ed25519 asymmetric keys
  • Loading branch information
mc1arke committed Apr 10, 2017
2 parents 3a9205e + dac7b1b commit b3ca9db0df6652c655e6c472bc7a15dc52f33b76
Showing with 1,514 additions and 344 deletions.
  1. +26 −0 pom.xml
  2. +1 −2 src/com/trilead/ssh2/Connection.java
  3. +1 −2 src/com/trilead/ssh2/ConnectionInfo.java
  4. +144 −194 src/com/trilead/ssh2/KnownHosts.java
  5. +1 −1 src/com/trilead/ssh2/ServerHostKeyVerifier.java
  6. +43 −67 src/com/trilead/ssh2/auth/AuthenticationManager.java
  7. +20 −0 src/com/trilead/ssh2/crypto/CertificateDecoder.java
  8. +139 −14 src/com/trilead/ssh2/crypto/PEMDecoder.java
  9. +4 −0 src/com/trilead/ssh2/crypto/PEMStructure.java
  10. +233 −0 src/com/trilead/ssh2/signature/DSAKeyAlgorithm.java
  11. +3 −0 src/com/trilead/ssh2/signature/DSAPrivateKey.java
  12. +2 −0 src/com/trilead/ssh2/signature/DSAPublicKey.java
  13. +10 −1 src/com/trilead/ssh2/signature/DSASHA1Verify.java
  14. +2 −0 src/com/trilead/ssh2/signature/DSASignature.java
  15. +294 −0 src/com/trilead/ssh2/signature/ED25519KeyAlgorithm.java
  16. +75 −0 src/com/trilead/ssh2/signature/KeyAlgorithm.java
  17. +35 −0 src/com/trilead/ssh2/signature/KeyAlgorithmManager.java
  18. +167 −0 src/com/trilead/ssh2/signature/RSAKeyAlgorithm.java
  19. +2 −0 src/com/trilead/ssh2/signature/RSAPrivateKey.java
  20. +2 −0 src/com/trilead/ssh2/signature/RSAPublicKey.java
  21. +10 −1 src/com/trilead/ssh2/signature/RSASHA1Verify.java
  22. +2 −1 src/com/trilead/ssh2/signature/RSASignature.java
  23. +61 −61 src/com/trilead/ssh2/transport/KexManager.java
  24. +69 −0 test/com/trilead/ssh2/signature/DSAKeyAlgorithmTest.java
  25. +82 −0 test/com/trilead/ssh2/signature/ED25519KeyAlgorithmTest.java
  26. +69 −0 test/com/trilead/ssh2/signature/RSAKeyAlgorithmTest.java
  27. +9 −0 test/com/trilead/ssh2/signature/ed25519-testkey-protected.txt
  28. +8 −0 test/com/trilead/ssh2/signature/ed25519-testkey-unprotected.txt
26 pom.xml
@@ -54,11 +54,32 @@
<version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.connectbot.jbcrypt</groupId>
<artifactId>jbcrypt</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<testResources>
<testResource>
<directory>test</directory>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</testResource>
</testResources>
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
@@ -67,4 +88,9 @@
</plugins>
</build>

<properties>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>

</project>
@@ -1299,8 +1299,7 @@ public synchronized void setServer2ClientMACs(String[] macs)
* Unless you know what you are doing, you will never need this.
*
* @param algos
* An array of allowed server host key algorithms. SSH-2 defines
* <code>ssh-dss</code> and <code>ssh-rsa</code>. The
* An array of allowed server host key algorithms. The
* entries of the array must be ordered after preference, i.e.,
* the entry at index 0 is the most preferred one. You must
* specify at least one entry.
@@ -37,8 +37,7 @@
public String serverToClientMACAlgorithm;

/**
* The type of the server host key (currently either "ssh-dss" or
* "ssh-rsa").
* The type of the server host key
*/
public String serverHostKeyAlgorithm;
/**

0 comments on commit b3ca9db

Please sign in to comment.
You can’t perform that action at this time.