diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2017-01-20 14:32:08 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-24 12:01:17 -0500 |
| commit | 853df0a0e85002582694b88db886f206f64b23c7 (patch) | |
| tree | 01b613ca6a87c76fe3792540febf6720356235cd /cloudinit/ssh_util.py | |
| parent | d3fbb5df017c7a6e0eb1a146d970db260932d7e8 (diff) | |
| download | vyos-cloud-init-853df0a0e85002582694b88db886f206f64b23c7.tar.gz vyos-cloud-init-853df0a0e85002582694b88db886f206f64b23c7.zip | |
Add 3 ecdsa-sha2-nistp* ssh key types now that they are standardized
cloud-init adds ssh_authorized_keys to the default user and to
root but for root it disables the keys with a prefix command.
However, if the public_key key is of type ecdsa-sha2-nistp521,
it is not parsed correctly, and the prefix command is not prepended.
Resolves: rhbz#1151824
LP: #1658174
Diffstat (limited to 'cloudinit/ssh_util.py')
| -rw-r--r-- | cloudinit/ssh_util.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py index be8a49e8..b95b956f 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@openssh.com", + "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp384-cert-v01@openssh.com", + "ecdsa-sha2-nistp521", "ecdsa-sha2-nistp521-cert-v01@openssh.com", "ed25519", "rsa", |