[PATCH 1/1] autocompletion: make ssh aware of ed25519

[PATCH 1/1] autocompletion: make ssh aware of ed25519

[Christian Hesse]

---
 Completion/Unix/Command/_ssh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 3e499b8..2be5672 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -108,7 +108,7 @@ _ssh () {
     _arguments \
       '-q[silence ssh-keygen]' \
       "($cmds -P)-b[specify number of bits in key]:bits in key" \
-      "($cmds -P)-t[specify the type of the key to create]:key type:(rsa1 rsa dsa ecdsa)" \
+      "($cmds -P)-t[specify the type of the key to create]:key type:(rsa1 rsa dsa ecdsa ed25519)" \
       "(${cmds#-p })-N[provide new passphrase]:new passphrase" \
       "($cmds -b -t)-C[provide new comment]:new comment" \
       '(-D)-f[key file]:key file:_files' \
@@ -223,6 +223,7 @@ _ssh () {
               'ecdsa-sha2-nistp256-cert-v01@openssh.com' \
               'ecdsa-sha2-nistp384-cert-v01@openssh.com' \
               'ecdsa-sha2-nistp521-cert-v01@openssh.com' \
+              'ssh-ed25519-cert-v01@openssh.com' \
               'ssh-rsa-cert-v01@openssh.com' \
               'ssh-dss-cert-v01@openssh.com' \
               'ssh-rsa-cert-v00@openssh.com' \
@@ -230,6 +231,7 @@ _ssh () {
               'ecdsa-sha2-nistp256' \
               'ecdsa-sha2-nistp384' \
               'ecdsa-sha2-nistp521' \
+              'ssh-ed25519' \
               'ssh-rsa' \
               'ssh-dss' && ret=0
           ;;
-- 
1.8.5.3

Re: [PATCH 1/1] autocompletion: make ssh aware of ed25519

[Christian Neukirchen]

Christian Hesse <mail@eworm.de> writes:

> @@ -223,6 +223,7 @@ _ssh () {
>                'ecdsa-sha2-nistp256-cert-v01@openssh.com' \
>                'ecdsa-sha2-nistp384-cert-v01@openssh.com' \
>                'ecdsa-sha2-nistp521-cert-v01@openssh.com' \
> +              'ssh-ed25519-cert-v01@openssh.com' \
>                'ssh-rsa-cert-v01@openssh.com' \
>                'ssh-dss-cert-v01@openssh.com' \
>                'ssh-rsa-cert-v00@openssh.com' \
> @@ -230,6 +231,7 @@ _ssh () {
>                'ecdsa-sha2-nistp256' \
>                'ecdsa-sha2-nistp384' \
>                'ecdsa-sha2-nistp521' \
> +              'ssh-ed25519' \
>                'ssh-rsa' \
>                'ssh-dss' && ret=0
>            ;;

Perhaps it would be better to parse the output of "ssh -Q cipher" and
"ssh -Q key", but "ssh -Q" is not supported by older versions of OpenSSH
(neither is ed25519 there...).

-- 
Christian Neukirchen  <chneukirchen@gmail.com>  http://chneukirchen.org

Re: [PATCH 1/1] autocompletion: make ssh aware of ed25519

[Axel Beckert]

Hi,

On Wed, Jan 29, 2014 at 04:51:18PM +0100, Christian Neukirchen wrote:
> Perhaps it would be better to parse the output of "ssh -Q cipher" and
> "ssh -Q key", but "ssh -Q" is not supported by older versions of OpenSSH
> (neither is ed25519 there...).

ed25519 is not yet supported by any released version of OpenSSH. It
will be supported by the upcoming 6.5 release.

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: [PATCH 1/1] autocompletion: make ssh aware of ed25519

[Phil Pennock]

On 2014-01-29 at 17:39 +0100, Axel Beckert wrote:
> On Wed, Jan 29, 2014 at 04:51:18PM +0100, Christian Neukirchen wrote:
> > Perhaps it would be better to parse the output of "ssh -Q cipher" and
> > "ssh -Q key", but "ssh -Q" is not supported by older versions of OpenSSH
> > (neither is ed25519 there...).
> 
> ed25519 is not yet supported by any released version of OpenSSH. It
> will be supported by the upcoming 6.5 release.

This is a suggestion without code/patch to back it up, so my voice
counts for very little, but ...

Perhaps a trade-off which avoids offering unusable completions to older
systems is to code for two modes: "ssh -Q supported" and "ssh -Q not
supported" and to _only_ statically configure in zsh's completion those
completion values which existed _before_ "ssh -Q" was added.  This
provides a finite bound to data-value churn in zsh's completion.

-Phil