[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  96786ad12308215621142f7cb2ef21a9aca30665 (commit)
      from  90cf3099df43a5419d59e6a66e75970cbb50a28a (commit)


- Log -----------------------------------------------------------------
commit 96786ad12308215621142f7cb2ef21a9aca30665
Author: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
Date:   Sat Jun 6 12:55:59 2020 +0200

    APPS: Fix invoking openssl without a command
    
    Invoking help with "empty" argc leads to a segfault.
    Invoke do_cmd() with help as argument which invokes help_main() with
    proper argv.
    
    Fixes #12069
    
    Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12070)

-----------------------------------------------------------------------

Summary of changes:
 apps/openssl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 4c97936824..fdf4a746f8 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -205,6 +205,8 @@ static void setup_trace(const char *str)
 }
 #endif /* OPENSSL_NO_TRACE */
 
+static char *help_argv[] = { "help" };
+
 int main(int argc, char *argv[])
 {
     FUNCTION f, *fp;
@@ -268,7 +270,7 @@ int main(int argc, char *argv[])
     /* If there's a command, run with that, otherwise "help". */
     ret = argc > 0
         ? do_cmd(prog, argc, argv)
-        : help_main(argc, argv);
+        : do_cmd(prog, 1, help_argv);
 
  end:
     app_providers_cleanup();