[openssl-dev] [openssl.org #4194] engine command regression in 1.1

[Rich Salz via RT]

The patch is wrong, this one is better.

diff --git a/apps/engine.c b/apps/engine.c
index c373df5..ab663ea 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -312,12 +312,17 @@ int engine_main(int argc, char **argv)
BIO *out;
const char *indent = " ";
OPTION_CHOICE o;
- char *prog;
+ char *prog, *argv1;

out = dup_bio_out(FORMAT_TEXT);
- prog = opt_init(argc, argv, engine_options);
if (!engines || !pre_cmds || !post_cmds)
goto end;
+ while ((argv1 = argv[1]) != NULL && *argv1 != '-') {
+ sk_OPENSSL_STRING_push(engines, *argv1);
+ argc--;
+ argv++;
+ }
+ prog = opt_init(argc, argv, engine_options);
while ((o = opt_next()) != OPT_EOF) {
switch (o) {
case OPT_EOF:

--
Rich Salz, OpenSSL dev team; rsalz at openssl.org