diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-03-17 15:14:30 +0100 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-04-05 13:44:46 +0200 |
commit | 453dfd8d5ee0893146e0fb61a5978ab59ba95c01 (patch) | |
tree | 6ada91599f4ebe125be3d34a69716b23a0688b05 /test/ssl_test.tmpl | |
parent | Fix a shadow symbol warning (diff) | |
download | openssl-453dfd8d5ee0893146e0fb61a5978ab59ba95c01.tar.xz openssl-453dfd8d5ee0893146e0fb61a5978ab59ba95c01.zip |
New SSL test framework
Currently, SSL tests are configured via command-line switches to
ssltest.c. This results in a lot of duplication between ssltest.c and
apps, and a complex setup. ssltest.c is also simply old and needs
maintenance.
Instead, we already have a way to configure SSL servers and clients, so
we leverage that. SSL tests can now be configured from a configuration
file. Test servers and clients are configured using the standard
ssl_conf module. Additional test settings are configured via a test
configuration.
Moreover, since the CONF language involves unnecessary boilerplate, the
test conf itself is generated from a shorter Perl syntax.
The generated testcase files are checked in to the repo to make
it easier to verify that the intended test cases are in fact run; and to
simplify debugging failures.
To demonstrate the approach, min/max protocol tests are converted to the
new format. This change also fixes MinProtocol and MaxProtocol
handling. It was previously requested that an SSL_CTX have both the
server and client flags set for these commands; this clearly can never work.
Guide to this PR:
- test/ssl_test.c - test framework
- test/ssl_test_ctx.* - test configuration structure
- test/handshake_helper.* - new SSL test handshaking code
- test/ssl-tests/ - test configurations
- test/generate_ssl_tests.pl - script for generating CONF-style test
configurations from perl inputs
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/ssl_test.tmpl')
-rw-r--r-- | test/ssl_test.tmpl | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl new file mode 100644 index 0000000000..b3c953a54b --- /dev/null +++ b/test/ssl_test.tmpl @@ -0,0 +1,27 @@ +[{-$testname-}] +ssl_conf = {-$testname-}-ssl + +[{-$testname-}-ssl] +server = {-$testname-}-server +client = {-$testname-}-client + +[{-$testname-}-server] +{- + foreach my $key (sort keys %server) { + $OUT .= qq{$key} . " = " . qq{$server{$key}\n} if defined $server{$key}; + } +-} + +[{-$testname-}-client] +{- + foreach my $key (sort keys %client) { + $OUT .= qq{$key} . " = " . qq{$client{$key}\n} if defined $client{$key}; + } +-} + +[test-{-$idx-}] +{- + foreach my $key (sort keys %test) { + $OUT .= qq{$key} ." = " . qq{$test{$key}\n} if defined $test{$key}; + } +-} |