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>

diff --git a/CHANGES b/CHANGES
index d60d6555a9ac4a9b2e561cfdf4ee1fcd53e1ffdd..66e653e58ddd779ea553a98c5026e4b2683ded98 100644 (file)
--- 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 1cb5ace1af528833e9d2fdba1fa993451af9b8cc..2435e03f5b9724ee4e5bb3557ee60ba19111d390 100755 (executable)
--- 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 9987e79b2094133577d719345e787da0e2e6657e..ffcb279b66a7392a561442910bb1228601dec4db 100755 (executable)
--- 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 6ad41303241541642c65b635e17a9558143b7f14..93bb6fee7f588eacff0788f2926a35d3cae8c8af 100755 (executable)
--- 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 cd6e483aa77e1c8fe4861db7e93355b6bd3d1b32..16ef4ea6e9320fa70717bda22e019097c84263e1 100755 (executable)
--- 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 eaf37b61b4f66647bdeea9d9b99f910c20eb2b0b..850820d19029cfced539acee5f84dc3f64d1f04a 100755 (executable)
--- 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 f89bc87c266fafcbf347e76b5614ef87fac03f6d..02c9a3b3934958c408717c784e5b6d7ea504db8e 100755 (executable)
--- 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 27b5347feb8dab245cdcefb27b149d5cc6d0a81b..763b0af61d991e62e9089b59a929445c563b4aeb 100644 (file)
--- 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 5297be0d074c9d996c1eb1074915d0782aaa1a93..84d616d77883db86d29cb09dbcca6a8568622e1f 100644 (file)
--- 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';