Mercurial > 510Connectbot

diff src/ch/ethz/ssh2/transport/ServerKexManager.java @ 284:4ec87de11e71 ganymed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
start conversion from trilead to ganymed
author Carl Byington <carl@five-ten-sg.com>
date Fri, 18 Jul 2014 18:08:56 -0700
parents 3855f58ffd2b
children 486df527ddc5
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 17:32:11 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 18:08:56 2014 -0700
@@ -167,11 +167,11 @@
                 byte[] hostKey = null;
 
                 if(kxs.np.server_host_key_algo.equals("ssh-rsa")) {
-                    hostKey = RSASHA1Verify.encodeSSHRSAPublicKey(kxs.local_rsa_key.getPublicKey());
+                    hostKey = RSASHA1Verify.encodeSSHRSAPublicKey(kxs.local_rsa_key.getPublic());
                 }
 
                 if(kxs.np.server_host_key_algo.equals("ssh-dss")) {
-                    hostKey = DSASHA1Verify.encodeSSHDSAPublicKey(kxs.local_dsa_key.getPublicKey());
+                    hostKey = DSASHA1Verify.encodeSSHDSAPublicKey(kxs.local_dsa_key.getPublic());
                 }
 
                 try {
@@ -187,12 +187,12 @@
                 byte[] signature = null;
 
                 if(kxs.np.server_host_key_algo.equals("ssh-rsa")) {
-                    RSASignature rs = RSASHA1Verify.generateSignature(kxs.H, kxs.local_rsa_key);
+                    byte[] rs = RSASHA1Verify.generateSignature(kxs.H, kxs.local_rsa_key);
                     signature = RSASHA1Verify.encodeSSHRSASignature(rs);
                 }
 
                 if(kxs.np.server_host_key_algo.equals("ssh-dss")) {
-                    DSASignature ds = DSASHA1Verify.generateSignature(kxs.H, kxs.local_dsa_key, rnd);
+                    byte[] ds = DSASHA1Verify.generateSignature(kxs.H, kxs.local_dsa_key, rnd);
                     signature = DSASHA1Verify.encodeSSHDSASignature(ds);
                 }