From ccb53f441fc0a6582a7f6dbe310bd89a714e3ea1 Mon Sep 17 00:00:00 2001
From: Aaron Schrab <aaron@schrab.com>
Date: Mon, 27 Feb 2017 19:42:50 -0500
Subject: [PATCH] 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.
---
 src/_openssl | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/_openssl b/src/_openssl
index 1c48650..1d5ec38 100644
--- a/src/_openssl
+++ b/src/_openssl
@@ -27,8 +27,6 @@
 # ------------------------------------------------------------------------------
 
 # 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() {
   local openssl_commands cmd cmds
@@ -37,15 +35,7 @@ _openssl() {
     return
   elif [[ "$CURRENT" -eq 2 ]]; then
     # first parameter, the command
-    openssl_commands=(${(f)"$(openssl list-standard-commands; \
-                              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)
+    openssl_commands=(${(z)${${(f)"$(openssl help 2>&1)"}:#([A-Z]|openssl:Error:)*}})
     _describe 'openssl commands' openssl_commands
   else
     # $CURRENT -gt 2
@@ -66,12 +56,12 @@ _openssl() {
       shift words
       (( CURRENT-- ))
       _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
       shift words
       (( CURRENT-- ))
       _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
       shift words
       (( CURRENT-- ))