summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2015-11-24 09:55:58 +0100
committerMartin Basti <mbasti@redhat.com>2015-12-01 09:41:52 +0100
commitfa62480c73ccb860c8c8b4cd110b0782eb4883d5 (patch)
tree16c11da698109e527dfbc3395e65e11af3580a6f /ipapython
parentf6240f21fc9ae2ade54acedf98770e5f5e433d38 (diff)
downloadfreeipa-fa62480c73ccb860c8c8b4cd110b0782eb4883d5.tar.gz
freeipa-fa62480c73ccb860c8c8b4cd110b0782eb4883d5.tar.xz
freeipa-fa62480c73ccb860c8c8b4cd110b0782eb4883d5.zip
ipa-client-install: add support for Ed25519 SSH keys (RFC 7479)
https://fedorahosted.org/freeipa/ticket/5471 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/ssh.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ipapython/ssh.py b/ipapython/ssh.py
index a625c422c..daa44bdd9 100644
--- a/ipapython/ssh.py
+++ b/ipapython/ssh.py
@@ -203,6 +203,8 @@ class SSHPublicKey(object):
keytype = 2
elif self._keytype.startswith('ecdsa-sha2-') and '@' not in self._keytype:
keytype = 3
+ elif self._keytype == 'ssh-ed25519':
+ keytype = 4
else:
return
fp = fpfunc(self._key).hexdigest().upper()