summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES2
-rwxr-xr-xConfigure20
-rwxr-xr-xtest/recipes/70-test_sslcertstatus.t2
-rwxr-xr-xtest/recipes/70-test_sslextension.t2
-rwxr-xr-xtest/recipes/70-test_sslsessiontick.t2
-rwxr-xr-xtest/recipes/70-test_sslskewith0p.t2
-rwxr-xr-xtest/recipes/70-test_sslvertol.t2
-rw-r--r--test/recipes/70-test_tlsextms.t2
-rw-r--r--test/recipes/90-test_networking.t2
9 files changed, 18 insertions, 18 deletions
diff --git a/CHANGES b/CHANGES
index d60d6555a9..66e653e58d 100644
--- a/CHANGES
+++ b/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").
diff --git a/Configure b/Configure
index 1cb5ace1af..2435e03f5b 100755
--- a/Configure
+++ b/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) {
diff --git a/test/recipes/70-test_sslcertstatus.t b/test/recipes/70-test_sslcertstatus.t
index 9987e79b20..ffcb279b66 100755
--- a/test/recipes/70-test_sslcertstatus.t
+++ b/test/recipes/70-test_sslcertstatus.t
@@ -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';
diff --git a/test/recipes/70-test_sslextension.t b/test/recipes/70-test_sslextension.t
index 6ad4130324..93bb6fee7f 100755
--- a/test/recipes/70-test_sslextension.t
+++ b/test/recipes/70-test_sslextension.t
@@ -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';
diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t
index cd6e483aa7..16ef4ea6e9 100755
--- a/test/recipes/70-test_sslsessiontick.t
+++ b/test/recipes/70-test_sslsessiontick.t
@@ -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';
diff --git a/test/recipes/70-test_sslskewith0p.t b/test/recipes/70-test_sslskewith0p.t
index eaf37b61b4..850820d190 100755
--- a/test/recipes/70-test_sslskewith0p.t
+++ b/test/recipes/70-test_sslskewith0p.t
@@ -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");
diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t
index f89bc87c26..02c9a3b393 100755
--- a/test/recipes/70-test_sslvertol.t
+++ b/test/recipes/70-test_sslvertol.t
@@ -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';
diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t
index 27b5347feb..763b0af61d 100644
--- a/test/recipes/70-test_tlsextms.t
+++ b/test/recipes/70-test_tlsextms.t
@@ -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';
diff --git a/test/recipes/90-test_networking.t b/test/recipes/90-test_networking.t
index 5297be0d07..84d616d778 100644
--- a/test/recipes/90-test_networking.t
+++ b/test/recipes/90-test_networking.t
@@ -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';
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 22:22:31 +0000