From c9dcbc0759be1e733273cc0b5602bdbbd3542b27 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 17 Aug 2020 15:40:00 +1000 Subject: [PATCH] Apps: change provider_path option to provider-path. The applications use '-' in options not '_'. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12662) --- apps/include/opt.h | 2 +- doc/man1/openssl-fipsinstall.pod.in | 2 +- doc/man1/openssl.pod | 2 +- doc/perlvars.pm | 4 ++-- 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 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/include/opt.h b/apps/include/opt.h index ad629c0199..a35fe327cf 100644 --- 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 ec83e0950f..8120fd299a 100644 --- 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: Validate that the fips module can be loaded from a base configuration file: export OPENSSL_CONF_INCLUDE= - export OPENSSL_MODULES= + export OPENSSL_MODULES= openssl fipsinstall -config' 'default.cnf' diff --git a/doc/man1/openssl.pod b/doc/man1/openssl.pod index 384dfb2e72..2c56cc278c 100644 --- a/doc/man1/openssl.pod +++ b/doc/man1/openssl.pod @@ -777,7 +777,7 @@ Use the provider identified by I 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 +=item B<-provider-path> I Specify the search I that is used to locate provider modules. The format of I varies depending on the operating system being used. diff --git a/doc/perlvars.pm b/doc/perlvars.pm index 978c206e25..567cc0744a 100644 --- 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]\n" -. "[B<-provider_path> I]"; +. "[B<-provider-path> I]"; $OpenSSL::safe::opt_provider_item = "" . "=item B<-provider> I\n" . "\n" -. "=item B<-provider_path> I\n" +. "=item B<-provider-path> I\n" . "\n" . "See L."; 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);