From c9dcbc0759be1e733273cc0b5602bdbbd3542b27 Mon Sep 17 00:00:00 2001
From: Pauli <paul.dale@oracle.com>
Date: Mon, 17 Aug 2020 15:40:00 +1000
Subject: 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)
---
 test/recipes/15-test_genrsa.t   | 2 +-
 test/recipes/15-test_rsaoaep.t  | 2 +-
 test/recipes/20-test_enc.t      | 2 +-
 test/recipes/20-test_enc_more.t | 2 +-
 test/recipes/80-test_cms.t      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/recipes/15-test_genrsa.t b/test/recipes/15-test_genrsa.t
index b206267aad..90880be9fc 100644
--- 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 1b6fcb8e65..60d9b44f4f 100644
--- 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 488253b724..003b1fc344 100644
--- 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 b4fb009d58..27fc901a16 100644
--- 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 38028c291a..cdd5ec15a8 100644
--- 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);
 
-- 
cgit v1.2.3