Extend mkcert.sh to support nameConstraints generation and more complex

[openssl.git] / test / generate_ssl_tests.pl

diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl
index db8fc74d44f92cdd7876fb5af4261a160da42108..7a016d1fd91e6f7ba7553f0b8dda0ae371701dbf 100644 (file)
--- a/test/generate_ssl_tests.pl
+++ b/test/generate_ssl_tests.pl
@@ -43,12 +43,12 @@ sub print_templates {
     # Add the implicit base configuration.
     foreach my $test (@ssltests::tests) {
         $test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) };
-       # use server values if server2 is not defined
+       # Do not emit an empty "server2" section.
        if (defined $test->{"server2"}) {
-           $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server2"}}) };
-       } else {
-           $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server"}}) };
-       }
+            $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server2"}}) };
+        } else {
+            $test->{"server2"} = { };
+        }
         $test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) };
     }
 
@@ -98,8 +98,7 @@ sub print_templates {
 # Shamelessly copied from Configure.
 sub read_config {
     my $fname = shift;
-    open(INPUT, "< $fname")
-       or die "Can't open input file '$fname'!\n";
+    open(INPUT, "< $fname") or die "Can't open input file '$fname'!\n";
     local $/ = undef;
     my $content = <INPUT>;
     close(INPUT);