projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
983bd4b
)
Modify the SSH1 key check so it matches all RSA1 keys, not only those of size 1024
author
Joerg Jaspert
<joerg@debian.org>
Thu, 15 May 2008 21:35:13 +0000
(23:35 +0200)
committer
Joerg Jaspert
<joerg@debian.org>
Thu, 15 May 2008 21:35:13 +0000
(23:35 +0200)
ud-mailgate
patch
|
blob
|
history
diff --git
a/ud-mailgate
b/ud-mailgate
index
51942f1
..
b158ba8
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-30,6
+30,7
@@
SeenList = {}
DNS = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
DNS = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHRSA1Match = re.compile('^\d+ (\d+) \d+ .*')
ArbChanges = {"c": "..",
"l": ".*",
ArbChanges = {"c": "..",
"l": ".*",
@@
-241,9
+242,9
@@
def DoSSH(Str, Attrs, badkeys, uid):
g = Match.groups()
typekey = g[1]
if Match == None:
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:
if Match is not None:
- return "
SSH
1 keys not supported anymore"
+ return "
RSA
1 keys not supported anymore"
return None;
(fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
return None;
(fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")