[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0773687a2453c3553933a3627e798997abe41691 (commit)
      from  aecf529b0546adc9cfc199f23c64fbb32ff5ed56 (commit)


- Log -----------------------------------------------------------------
commit 0773687a2453c3553933a3627e798997abe41691
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Sep 23 12:29:20 2019 -0400

    Fix bugs in "info" commands flags
    
    Remove -c/-e/-m aliases, OpenSSL commands don't do that.
    Fix typo's in the documentation.
    Fix -module flag to print the right thing.
    
    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/9986)

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

Summary of changes:
 apps/info.c               |  6 +-----
 doc/man1/openssl-info.pod | 18 +++++++++---------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/info.c b/apps/info.c
index 4656141184..586917298d 100644
--- a/apps/info.c
+++ b/apps/info.c
@@ -20,12 +20,8 @@ typedef enum OPTION_choice {
 const OPTIONS info_options[] = {
     {"help", OPT_HELP, '-', "Display this summary"},
     {"configdir", OPT_CONFIGDIR, '-', "Default configuration file directory"},
-    {"c", OPT_CONFIGDIR, '-', "Default configuration file directory"},
     {"enginesdir", OPT_ENGINESDIR, '-', "Default engine module directory"},
-    {"e", OPT_ENGINESDIR, '-', "Default engine module directory"},
-    {"modulesdir", OPT_ENGINESDIR, '-',
-     "Default module directory (other than engine modules)"},
-    {"m", OPT_ENGINESDIR, '-',
+    {"modulesdir", OPT_MODULESDIR, '-',
      "Default module directory (other than engine modules)"},
     {"dsoext", OPT_DSOEXT, '-', "Configured extension for modules"},
     {"dirnamesep", OPT_DIRNAMESEP, '-', "Directory-filename separator"},
diff --git a/doc/man1/openssl-info.pod b/doc/man1/openssl-info.pod
index 637b60b267..80c2e1fa62 100644
--- a/doc/man1/openssl-info.pod
+++ b/doc/man1/openssl-info.pod
@@ -8,14 +8,14 @@ openssl-info - print OpenSSL built-in information
 
 B<openssl info>
 [B<-help>]
-[B<-configdir> | B<-c>]
-[B<-enginesdir> | B<-e>]
-[B<-modulesdir> | B<-m>]
+[B<-configdir>]
+[B<-enginesdir>]
+[B<-modulesdir> ]
 [B<-dsoext>]
 [B<-dirfilesep>]
-[B<-listsep]>
-[B<-seeds]>
-[B<-cpusettings]>
+[B<-listsep>]
+[B<-seeds>]
+[B<-cpusettings>]
 
 =head1 DESCRIPTION
 
@@ -34,15 +34,15 @@ command.
 
 Print out a usage message.
 
-=item B<-configdir>, B<-c>
+=item B<-configdir>
 
 Outputs the default directory for OpenSSL configuration files.
 
-=item B<-enginesdir>, B<-e>
+=item B<-enginesdir>
 
 Outputs the default directory for OpenSSL engine modules.
 
-=item B<-modulesdir>, B<-m>
+=item B<-modulesdir>
 
 Outputs the default directory for OpenSSL dynamically loadable modules
 other than engine modules.