QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-28 02:34:40 +00:00
Code Issues Projects Releases Wiki Activity

Apps: change provider_path option to provider-path.

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

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12662)
This commit is contained in:
Pauli 2020-08-17 15:40:00 +10:00
parent 38145fba0a
commit c9dcbc0759
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/include/opt.h
View File

@ -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 \

2
doc/man1/openssl-fipsinstall.pod.in
View File

@ -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'

2
doc/man1/openssl.pod
View File

@ -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.

4
doc/perlvars.pm
View File

@ -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>.";

2
test/recipes/15-test_genrsa.t
View File

@ -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'));

2
test/recipes/15-test_rsaoaep.t
View File

@ -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',

2
test/recipes/20-test_enc.t
View File

@ -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 =

2
test/recipes/20-test_enc_more.t
View File

@ -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 =

6
test/recipes/80-test_cms.t
View File

@ -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);