machines.cgi: generate fingerprints for ecdsa-sha2-nistp256 ssh keys.

diff --git a/debian/changelog b/debian/changelog
index 7f478a2..789c46f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ userdir-ldap-cgi (0.3.3x) xnstable; urgency=low
   * cracklib-packer does not like '*' as input.  Filter it out in
     password-qualify-check.
   * Util.pm:UpgradeConnection(): properly concatenate strings.
+  * machines.cgi: generate fingerprints for ecdsa-sha2-nistp256 ssh keys.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 30 Oct 2011 17:40:45 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 23 Nov 2011 12:12:18 +0100
 
 userdir-ldap-cgi (0.3.32) unstable; urgency=low
 

diff --git a/machines.cgi b/machines.cgi
index 55fe5bc..b80d92e 100755 (executable)
--- a/machines.cgi
+++ b/machines.cgi
@@ -74,7 +74,8 @@ sub sshfingerprint {
     return '' if (!$key);
 
     my @field = split(/ /, $key);
-    return '' if $field[0] ne 'ssh-dss' and $field[0] ne 'ssh-rsa';
+    my %keytypes = map {$_=>1} (qw{ssh-dss ssh-rsa ecdsa-sha2-nistp256});
+    return '' unless $keytypes{$field[0]};
     return '' if !$field[1];
     my $fpr = md5_hex(decode_base64($field[1]));
     my $hrfpr = $field[0] . " " . substr($fpr,0,2,"");