Merge pull request #6223 from lvh/patch-2

Support ssh-ed25519 keys

Merge pull request #6223 from lvh/patch-2
Support ssh-ed25519 keys
9d3a344c · Michael DeHaan · 57486b26 · 80e2c597 · 9d3a344c
Commit 9d3a344c authored Feb 28, 2014 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 0 deletions

library/system/authorized_key
+1 -0

No files found.
--- a/library/system/authorized_key
+++ b/library/system/authorized_key
@@ -236,6 +236,7 @@ def parsekey(module, raw_key):
    '''

    VALID_SSH2_KEY_TYPES = [
+        'ssh-ed25519',
        'ecdsa-sha2-nistp256',
        'ecdsa-sha2-nistp384',
        'ecdsa-sha2-nistp521',