Mercurial > 510Connectbot
diff src/com/five_ten_sg/connectbot/transport/SSH.java @ 296:8c55d7714d03 ganymed
start conversion from trilead to ganymed
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Tue, 29 Jul 2014 16:35:48 -0700 |
parents | 91a31873c42a |
children | 4c3a4e88c027 |
line wrap: on
line diff
--- a/src/com/five_ten_sg/connectbot/transport/SSH.java Fri Jul 18 20:48:40 2014 -0700 +++ b/src/com/five_ten_sg/connectbot/transport/SSH.java Tue Jul 29 16:35:48 2014 -0700 @@ -31,6 +31,8 @@ import java.security.PublicKey; import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.ECPrivateKey; +import java.security.interfaces.ECPublicKey; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; import java.security.spec.InvalidKeySpecException; @@ -75,6 +77,7 @@ import ch.ethz.ssh2.HTTPProxyException; import ch.ethz.ssh2.crypto.PEMDecoder; import ch.ethz.ssh2.signature.DSASHA1Verify; +import ch.ethz.ssh2.signature.ECDSASHA2Verify; import ch.ethz.ssh2.signature.RSASHA1Verify; /** @@ -1062,6 +1065,10 @@ DSAPublicKey pubkey = (DSAPublicKey) pair.getPublic(); pubKeys.put(entry.getKey(), DSASHA1Verify.encodeSSHDSAPublicKey(pubkey)); } + else if (privKey instanceof ECPrivateKey) { + ECPublicKey pubkey = (ECPublicKey) pair.getPublic(); + pubKeys.put(entry.getKey(), ECDSASHA2Verify.encodeSSHECDSAPublicKey(pubkey)); + } else continue; }