cloud-init-dev team mailing list archive

[Michael Felt <michael@xxxxxxxxxxxxx>]

Michael Felt has proposed merging ~aixtools/cloud-init:ssh_update into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~aixtools/cloud-init/+git/cloud-init/+merge/313377

Update the list of valid ssh keys (from openssh-7.3p1 ssh_keys.c)

** Do not know if this is a "known bug"
-- 
Your team cloud init development team is requested to review the proposed merge of ~aixtools/cloud-init:ssh_update into cloud-init:master.

diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index c74a7ae..0c15bb1 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -30,9 +30,11 @@ LOG = logging.getLogger(__name__)
 # See: man sshd_config
 DEF_SSHD_CFG = "/etc/ssh/sshd_config"
 
-# taken from openssh source key.c/key_type_from_name
+# taken from openssh source ssh_key.c:static const struct keytype keytypes[] = { ... }
 VALID_KEY_TYPES = (
-    "rsa", "dsa", "ssh-rsa", "ssh-dss", "ecdsa",
+    "rsa", "dsa", "ecdsa",
+    "ssh-rsa", "rsa-sha2-256", "rsa-sha2-512", "ssh-dss",
+    "ed25519", "ssh-ed25519", "ssh-ed25519-cert-v01@xxxxxxxxxxx",
     "ssh-rsa-cert-v00@xxxxxxxxxxx", "ssh-dss-cert-v00@xxxxxxxxxxx",
     "ssh-rsa-cert-v00@xxxxxxxxxxx", "ssh-dss-cert-v00@xxxxxxxxxxx",
     "ssh-rsa-cert-v01@xxxxxxxxxxx", "ssh-dss-cert-v01@xxxxxxxxxxx",