mirror of https://github.com/openssl/openssl
Use $disabled{"dynamic-engine"} internally
We were kinda sorta using a mix of $disabled{"static-engine" and $disabled{"dynamic-engine"} in Configure. Let's avoid confusion, choose one of them and stick to it. Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
parent
2b9608b049
commit
19ab579060
2
CHANGES
2
CHANGES
|
@ -9,7 +9,7 @@
|
|||
only requirement for building dynamic engines is the presence of
|
||||
the DSO module, so configuring "disable-dso" will automatically
|
||||
disable dynamic engines. Dynamic engines are enabled by default,
|
||||
and can be disabled with "enable-static-engine".
|
||||
and can be disabled with "disable-dynamic-engine".
|
||||
This only applies to the engines in engines/, those in
|
||||
crypto/engine/ will always be built into libcrypto (i.e. "static").
|
||||
|
||||
|
|
20
Configure
20
Configure
|
@ -550,11 +550,11 @@ foreach (@argvcopy)
|
|||
}
|
||||
elsif ($1 eq "static-engine")
|
||||
{
|
||||
$disabled{"static-engine"} = "option";
|
||||
delete $disabled{"dynamic-engine"};
|
||||
}
|
||||
elsif ($1 eq "dynamic-engine")
|
||||
{
|
||||
delete $disabled{"static-engine"};
|
||||
$disabled{"dynamic-engine"} = "option";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -565,11 +565,11 @@ foreach (@argvcopy)
|
|||
{
|
||||
if ($1 eq "static-engine")
|
||||
{
|
||||
delete $disabled{"static-engine"};
|
||||
$disabled{"dynamic-engine"} = "option";
|
||||
}
|
||||
elsif ($1 eq "dynamic-engine")
|
||||
{
|
||||
$disabled{"static-engine"} = "option";
|
||||
delete $disabled{"dynamic-engine"};
|
||||
}
|
||||
my $algo = $1;
|
||||
delete $disabled{$algo};
|
||||
|
@ -766,7 +766,7 @@ foreach (sort (keys %disabled))
|
|||
{ $config{no_shared} = 1; }
|
||||
elsif (/^zlib$/)
|
||||
{ $zlib = 0; }
|
||||
elsif (/^static-engine$/)
|
||||
elsif (/^dynamic-engine$/)
|
||||
{ }
|
||||
elsif (/^zlib-dynamic$/)
|
||||
{ }
|
||||
|
@ -1004,12 +1004,12 @@ if ($target{shared_target} eq "")
|
|||
$config{no_shared} = 1;
|
||||
}
|
||||
|
||||
if ($disabled{"static-engine"}) {
|
||||
push @{$config{defines}}, "OPENSSL_NO_STATIC_ENGINE";
|
||||
$config{dynamic_engines} = 1;
|
||||
} else {
|
||||
if ($disabled{"dynamic-engine"}) {
|
||||
push @{$config{defines}}, "OPENSSL_NO_DYNAMIC_ENGINE";
|
||||
$config{dynamic_engines} = 0;
|
||||
} else {
|
||||
push @{$config{defines}}, "OPENSSL_NO_STATIC_ENGINE";
|
||||
$config{dynamic_engines} = 1;
|
||||
}
|
||||
|
||||
#
|
||||
|
@ -1385,7 +1385,7 @@ if ($builder eq "unified") {
|
|||
}
|
||||
|
||||
die <<"EOF" if scalar @engines and !$config{dynamic_engines};
|
||||
ENGINES can only be used if configured with 'static-enginex'.
|
||||
ENGINES can only be used if configured with 'dynamic-engine'.
|
||||
This is usually a fault in a build.info file.
|
||||
EOF
|
||||
foreach (@engines) {
|
||||
|
|
|
@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
|
@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
|
@ -65,7 +65,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
|
@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
plan skip_all => "dh is not supported by this OpenSSL build"
|
||||
if disabled("dh");
|
||||
|
|
|
@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
|
@ -65,7 +65,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
|
@ -64,7 +64,7 @@ plan skip_all => "TLSProxy isn't usable on $^O"
|
|||
if $^O =~ /^VMS$/;
|
||||
|
||||
plan skip_all => "$test_name needs the dynamic engine feature enabled"
|
||||
if disabled("engine") || disabled("dynamic_engines");
|
||||
if disabled("engine") || disabled("dynamic-engine");
|
||||
|
||||
$ENV{OPENSSL_ENGINES} = bldtop_dir("engines");
|
||||
$ENV{OPENSSL_ia32cap} = '~0x200000200000000';
|
||||
|
|
Loading…
Reference in New Issue