From b44545fc006d066aae35b899242486d34d47d03b Mon Sep 17 00:00:00 2001 From: Raphael Geissert Date: Sun, 3 May 2015 20:56:25 +0200 Subject: [PATCH] Recognise ecdsa and ed25519 ssh keys Signed-off-by: Peter Palfrader --- userdir_ldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdir_ldap.py b/userdir_ldap.py index b559199..29e5e7b 100644 --- a/userdir_ldap.py +++ b/userdir_ldap.py @@ -84,7 +84,7 @@ GroupObjectClasses = ("top", "debianGroup") # SSH Key splitting. The result is: # (options,size,modulous,exponent,comment) SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$'); -SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) ?(.+)$'); +SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa|ecdsa-sha2-nistp(?:256|384|521)|ed25519) ([a-zA-Z0-9=/+]+) ?(.+)$'); #'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$'); AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>"); -- 2.20.1