From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 7 Dec 2014 09:47:45 +0000 (+0100)
Subject: ud-generate: support ssh-ed25519 keys for SSHFP records
X-Git-Tag: userdir-ldap-0.3.88~42
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=5d5082e5a5c38d95491d30f59ed0cb90973e786d

ud-generate: support ssh-ed25519 keys for SSHFP records
---

diff --git a/debian/changelog b/debian/changelog
index 911a0e3..dd8cf77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 userdir-ldap (0.3.86) UNRELEASED; urgency=medium
 
-  * 
+  * ud-generate: support ssh-ed25519 keys for SSHFP records.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 06 Dec 2014 10:25:30 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sun, 07 Dec 2014 10:47:17 +0100
 
 userdir-ldap (0.3.85) unstable; urgency=low
 
diff --git a/ud-generate b/ud-generate
index 4cd5d42..b438ece 100755
--- a/ud-generate
+++ b/ud-generate
@@ -886,10 +886,14 @@ def ExtractDNSInfo(x):
             Algorithm = 1
          if Split[0] == 'ssh-dss':
             Algorithm = 2
+         if Split[0] == 'ssh-ed25519':
+            Algorithm = 4
          if Algorithm == None:
             continue
          Fingerprint = hashlib.new('sha1', base64.decodestring(Split[1])).hexdigest()
          DNSInfo.append("%sIN\tSSHFP\t%u 1 %s" % (TTLprefix, Algorithm, Fingerprint))
+         Fingerprint = hashlib.new('sha256', base64.decodestring(Split[1])).hexdigest()
+         DNSInfo.append("%sIN\tSSHFP\t%u 2 %s" % (TTLprefix, Algorithm, Fingerprint))
 
    if 'architecture' in x[1]:
       Arch = GetAttr(x, "architecture")