[ Tollef Fog Heen ]
* Add totpSeed to LDAP schema.
* Add support for changing TOTP seed by mailing ud-mailgate.
+ * Fix ud-mailgate to handle the SHA256:$fingerprint output format that
+ stretch's ssh-keygen has switched to.
-- Paul Wise <pabs@debian.org> Sat, 17 Jun 2017 14:38:00 +0800
DNS = {}
ValidHostNames = [] # will be initialized in later
-SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
+SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}|SHA256:[0-9A-Za-z/+]{43}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
GenderTable = {"male": '1',
Subst["__USER__"] = uid
Match = SSHFingerprint.match(output)
+ if Match is None:
+ return "Failed to match SSH fingerprint, has the output of ssh-keygen changed?"
g = Match.groups()
key_size = g[0]
fingerprint = g[1]