comparison src/ch/ethz/ssh2/transport/ClientKexManager.java @ 298:ab3a99f11a36 ganymed

add ecdsa key support everywhere
author Carl Byington <carl@five-ten-sg.com>
date Tue, 29 Jul 2014 18:01:08 -0700
parents db9b028016de
children d2b303406d63
comparison
equal deleted inserted replaced
297:c1f929cb3dd0 298:ab3a99f11a36
59 byte[] rs = ECDSASHA2Verify.decodeSSHECDSASignature(sig); 59 byte[] rs = ECDSASHA2Verify.decodeSSHECDSASignature(sig);
60 ECPublicKey epk = ECDSASHA2Verify.decodeSSHECDSAPublicKey(hostkey); 60 ECPublicKey epk = ECDSASHA2Verify.decodeSSHECDSAPublicKey(hostkey);
61 log.debug("Verifying ecdsa signature"); 61 log.debug("Verifying ecdsa signature");
62 return ECDSASHA2Verify.verifySignature(kxs.H, rs, epk); 62 return ECDSASHA2Verify.verifySignature(kxs.H, rs, epk);
63 } 63 }
64
64 if (kxs.np.server_host_key_algo.equals("ssh-rsa")) { 65 if (kxs.np.server_host_key_algo.equals("ssh-rsa")) {
65 byte[] rs = RSASHA1Verify.decodeSSHRSASignature(sig); 66 byte[] rs = RSASHA1Verify.decodeSSHRSASignature(sig);
66 RSAPublicKey rpk = RSASHA1Verify.decodeSSHRSAPublicKey(hostkey); 67 RSAPublicKey rpk = RSASHA1Verify.decodeSSHRSAPublicKey(hostkey);
67 68
68 log.debug("Verifying ssh-rsa signature"); 69 log.debug("Verifying ssh-rsa signature");