Mercurial > 510Connectbot
diff src/ch/ethz/ssh2/ServerConnection.java @ 287:db9b028016de ganymed
start conversion from trilead to ganymed
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Fri, 18 Jul 2014 19:52:08 -0700 |
| parents | b4ca341c318d |
| children | d2ee20d9dff1 |
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/ServerConnection.java Fri Jul 18 19:26:29 2014 -0700 +++ b/src/ch/ethz/ssh2/ServerConnection.java Fri Jul 18 19:52:08 2014 -0700 @@ -72,7 +72,7 @@ * @param dsa_key The DSA hostkey, may be <code>NULL</code> * @param rsa_key The RSA hostkey, may be <code>NULL</code> */ - public ServerConnection(Socket s, DSAPrivateKey dsa_key, RSAPrivateKey rsa_key) + public ServerConnection(Socket s, KeyPair dsa_key, KeyPair rsa_key) { state.s = s; state.softwareversion = softwareversion; @@ -208,7 +208,7 @@ * * @param dsa_hostkey */ - public synchronized void setDsaHostKey(DSAPrivateKey dsa_hostkey) + public synchronized void setDsaHostKey(KeyPair dsa_hostkey) { synchronized (state) { @@ -230,7 +230,7 @@ * * @param rsa_hostkey */ - public synchronized void setRsaHostKey(RSAPrivateKey rsa_hostkey) + public synchronized void setRsaHostKey(KeyPair rsa_hostkey) { synchronized (state) { @@ -252,7 +252,7 @@ */ public void setPEMHostKey(char[] pemdata, String password) throws IOException { - Object key = PEMDecoder.decode(pemdata, password); + PrivateKey key = PEMDecoder.decode(pemdata, password).getPrivate(); if (key instanceof DSAPrivateKey) setDsaHostKey((DSAPrivateKey) key);