mirror of
https://github.com/openssl/openssl.git
synced 2025-01-06 13:26:43 +08:00
9f48bbacd8
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>
62 lines
1.2 KiB
Plaintext
62 lines
1.2 KiB
Plaintext
[ssltest_default]
|
|
|
|
[ssltest_good]
|
|
client = ssltest_good_client_extra
|
|
server = ssltest_good_server_extra
|
|
resume-server2 = ssltest_good_resume_server2_extra
|
|
|
|
Method = DTLS
|
|
HandshakeMode = Resume
|
|
|
|
ExpectedResult = ServerFail
|
|
ExpectedClientAlert = UnknownCA
|
|
ExpectedProtocol = TLSv1.1
|
|
ExpectedServerName = server2
|
|
SessionTicketExpected = Yes
|
|
ResumptionExpected = Yes
|
|
|
|
[ssltest_good_client_extra]
|
|
VerifyCallback = RejectAll
|
|
ServerName = server2
|
|
NPNProtocols = foo,bar
|
|
|
|
[ssltest_good_server_extra]
|
|
ServerNameCallback = IgnoreMismatch
|
|
BrokenSessionTicket = Yes
|
|
|
|
[ssltest_good_resume_server2_extra]
|
|
ALPNProtocols = baz
|
|
|
|
[ssltest_unknown_option]
|
|
UnknownOption = Foo
|
|
|
|
[ssltest_unknown_expected_result]
|
|
ExpectedResult = Foo
|
|
|
|
[ssltest_unknown_alert]
|
|
ServerAlert = Foo
|
|
|
|
[ssltest_unknown_protocol]
|
|
Protocol = Foo
|
|
|
|
[ssltest_unknown_verify_callback]
|
|
ClientVerifyCallback = Foo
|
|
|
|
[ssltest_unknown_servername]
|
|
ServerName = Foo
|
|
|
|
[ssltest_unknown_servername_callback]
|
|
ServerNameCallback = Foo
|
|
|
|
[ssltest_unknown_session_ticket_expected]
|
|
SessionTicketExpected = Foo
|
|
|
|
[ssltest_unknown_method]
|
|
Method = TLS2
|
|
|
|
[ssltest_unknown_handshake_mode]
|
|
HandshakeMode = Foo
|
|
|
|
[ssltest_unknown_resumption_expected]
|
|
ResumptionExpected = Foo
|