Mercurial > 510Connectbot

changeset 283:3855f58ffd2b 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 17:32:11 -0700
parents c3019725b123
children 4ec87de11e71
files src/ch/ethz/ssh2/auth/AuthenticationManager.java src/ch/ethz/ssh2/transport/ServerKexManager.java
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Fri Jul 18 17:19:41 2014 -0700
+++ b/src/ch/ethz/ssh2/auth/AuthenticationManager.java	Fri Jul 18 17:32:11 2014 -0700
@@ -200,7 +200,13 @@
         throw new PacketTypeException(type);
     }
 
-    public boolean authenticatePublicKey(String user, KeyPair pair, String password, SecureRandom rnd)
+    public boolean authenticatePublicKey(String user, char[] PEMPrivateKey, String password, SecureRandom rnd)
+    throws IOException {
+        KeyPair pair = PEMDecoder.decode(PEMPrivateKey, password);
+        return authenticatePublicKey(user, pair, rnd);
+    }
+
+    public boolean authenticatePublicKey(String user, KeyPair pair, SecureRandom rnd)
     throws IOException {
         PrivateKey key = pair.getPrivate();
         try {
--- a/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 17:19:41 2014 -0700
+++ b/src/ch/ethz/ssh2/transport/ServerKexManager.java	Fri Jul 18 17:32:11 2014 -0700
@@ -20,7 +20,7 @@
 import ch.ethz.ssh2.packets.Packets;
 import ch.ethz.ssh2.server.ServerConnectionState;
 import ch.ethz.ssh2.signature.DSASHA1Verify;
-import ch.ethz.ssh2.signature.ECDSASHA2Verify.java;
+import ch.ethz.ssh2.signature.ECDSASHA2Verify;
 import ch.ethz.ssh2.signature.RSASHA1Verify;
 
 /**