diff options
author | Rich Salz <rsalz@akamai.com> | 2021-05-21 13:26:33 -0400 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-06-15 12:36:51 +0200 |
commit | f4752e88272933777dbdbda31d00b388fa5a8e2d (patch) | |
tree | cac20c191b6964ce9cab26738abc4e2c58f1d487 /test/ssl-tests | |
parent | 60d13c8ff824720580db9665489832fb50f9e60a (diff) |
Move AllowClientRenegotiation tests
Move them from test_renegotiation to renegotiation in ssl_new
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15415)
Diffstat (limited to 'test/ssl-tests')
-rw-r--r-- | test/ssl-tests/17-renegotiate.cnf | 62 | ||||
-rw-r--r-- | test/ssl-tests/17-renegotiate.cnf.in | 32 |
2 files changed, 93 insertions, 1 deletions
diff --git a/test/ssl-tests/17-renegotiate.cnf b/test/ssl-tests/17-renegotiate.cnf index ac826af187..099d6d6f19 100644 --- a/test/ssl-tests/17-renegotiate.cnf +++ b/test/ssl-tests/17-renegotiate.cnf @@ -1,6 +1,6 @@ # Generated with generate_ssl_tests.pl -num_tests = 15 +num_tests = 17 test-0 = 0-renegotiate-client-no-resume test-1 = 1-renegotiate-client-resume @@ -17,6 +17,8 @@ test-11 = 11-no-renegotiation-server-by-server test-12 = 12-no-renegotiation-client-by-server test-13 = 13-no-renegotiation-client-by-client test-14 = 14-no-extms-on-renegotiation +test-15 = 15-allow-client-renegotiation +test-16 = 16-no-client-renegotiation # =========================================================== [0-renegotiate-client-no-resume] @@ -463,3 +465,61 @@ client = 14-no-extms-on-renegotiation-client-extra RenegotiateNoExtms = Yes +# =========================================================== + +[15-allow-client-renegotiation] +ssl_conf = 15-allow-client-renegotiation-ssl + +[15-allow-client-renegotiation-ssl] +server = 15-allow-client-renegotiation-server +client = 15-allow-client-renegotiation-client + +[15-allow-client-renegotiation-server] +Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +CipherString = DEFAULT +MaxProtocol = TLSv1.2 +PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem + +[15-allow-client-renegotiation-client] +CipherString = DEFAULT +MaxProtocol = TLSv1.2 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer + +[test-15] +ExpectedResult = Success +HandshakeMode = RenegotiateClient +Method = TLS +ResumptionExpected = Yes + + +# =========================================================== + +[16-no-client-renegotiation] +ssl_conf = 16-no-client-renegotiation-ssl + +[16-no-client-renegotiation-ssl] +server = 16-no-client-renegotiation-server +client = 16-no-client-renegotiation-client + +[16-no-client-renegotiation-server] +Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +CipherString = DEFAULT +MaxProtocol = TLSv1.2 +Options = -ClientRenegotiation +PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem + +[16-no-client-renegotiation-client] +CipherString = DEFAULT +MaxProtocol = TLSv1.2 +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer + +[test-16] +ExpectedResult = ClientFail +ExpectedServerAlert = NoRenegotiation +HandshakeMode = RenegotiateClient +Method = TLS +ResumptionExpected = No + + diff --git a/test/ssl-tests/17-renegotiate.cnf.in b/test/ssl-tests/17-renegotiate.cnf.in index ff3f74906a..86c858f786 100644 --- a/test/ssl-tests/17-renegotiate.cnf.in +++ b/test/ssl-tests/17-renegotiate.cnf.in @@ -261,6 +261,38 @@ our @tests_tls1_2 = ( "ResumptionExpected" => "No", "ExpectedResult" => "ServerFail" } + }, + { + name => "allow-client-renegotiation", + server => { + "MaxProtocol" => "TLSv1.2", + }, + client => { + "MaxProtocol" => "TLSv1.2" + }, + test => { + "Method" => "TLS", + "HandshakeMode" => "RenegotiateClient", + "ResumptionExpected" => "Yes", + "ExpectedResult" => "Success" + } + }, + { + name => "no-client-renegotiation", + server => { + "MaxProtocol" => "TLSv1.2", + "Options" => "-ClientRenegotiation" + }, + client => { + "MaxProtocol" => "TLSv1.2", + }, + test => { + "Method" => "TLS", + "HandshakeMode" => "RenegotiateClient", + "ResumptionExpected" => "No", + "ExpectedResult" => "ClientFail", + "ExpectedServerAlert" => "NoRenegotiation" + } } ); |