cloud-init-dev team mailing list archive

[Lars Kellogg-Stedman <lars@xxxxxxxxxx>]

Lars Kellogg-Stedman has proposed merging ~larsks/cloud-init:fedora/1151824 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1658174 in cloud-init: "cloud-init fails to disable ecdsa-sha2-nitp521 keys"
  https://bugs.launchpad.net/cloud-init/+bug/1658174

For more details, see:
https://code.launchpad.net/~larsks/cloud-init/+git/cloud-init/+merge/315263
-- 
Your team cloud init development team is requested to review the proposed merge of ~larsks/cloud-init:fedora/1151824 into cloud-init:master.

diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py
index be8a49e..b95b956 100644
--- a/cloudinit/ssh_util.py
+++ b/cloudinit/ssh_util.py
@@ -22,8 +22,11 @@ DEF_SSHD_CFG = "/etc/ssh/sshd_config"
 VALID_KEY_TYPES = (
     "dsa",
     "ecdsa",
+    "ecdsa-sha2-nistp256",
     "ecdsa-sha2-nistp256-cert-v01@xxxxxxxxxxx",
+    "ecdsa-sha2-nistp384",
     "ecdsa-sha2-nistp384-cert-v01@xxxxxxxxxxx",
+    "ecdsa-sha2-nistp521",
     "ecdsa-sha2-nistp521-cert-v01@xxxxxxxxxxx",
     "ed25519",
     "rsa",