2
2
3
3
_comp_cmd_ssh__queries ()
4
4
{
5
- local queries=$( _comp_xfunc_ssh_query " $1 " help)
5
+ local queries=$( _comp_cmd_ssh__query " $1 " help)
6
6
[[ $queries ]] || queries=" cipher cipher-auth mac kex key key-cert
7
7
key-plain key-sig protocol-version compression sig ciphers macs
8
8
kexalgorithms pubkeyacceptedkeytypes hostkeyalgorithms
@@ -14,14 +14,24 @@ _comp_cmd_ssh__queries()
14
14
# TODO:API:rework to use vars rather than outputting
15
15
_comp_xfunc_ssh_query ()
16
16
{
17
- ${1 :- ssh} -Q " $2 " 2> /dev/null
17
+ _comp_cmd_ssh__query ssh " $1 "
18
18
}
19
19
20
- _comp_deprecate_func 2.12 _ssh_query _comp_xfunc_ssh_query
20
+ # @deprecated 2.12 use _comp_xfunc_ssh_query
21
+ _ssh_query ()
22
+ {
23
+ _comp_cmd_ssh__query " ${1:- ssh} " " $2 "
24
+ }
25
+
26
+ # TODO:API:rework to use vars rather than outputting
27
+ _comp_cmd_ssh__query ()
28
+ {
29
+ " $1 " -Q " $2 " 2> /dev/null
30
+ }
21
31
22
32
_comp_cmd_ssh__ciphers ()
23
33
{
24
- local ciphers=$( _comp_xfunc_ssh_query " $1 " cipher)
34
+ local ciphers=$( _comp_cmd_ssh__query " $1 " cipher)
25
35
[[ $ciphers ]] || ciphers=" 3des-cbc aes128-cbc aes192-cbc aes256-cbc
26
36
aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
27
37
blowfish-cbc cast128-cbc"
@@ -30,7 +40,7 @@ _comp_cmd_ssh__ciphers()
30
40
31
41
_comp_cmd_ssh__macs ()
32
42
{
33
- local macs=$( _comp_xfunc_ssh_query " $1 " mac)
43
+ local macs=$( _comp_cmd_ssh__query " $1 " mac)
34
44
[[
$macs ]]
|| macs=
" hmac-md5 hmac-sha1 [email protected] hmac-ripemd160
35
45
hmac-sha1-96 hmac-md5-96"
36
46
_comp_compgen -a -- -W " $macs "
@@ -70,7 +80,7 @@ _comp_xfunc_ssh_options()
70
80
GSSAPIKeyExchange GSSAPIRenewalForcesRekey GSSAPIServerIdentity
71
81
GSSAPITrustDns PubkeyAcceptedKeyTypes SmartcardDevice UsePrivilegedPort
72
82
)
73
- local protocols=$( _comp_xfunc_ssh_query " ${1 :- ssh} " protocol-version)
83
+ local protocols=$( _comp_cmd_ssh__query ssh protocol-version)
74
84
if [[ ! $protocols || $protocols == * 1* ]]; then
75
85
opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
76
86
RSAAuthentication)
@@ -135,7 +145,7 @@ _comp_cmd_ssh__suboption()
135
145
_comp_compgen_filedir
136
146
;;
137
147
casignaturealgorithms)
138
- COMPREPLY=($( compgen -W ' $(_comp_xfunc_ssh_query "$1" sig)' -- " $cur " ) )
148
+ COMPREPLY=($( compgen -W ' $(_comp_cmd_ssh__query "$1" sig)' -- " $cur " ) )
139
149
;;
140
150
cipher)
141
151
_comp_compgen -- -W ' blowfish des 3des'
@@ -157,10 +167,10 @@ _comp_cmd_ssh__suboption()
157
167
cs{0..7} ef lowdelay throughput reliability'
158
168
;;
159
169
hostbasedkeytypes | hostkeyalgorithms)
160
- COMPREPLY=($( compgen -W ' $(_comp_xfunc_ssh_query "$1" key)' -- " $cur " ) )
170
+ COMPREPLY=($( compgen -W ' $(_comp_cmd_ssh__query "$1" key)' -- " $cur " ) )
161
171
;;
162
172
kexalgorithms)
163
- COMPREPLY=($( compgen -W ' $(_comp_xfunc_ssh_query "$1" kex)' -- " $cur " ) )
173
+ COMPREPLY=($( compgen -W ' $(_comp_cmd_ssh__query "$1" kex)' -- " $cur " ) )
164
174
;;
165
175
loglevel)
166
176
_comp_compgen -- -W ' QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}'
@@ -176,7 +186,7 @@ _comp_cmd_ssh__suboption()
176
186
keyboard-interactive password' -- " $cur " ) )
177
187
;;
178
188
protocol)
179
- local protocols=($( _comp_xfunc_ssh_query " $1 " protocol-version) )
189
+ local protocols=($( _comp_cmd_ssh__query " $1 " protocol-version) )
180
190
[[ $protocols ]] || protocols=(1 2)
181
191
if (( ${# protocols[@]} > 1 )) ; then
182
192
_comp_compgen -- -W ' "${protocols[@]}"'
@@ -189,7 +199,7 @@ _comp_cmd_ssh__suboption()
189
199
_comp_compgen -- -c
190
200
;;
191
201
pubkeyacceptedalgorithms | pubkeyacceptedkeytypes)
192
- COMPREPLY=($( compgen -W ' $(_comp_xfunc_ssh_query "$1" key)' -- " $cur " ) )
202
+ COMPREPLY=($( compgen -W ' $(_comp_cmd_ssh__query "$1" key)' -- " $cur " ) )
193
203
;;
194
204
requesttty)
195
205
_comp_compgen -- -W ' no yes force auto'
0 commit comments