Constify ...

[openssl.git] / test / ssl_test.tmpl

diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl
index b3c953a54b5c4854c50b99f253c957c29147cd9e..c9cc8de62bde2ea36a1b1f8e18082891c17cd615 100644 (file)
--- a/test/ssl_test.tmpl
+++ b/test/ssl_test.tmpl
@@ -3,22 +3,56 @@ ssl_conf = {-$testname-}-ssl
 
 [{-$testname-}-ssl]
 server = {-$testname-}-server
-client = {-$testname-}-client
+client = {-$testname-}-client{-
+    # The following sections are optional.
+    $OUT = "";
+    if (%server2) {
+        $OUT .= "\nserver2 = $testname-server2";
+    } elsif ($reuse_server2) {
+        $OUT .= "\nserver2 = $testname-server";
+    }
+    if (%resume_server) {
+        $OUT .= "\nresume-server = $testname-resume-server";
+    } elsif ($reuse_resume_server) {
+        $OUT .= "\nresume-server = $testname-server";
+    }
+    if (%resume_client) {
+        $OUT .= "\nresume-client = $testname-resume-client";
+    } elsif ($reuse_resume_client) {
+        $OUT .= "\nresume-client = $testname-client";
+    }
+-}
 
 [{-$testname-}-server]
 {-
     foreach my $key (sort keys %server) {
         $OUT .= qq{$key} . " = " . qq{$server{$key}\n} if defined $server{$key};
     }
+    if (%server2) {
+        $OUT .= "\n[$testname-server2]\n";
+        foreach my $key (sort keys %server2) {
+            $OUT .= qq{$key} . " = " . qq{$server2{$key}\n} if defined $server2{$key};
+        }
+    }
+    if (%resume_server) {
+        $OUT .= "\n[$testname-resume-server]\n";
+        foreach my $key (sort keys %resume_server) {
+            $OUT .= qq{$key} . " = " . qq{$resume_server{$key}\n} if defined $resume_server{$key};
+        }
+    }
 -}
-
 [{-$testname-}-client]
 {-
     foreach my $key (sort keys %client) {
         $OUT .= qq{$key} . " = " . qq{$client{$key}\n} if defined $client{$key};
     }
+    if (%resume_client) {
+        $OUT .= "\n[$testname-resume-client]\n";
+        foreach my $key (sort keys %resume_client) {
+            $OUT .= qq{$key} . " = " . qq{$resume_client{$key}\n} if defined $resume_client{$key};
+        }
+    }
 -}
-
 [test-{-$idx-}]
 {-
     foreach my $key (sort keys %test) {