Mercurial > 510Connectbot
comparison 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 |
comparison
equal
deleted
inserted
replaced
295:deb5fb087b6f | 296:8c55d7714d03 |
---|---|
29 import java.security.NoSuchAlgorithmException; | 29 import java.security.NoSuchAlgorithmException; |
30 import java.security.PrivateKey; | 30 import java.security.PrivateKey; |
31 import java.security.PublicKey; | 31 import java.security.PublicKey; |
32 import java.security.interfaces.DSAPrivateKey; | 32 import java.security.interfaces.DSAPrivateKey; |
33 import java.security.interfaces.DSAPublicKey; | 33 import java.security.interfaces.DSAPublicKey; |
34 import java.security.interfaces.ECPrivateKey; | |
35 import java.security.interfaces.ECPublicKey; | |
34 import java.security.interfaces.RSAPrivateKey; | 36 import java.security.interfaces.RSAPrivateKey; |
35 import java.security.interfaces.RSAPublicKey; | 37 import java.security.interfaces.RSAPublicKey; |
36 import java.security.spec.InvalidKeySpecException; | 38 import java.security.spec.InvalidKeySpecException; |
37 import java.util.Arrays; | 39 import java.util.Arrays; |
38 import java.util.HashMap; | 40 import java.util.HashMap; |
73 import ch.ethz.ssh2.Session; | 75 import ch.ethz.ssh2.Session; |
74 import ch.ethz.ssh2.HTTPProxyData; | 76 import ch.ethz.ssh2.HTTPProxyData; |
75 import ch.ethz.ssh2.HTTPProxyException; | 77 import ch.ethz.ssh2.HTTPProxyException; |
76 import ch.ethz.ssh2.crypto.PEMDecoder; | 78 import ch.ethz.ssh2.crypto.PEMDecoder; |
77 import ch.ethz.ssh2.signature.DSASHA1Verify; | 79 import ch.ethz.ssh2.signature.DSASHA1Verify; |
80 import ch.ethz.ssh2.signature.ECDSASHA2Verify; | |
78 import ch.ethz.ssh2.signature.RSASHA1Verify; | 81 import ch.ethz.ssh2.signature.RSASHA1Verify; |
79 | 82 |
80 /** | 83 /** |
81 * @author Kenny Root | 84 * @author Kenny Root |
82 * | 85 * |
1060 } | 1063 } |
1061 else if (privKey instanceof DSAPrivateKey) { | 1064 else if (privKey instanceof DSAPrivateKey) { |
1062 DSAPublicKey pubkey = (DSAPublicKey) pair.getPublic(); | 1065 DSAPublicKey pubkey = (DSAPublicKey) pair.getPublic(); |
1063 pubKeys.put(entry.getKey(), DSASHA1Verify.encodeSSHDSAPublicKey(pubkey)); | 1066 pubKeys.put(entry.getKey(), DSASHA1Verify.encodeSSHDSAPublicKey(pubkey)); |
1064 } | 1067 } |
1068 else if (privKey instanceof ECPrivateKey) { | |
1069 ECPublicKey pubkey = (ECPublicKey) pair.getPublic(); | |
1070 pubKeys.put(entry.getKey(), ECDSASHA2Verify.encodeSSHECDSAPublicKey(pubkey)); | |
1071 } | |
1065 else | 1072 else |
1066 continue; | 1073 continue; |
1067 } | 1074 } |
1068 catch (IOException e) { | 1075 catch (IOException e) { |
1069 continue; | 1076 continue; |