[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  96e0445195e22f27c661ca4cd57c1caa52b6abb4 (commit)
      from  c9741726c1d3476beed071005770a71464f273b9 (commit)


- Log -----------------------------------------------------------------
commit 96e0445195e22f27c661ca4cd57c1caa52b6abb4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jun 24 13:16:30 2020 +0200

    apps/openssl: clean-up of unused fallback code
    
    Remove code in help_main() that duplicates the case when 'openssl' is
    called with no arguments, which is now handled in main().
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/12295)

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

Summary of changes:
 apps/openssl.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 3593c2b9f2..a1b4443e4b 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -312,12 +312,6 @@ int help_main(int argc, char **argv)
     DISPLAY_COLUMNS dc;
     char *new_argv[3];
 
-    if (argc == 0) {
-        new_argv[0] = "help";
-        new_argv[1] = NULL;
-        return do_cmd(prog_init(), 1, new_argv);
-    }
-
     prog = opt_init(argc, argv, help_options);
     while ((o = opt_next()) != OPT_hEOF) {
         switch (o) {