Apps: change provider_path option to provider-path.

The applications use '-' in options not '_'.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12662)

diff --git a/apps/include/opt.h b/apps/include/opt.h
index ad629c01996c8e6ddcbe3dff5c43dea5f8eef9dd..a35fe327cf5bd002c321f7b3c93922bacf23a099 100644 (file)
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -278,7 +278,7 @@
 
 # define OPT_PROV_OPTIONS \
         OPT_SECTION("Provider"), \
-        { "provider_path", OPT_PROV_PROVIDER_PATH, 's', "Provider load path (must be before 'provider' argument if required)" }, \
+        { "provider-path", OPT_PROV_PROVIDER_PATH, 's', "Provider load path (must be before 'provider' argument if required)" }, \
         { "provider", OPT_PROV_PROVIDER, 's', "Provider to load (can be specified multiple times)" }
 
 # define OPT_PROV_CASES \

diff --git a/doc/man1/openssl-fipsinstall.pod.in b/doc/man1/openssl-fipsinstall.pod.in
index ec83e0950fcda2deadfd4e5edc59472b3e392757..8120fd299a37f431dcc2e6895ef71a1cc086e411 100644 (file)
--- a/doc/man1/openssl-fipsinstall.pod.in
+++ b/doc/man1/openssl-fipsinstall.pod.in
@@ -179,7 +179,7 @@ Corrupt any self tests which have the description C<SHA1>:
 Validate that the fips module can be loaded from a base configuration file:
 
  export OPENSSL_CONF_INCLUDE=<path of configuration files>
- export OPENSSL_MODULES=<provider_path>
+ export OPENSSL_MODULES=<provider-path>
  openssl fipsinstall -config' 'default.cnf'
 
 

diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod
index 384dfb2e72472773f8ed7f4ac28a4c0c90dbf3ea..2c56cc278cb58cee563b6d2cfac600963f1d824f 100644 (file)
--- a/doc/man1/openssl.pod
+++ b/doc/man1/openssl.pod
@@ -777,7 +777,7 @@ Use the provider identified by I<name> and use all the methods it
 implements (algorithms, key storage, etc.).  This option can be specified
 multiple time to load more than one provider.
 
-=item B<-provider_path> I<path>
+=item B<-provider-path> I<path>
 
 Specify the search I<path> that is used to locate provider modules.  The format
 of I<path> varies depending on the operating system being used.

diff --git a/doc/perlvars.pm b/doc/perlvars.pm
index 978c206e25cf556e2f182b65c4a232a023e46a96..567cc0744a9fcf3bab9f7600e20831ed2fd9ade5 100644 (file)
--- a/doc/perlvars.pm
+++ b/doc/perlvars.pm
@@ -93,11 +93,11 @@ $OpenSSL::safe::opt_r_item = ""
 # Provider options
 $OpenSSL::safe::opt_provider_synopsis = ""
 . "[B<-provider> I<name>]\n"
-. "[B<-provider_path> I<path>]";
+. "[B<-provider-path> I<path>]";
 $OpenSSL::safe::opt_provider_item = ""
 . "=item B<-provider> I<name>\n"
 . "\n"
-. "=item B<-provider_path> I<path>\n"
+. "=item B<-provider-path> I<path>\n"
 . "\n"
 . "See L<openssl(1)/Provider Options>.";
 

diff --git a/test/recipes/15-test_genrsa.t b/test/recipes/15-test_genrsa.t
index b206267aadeebd10e00c24f8f377974fdb2dd978..90880be9fcadd1002b4c0b32e0e04f0f0d862e5d 100644 (file)
--- a/test/recipes/15-test_genrsa.t
+++ b/test/recipes/15-test_genrsa.t
@@ -119,7 +119,7 @@ ok(!run(app([ 'openssl', 'genpkey', '-algorithm', 'RSA',
 unless ($no_fips) {
     my $provconf = srctop_file("test", "fips.cnf");
     my $provpath = bldtop_dir("providers");
-    my @prov = ( "-provider_path", $provpath,
+    my @prov = ( "-provider-path", $provpath,
                  "-provider", "base",
                  "-config", $provconf);
     my $infile = bldtop_file('providers', platform->dso('fips'));

diff --git a/test/recipes/15-test_rsaoaep.t b/test/recipes/15-test_rsaoaep.t
index 1b6fcb8e653d33a2874411ba41aed78496fc1d57..60d9b44f4fccae85b4be24bc801f93614b23da48 100644 (file)
--- a/test/recipes/15-test_rsaoaep.t
+++ b/test/recipes/15-test_rsaoaep.t
@@ -39,7 +39,7 @@ my $dec3_file = "dec3.txt";
 my $key_file = srctop_file("test", "testrsa.pem");
 
 unless ($no_fips) {
-    @prov = ( "-provider_path", $provpath, "-config", $provconf );
+    @prov = ( "-provider-path", $provpath, "-config", $provconf );
     my $infile = bldtop_file('providers', platform->dso('fips'));
 
     ok(run(app(['openssl', 'fipsinstall',

diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index 488253b7247b3d9570ea86d9bce1dbc7b7000cbd..003b1fc344083ca8649b37c322b378aabfb06af7 100644 (file)
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -27,7 +27,7 @@ my $test = catfile(".", "p");
 
 my $cmd = "openssl";
 my $provpath = bldtop_dir("providers");
-my @prov = ("-provider_path", $provpath, "-provider", "default", "-provider", "legacy");
+my @prov = ("-provider-path", $provpath, "-provider", "default", "-provider", "legacy");
 
 my $ciphersstatus = undef;
 my @ciphers =

diff --git a/test/recipes/20-test_enc_more.t b/test/recipes/20-test_enc_more.t
index b4fb009d580184c0f01d873a9a158c3b99ae98f8..27fc901a1607a2c0660a2cd58c3bc9fc280bed5e 100644 (file)
--- a/test/recipes/20-test_enc_more.t
+++ b/test/recipes/20-test_enc_more.t
@@ -26,7 +26,7 @@ my $plaintext = catfile(".", "testdatafile");
 my $fail = "";
 my $cmd = "openssl";
 my $provpath = bldtop_dir("providers");
-my @prov = ("-provider_path", $provpath, "-provider", "default", "-provider", "legacy");
+my @prov = ("-provider-path", $provpath, "-provider", "default", "-provider", "legacy");
 
 my $ciphersstatus = undef;
 my @ciphers =

diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 38028c291afc4666bd9b74c4b962b6c14c23a350..cdd5ec15a8c8491ac800176121ca99aa20ac7f56 100644 (file)
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -33,10 +33,10 @@ plan skip_all => "CMS is not supported by this OpenSSL build"
 my $provpath = bldtop_dir("providers");
 
 # Some tests require legacy algorithms to be included.
-my @legacyprov = ("-provider_path", $provpath,
+my @legacyprov = ("-provider-path", $provpath,
                   "-provider", "default",
                   "-provider", "legacy" );
-my @defaultprov = ("-provider_path", $provpath,
+my @defaultprov = ("-provider-path", $provpath,
                    "-provider", "default");
 
 my @config = ( );
@@ -64,7 +64,7 @@ unless ($no_fips) {
 }
 
 $ENV{OPENSSL_TEST_LIBCTX} = "1";
-my @prov = ("-provider_path", $provpath,
+my @prov = ("-provider-path", $provpath,
             @config,
             "-provider", $provname);