ssh-keygen: New completion

completions/Makefile.am

@@ -320,6 +320,7 @@ bashcomp_DATA = 2to3 \
 		ssh \
 		ssh-add \
 		ssh-copy-id \
+		ssh-keygen \
 		sshfs \
 		sshmitm \
 		sshow \

completions/ssh-keygen

@@ -0,0 +1,48 @@
+# ssh-keygen(1) completion                                 -*- shell-script -*-
+
+_ssh_keygen()
+{
+    local cur prev words cword
+    _init_completion -n = || return
+
+    case $prev in
+        -a|-b|-C|-D|-I|-J|-j|-M|-N|-n|-r|-P|-S|-V|-W|-z)
+            return
+            ;;
+        -F|-R)
+            # TODO: trim this down to actual entries in known hosts files
+            _known_hosts_real "$cur"
+            return
+            ;;
+        -f|-G|-K|-s|-T)
+            _filedir
+            return
+            ;;
+        -m)
+            COMPREPLY=( $( compgen -W 'PEM PKCS8 RFC4716' -- "$cur" ) )
+            return
+            ;;
+        -O)
+            if [[ $cur != *=* ]]; then
+                COMPREPLY=( $( compgen -W 'clear force-command=
+                    no-agent-forwarding no-port-forwarding no-pty no-user-rc
+                    no-x11-forwarding permit-agent-forwarding
+                    permit-port-forwarding permit-pty permit-user-rc
+                    permit-x11-forwarding source-address=' -- "$cur" ) )
+                [[ $COMPREPLY == *= ]] && compopt -o nospace
+            fi
+            return
+            ;;
+        -t)
+            COMPREPLY=( $( compgen -W 'dsa ecdsa rsa rsa1' -- "$cur" ) )
+            return
+            ;;
+    esac
+
+    if [[ $cur == -* ]]; then
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" -? )' -- "$cur" ) )
+    fi
+} &&
+complete -F _ssh_keygen ssh-keygen
+
+# ex: ts=4 sw=4 et filetype=sh

test/completion/ssh-keygen.exp

@@ -0,0 +1 @@
+assert_source_completions ssh-keygen

test/lib/completions/ssh-keygen.exp

@@ -0,0 +1,18 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ssh-keygen -"
+sync_after_int
+
+
+teardown