From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 15 May 2008 21:35:13 +0000 (+0200)
Subject: Modify the SSH1 key check so it matches all RSA1 keys, not only those of size 1024
X-Git-Tag: userdir-ldap-0.3.24~10^2
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=0050d73a0bc648610b072c3a82a7bae0241d869c

Modify the SSH1 key check so it matches all RSA1 keys, not only those of size 1024
---

diff --git a/ud-mailgate b/ud-mailgate
index 51942f1..b158ba8 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -30,6 +30,7 @@ SeenList = {}
 DNS = {}
 
 SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*')
 
 ArbChanges = {"c": "..",
 	      "l": ".*",
@@ -241,9 +242,9 @@ def DoSSH(Str, Attrs, badkeys, uid):
    g = Match.groups()
    typekey = g[1]
    if Match == None:
-      Match = re.compile('^1024 (\d+) ').match(Str)
+      Match =SSHRSA1Match.match(Str)
       if Match is not None:
-         return "SSH1 keys not supported anymore"
+         return "RSA1 keys not supported anymore"
       return None;
 
    (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")