xinb
/
zsh-completions
mirror of https://github.com/zsh-users/zsh-completions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support newer versions of OpenSSL 

With OpenSSL 1.1.0e (likely earlier as well) the `list-*` commands are
no longer supported causing completion to fail for subcommands and
arguments of digest and cipher subcommands.

Instead use the output of `openssl help`, removing the section headers
and splitting the list of commands which that displays.  Earlier
versions don't actually have a `help` subcommand but they did already
produce the same help output for unknown subcommands, just preceded with
an error message about the invalid command. This error message is
removed along with the section headers.

One use of the obsolete `list-cipher-algorithms` subcommand remains, but
it is in the completion for the `genpkey` subcommand which is also
obsolete.
This commit is contained in:
Aaron Schrab 2017-02-27 19:42:50 -05:00
parent 45aed46671
commit ccb53f441f
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/_openssl
View File

@ -27,8 +27,6 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# openssl command [ command_opts ] [ command_args ] # openssl command [ command_opts ] [ command_args ]
# pseudo commands:
# openssl [ list-standard-commands | list-message-digest-commands | list-cipher-commands | list-cipher-algorithms | list-message-digest-algorithms | list-public-key-algorithms]
_openssl() { _openssl() {
local openssl_commands cmd cmds local openssl_commands cmd cmds
@ -37,15 +35,7 @@ _openssl() {
return return
elif [[ "$CURRENT" -eq 2 ]]; then elif [[ "$CURRENT" -eq 2 ]]; then
# first parameter, the command # first parameter, the command
openssl_commands=(${(f)"$(openssl list-standard-commands; \ openssl_commands=(${(z)${${(f)"$(openssl help 2>&1)"}:#([A-Z]|openssl:Error:)*}})
openssl list-message-digest-commands; \
openssl list-cipher-commands)"} \
list-standard-commands \
list-message-digest-commands \
list-cipher-commands \
list-cipher-algorithms \
list-message-digest-algorithms \
list-public-key-algorithms)
_describe 'openssl commands' openssl_commands _describe 'openssl commands' openssl_commands
else else
# $CURRENT -gt 2 # $CURRENT -gt 2
@ -66,12 +56,12 @@ _openssl() {
shift words shift words
(( CURRENT-- )) (( CURRENT-- ))
_openssl_${cmd} _openssl_${cmd}
elif [[ "${${(@f)"$(openssl list-cipher-commands)"}[(r)$cmd]}" == "${cmd}" ]]; then elif [[ ${${=${"$(openssl help 2>&1)"/*Cipher commands[^)]#)/}}[(re)$cmd]} == "$cmd" ]]; then
# $cmd is a cipher command, which is practically an alias to enc # $cmd is a cipher command, which is practically an alias to enc
shift words shift words
(( CURRENT-- )) (( CURRENT-- ))
_openssl_enc _openssl_enc
elif [[ "${${(@f)"$(openssl list-message-digest-commands)"}[(r)$cmd]}" == "${cmd}" ]]; then elif [[ ${${=${${"$(openssl help 2>&1)"%%Cipher commands*}/*Message Digest commands[^)]#)/}}[(re)$cmd]} == "$cmd" ]]; then
# $cmd is a message digest command, which is practically an alias to dgst # $cmd is a message digest command, which is practically an alias to dgst
shift words shift words
(( CURRENT-- )) (( CURRENT-- ))