Reorganize SSL test structures
authorEmilia Kasper <emilia@openssl.org>
Thu, 21 Jul 2016 14:29:48 +0000 (16:29 +0200)
committerEmilia Kasper <emilia@openssl.org>
Mon, 8 Aug 2016 10:06:26 +0000 (12:06 +0200)
commit9f48bbacd8cac8d08dff146db438ab3e19908a7a
tree7650dbd3d696d895c53b153a3d2b8c3881bade88
parenta4a18b2f891c59fd78ad520da79146af13063892
Reorganize SSL test structures

Move custom server and client options from the test dictionary to an
"extra" section of each server/client. Rename test expectations to say
"Expected".

This is a big but straightforward change. Primarily, this allows us to
specify multiple server and client contexts without redefining the
custom options for each of them. For example, instead of
"ServerNPNProtocols", "Server2NPNProtocols", "ResumeServerNPNProtocols",
we now have, "NPNProtocols".

This simplifies writing resumption and SNI tests. The first application
will be resumption tests for NPN and ALPN.

Regrouping the options also makes it clearer which options apply to the
server, which apply to the client, which configure the test, and which
are test expectations.

Reviewed-by: Richard Levitte <levitte@openssl.org>
28 files changed:
test/README.ssltest.md
test/generate_ssl_tests.pl
test/handshake_helper.c
test/ssl-tests/01-simple.conf
test/ssl-tests/01-simple.conf.in
test/ssl-tests/02-protocol-version.conf
test/ssl-tests/03-custom_verify.conf
test/ssl-tests/03-custom_verify.conf.in
test/ssl-tests/04-client_auth.conf
test/ssl-tests/04-client_auth.conf.in
test/ssl-tests/05-sni.conf
test/ssl-tests/05-sni.conf.in
test/ssl-tests/06-sni-ticket.conf
test/ssl-tests/06-sni-ticket.conf.in
test/ssl-tests/07-dtls-protocol-version.conf
test/ssl-tests/08-npn.conf
test/ssl-tests/08-npn.conf.in
test/ssl-tests/09-alpn.conf
test/ssl-tests/09-alpn.conf.in
test/ssl-tests/10-resumption.conf
test/ssl-tests/11-dtls_resumption.conf
test/ssl-tests/protocol_version.pm
test/ssl_test.c
test/ssl_test.tmpl
test/ssl_test_ctx.c
test/ssl_test_ctx.h
test/ssl_test_ctx_test.c
test/ssl_test_ctx_test.conf