From 4271e2ed172a016e9455f0e43b628a744907ce63 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Sun, 3 Feb 2013 19:00:31 -0800 Subject: Remove J2ME compatibility layer for keys Use JCE instead of the DIY crypto library that is in Trilead. This was apparently for J2ME devices. Well, I'm sorry, J2ME devices, you're dead to me. --- lib/src/main/java/com/trilead/ssh2/Connection.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/src/main/java/com/trilead/ssh2/Connection.java') diff --git a/lib/src/main/java/com/trilead/ssh2/Connection.java b/lib/src/main/java/com/trilead/ssh2/Connection.java index 98e5fdd..c1e8711 100644 --- a/lib/src/main/java/com/trilead/ssh2/Connection.java +++ b/lib/src/main/java/com/trilead/ssh2/Connection.java @@ -7,7 +7,10 @@ import java.io.FileReader; import java.io.IOException; import java.net.InetSocketAddress; import java.net.SocketTimeoutException; +import java.security.KeyPair; import java.security.SecureRandom; +import java.security.Security; +import java.util.Set; import java.util.Vector; import com.trilead.ssh2.auth.AuthenticationManager; @@ -473,7 +476,7 @@ public class Connection * @return whether the connection is now authenticated. * @throws IOException */ - public synchronized boolean authenticateWithPublicKey(String user, Object key) + public synchronized boolean authenticateWithPublicKey(String user, KeyPair pair) throws IOException { if (tm == null) @@ -491,10 +494,10 @@ public class Connection if (user == null) throw new IllegalArgumentException("user argument is null"); - if (key == null) - throw new IllegalArgumentException("Key argument is null"); + if (pair == null) + throw new IllegalArgumentException("Key pair argument is null"); - authenticated = am.authenticatePublicKey(user, key, getOrCreateSecureRND()); + authenticated = am.authenticatePublicKey(user, pair, getOrCreateSecureRND()); return authenticated; } -- cgit v1.2.3