diff options
| author | Kim <kim.sidney@gmail.com> | 2018-01-03 09:41:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 09:41:12 +0100 |
| commit | 2734d04448f47b8a9dc94a85ca5b7d67f2e93085 (patch) | |
| tree | d90f22cf5a5baa90119d71fa7653aaad1ad9a3c9 /scripts | |
| parent | 0ed8665760ac9cda8e910818f2d1234bd4b7477e (diff) | |
| parent | 5d1cc381b7fe904d0fd21941607b742d4d071206 (diff) | |
| download | vyatta-cfg-system-2734d04448f47b8a9dc94a85ca5b7d67f2e93085.tar.gz vyatta-cfg-system-2734d04448f47b8a9dc94a85ca5b7d67f2e93085.zip | |
Merge pull request #62 from phoenix0984/ecc
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 |