diff options
author | Marcel Gisselmann <mg@affito.de> | 2017-10-18 13:10:56 +0200 |
---|---|---|
committer | Marcel Gisselmann <mg@affito.de> | 2017-10-18 13:10:56 +0200 |
commit | 5d1cc381b7fe904d0fd21941607b742d4d071206 (patch) | |
tree | 1d6e54e8b36a5b16643fcd26def6be9207837353 /scripts | |
parent | 11fffae1e985ed22d3ab6c437413e8c999b27ea9 (diff) | |
download | vyatta-cfg-system-5d1cc381b7fe904d0fd21941607b742d4d071206.tar.gz vyatta-cfg-system-5d1cc381b7fe904d0fd21941607b742d4d071206.zip |
Add ecc support to openssh
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/vyatta-load-user-key.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-load-user-key.pl b/scripts/vyatta-load-user-key.pl index 5c34b6ab..651a08b1 100755 --- a/scripts/vyatta-load-user-key.pl +++ b/scripts/vyatta-load-user-key.pl @@ -103,7 +103,7 @@ sub geturl { sub validate_keytype { my ($keytype) = @_; - if ($keytype eq 'ssh-rsa' || $keytype eq 'ssh-dss') { + if ($keytype eq 'ssh-rsa' || $keytype eq 'ssh-dss' || $keytype eq 'ecdsa-sha2-nistp256' || $keytype eq 'ecdsa-sha2-nistp384' || $keytype eq 'ecdsa-sha2-nistp521' || $keytype eq 'ssh-ed25519') { return 1; } return 0; @@ -135,7 +135,7 @@ sub getkeys { my $comment; $comment = join(' ', @fields); - die "Unknown key type $keytype : must be ssh-rsa or ssh-dss\n" + die "Unknown key type $keytype : must be one of ssh-rsa, ssh-dss, ecdsa-sha2-nistp* or ssh-ed25519\n" unless validate_keytype $keytype; my $cmd |