From: Raphael Geissert <atomo64@gmail.com>
Date: Sun, 3 May 2015 18:56:25 +0000 (+0200)
Subject: Recognise ecdsa and ed25519 ssh keys
X-Git-Tag: userdir-ldap-0.3.88~31^2~3
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=b44545fc006d066aae35b899242486d34d47d03b

Recognise ecdsa and ed25519 ssh keys

Signed-off-by: Peter Palfrader <peter@palfrader.org>
---

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("(.*).*<([^@]*)@([^>]*)>");