summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_telnet15
2 files changed, 19 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 82a0fcf76..f391bce0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-08-23 Peter Stephenson <pws@csr.com>
+ * Aaron Schrab: 30636: Completion/Unix/Command/_telnet:
+ telnet-ssl options.
+
* Aaron Schrab: 30637: Completion/Unix/Command/_telnet: -b option
* Aaron Schrab: 30638: Completion/Unix/Command/_telnet: IPv4
@@ -105,5 +108,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5708 $
+* $Revision: 1.5709 $
*****************************************************
diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index 81ccfa4f8..c7ab34f98 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -38,6 +38,7 @@ if (( ! $+_telnet_args )); then
'*\[-noasynch\]*' '-noasynch'
'*\[-noasyncnet\]*' '-noasyncnet'
'*\[-noasynctty\]*' '-noasynctty'
+ '*\[-z ssl\]*' '*-z[SSL parameters]:SSL parameter:->ssl'
)
_telnet_args=($optionmap[(K)"$help"])
(( $#_telnet_args )) || _telnet_args=( '-l+[specify user]:user:->users' )
@@ -49,6 +50,20 @@ _arguments -C -s \
':port:->ports' && ret=0
case "$state" in
+ssl)
+ _values -w 'SSL parameter' \
+ 'debug[Send SSL debugging info to stderr]' \
+ '(nossl)ssl[Negotiate SSL connection]' \
+ '(ssl)nossl[Switch off SSL negotiation]' \
+ 'certrequired[Require server certificate]' \
+ 'secure[No fallback to unencrypted mode]' \
+ 'verbose[Be verbose about certificates, etc.]' \
+ 'verify[Set SSL verify flags]:int:' \
+ 'cert[Specify certificate file]:certificate file:_path_files' \
+ 'key[Specify key file]:key file:_path_files' \
+ 'cipher[Set preferred cipher list]:ciphers:'
+ ;;
+
hosts)
_wanted hosts expl host \
_combination -s '[@:]' '' users-hosts-ports \