From 1ad1f57886747362abb2e6f7eb91a221369eed35 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 6 Feb 2013 21:34:15 -0800 Subject: Add support for ECDSA P-384 and P-521 --- lib/src/main/java/com/trilead/ssh2/KnownHosts.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/src/main/java/com/trilead/ssh2/KnownHosts.java') diff --git a/lib/src/main/java/com/trilead/ssh2/KnownHosts.java b/lib/src/main/java/com/trilead/ssh2/KnownHosts.java index b88c1b9..3fba4da 100644 --- a/lib/src/main/java/com/trilead/ssh2/KnownHosts.java +++ b/lib/src/main/java/com/trilead/ssh2/KnownHosts.java @@ -117,7 +117,7 @@ public class KnownHosts publicKeys.add(new KnownHostsEntry(hostnames, dpk)); } } - else if ("ecdsa-sha2-nistp256".equals(serverHostKeyAlgorithm)) + else if (serverHostKeyAlgorithm.startsWith(ECDSASHA2Verify.ECDSA_SHA2_PREFIX)) { ECPublicKey epk = ECDSASHA2Verify.decodeSSHECDSAPublicKey(serverHostKey); @@ -465,7 +465,7 @@ public class KnownHosts private final boolean matchKeys(PublicKey key1, PublicKey key2) { - return key1.equals(key2); + return key1.equals(key2); } private final boolean pseudoRegex(char[] pattern, int i, char[] match, int j) @@ -600,9 +600,9 @@ public class KnownHosts { remoteKey = DSASHA1Verify.decodeSSHDSAPublicKey(serverHostKey); } - else if ("ecdsa-sha2-nistp256".equals(serverHostKeyAlgorithm)) + else if (serverHostKeyAlgorithm.startsWith("ecdsa-sha2-")) { - remoteKey = ECDSASHA2Verify.decodeSSHECDSAPublicKey(serverHostKey); + remoteKey = ECDSASHA2Verify.decodeSSHECDSAPublicKey(serverHostKey); } else throw new IllegalArgumentException("Unknown hostkey type " + serverHostKeyAlgorithm); @@ -719,7 +719,7 @@ public class KnownHosts throw new IllegalArgumentException("Unknown hash type " + type); } - if ("ecdsa-sha2-nistp256".equals(keyType)) + if (keyType.startsWith("ecdsa-sha2-")) { } else if ("ssh-rsa".equals(keyType)) -- cgit v1.2.3