X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=test%2Fssl_test.tmpl;h=c9cc8de62bde2ea36a1b1f8e18082891c17cd615;hb=55e0d0b46206b4af377bba325acf8dba0fd50b3f;hp=31699183a1fd3e24f4bc8139cb5a056f2210207d;hpb=590ed3d7ea555b877859f6b491020112588fe1be;p=openssl.git diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl index 31699183a1..c9cc8de62b 100644 --- a/test/ssl_test.tmpl +++ b/test/ssl_test.tmpl @@ -2,17 +2,26 @@ ssl_conf = {-$testname-}-ssl [{-$testname-}-ssl] -server = {-$testname-}-server{- +server = {-$testname-}-server +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"; } -} -client = {-$testname-}-client [{-$testname-}-server] {- @@ -37,6 +46,12 @@ client = {-$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-}] {-