diff options
Diffstat (limited to 'test/ssl-tests')
| -rw-r--r-- | test/ssl-tests/03-custom_verify.cnf | 150 | ||||
| -rw-r--r-- | test/ssl-tests/03-custom_verify.cnf.in | 14 |
2 files changed, 103 insertions, 61 deletions
diff --git a/test/ssl-tests/03-custom_verify.cnf b/test/ssl-tests/03-custom_verify.cnf index 8dca715e74..e107b93b5b 100644 --- a/test/ssl-tests/03-custom_verify.cnf +++ b/test/ssl-tests/03-custom_verify.cnf @@ -1,16 +1,17 @@ # Generated with generate_ssl_tests.pl -num_tests = 9 +num_tests = 10 test-0 = 0-verify-success test-1 = 1-verify-custom-reject test-2 = 2-verify-custom-allow -test-3 = 3-noverify-success -test-4 = 4-noverify-ignore-custom-reject -test-5 = 5-noverify-accept-custom-allow -test-6 = 6-verify-fail-no-root -test-7 = 7-verify-custom-success-no-root -test-8 = 8-verify-custom-fail-no-root +test-3 = 3-verify-custom-retry +test-4 = 4-noverify-success +test-5 = 5-noverify-ignore-custom-reject +test-6 = 6-noverify-accept-custom-allow +test-7 = 7-verify-fail-no-root +test-8 = 8-verify-custom-success-no-root +test-9 = 9-verify-custom-fail-no-root # =========================================================== [0-verify-success] @@ -91,148 +92,175 @@ VerifyCallback = AcceptAll # =========================================================== -[3-noverify-success] -ssl_conf = 3-noverify-success-ssl +[3-verify-custom-retry] +ssl_conf = 3-verify-custom-retry-ssl -[3-noverify-success-ssl] -server = 3-noverify-success-server -client = 3-noverify-success-client +[3-verify-custom-retry-ssl] +server = 3-verify-custom-retry-server +client = 3-verify-custom-retry-client -[3-noverify-success-server] +[3-verify-custom-retry-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[3-noverify-success-client] +[3-verify-custom-retry-client] CipherString = DEFAULT +VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem +VerifyMode = Peer [test-3] ExpectedResult = Success +client = 3-verify-custom-retry-client-extra + +[3-verify-custom-retry-client-extra] +VerifyCallback = RetryOnce # =========================================================== -[4-noverify-ignore-custom-reject] -ssl_conf = 4-noverify-ignore-custom-reject-ssl +[4-noverify-success] +ssl_conf = 4-noverify-success-ssl -[4-noverify-ignore-custom-reject-ssl] -server = 4-noverify-ignore-custom-reject-server -client = 4-noverify-ignore-custom-reject-client +[4-noverify-success-ssl] +server = 4-noverify-success-server +client = 4-noverify-success-client -[4-noverify-ignore-custom-reject-server] +[4-noverify-success-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[4-noverify-ignore-custom-reject-client] +[4-noverify-success-client] CipherString = DEFAULT [test-4] ExpectedResult = Success -client = 4-noverify-ignore-custom-reject-client-extra -[4-noverify-ignore-custom-reject-client-extra] + +# =========================================================== + +[5-noverify-ignore-custom-reject] +ssl_conf = 5-noverify-ignore-custom-reject-ssl + +[5-noverify-ignore-custom-reject-ssl] +server = 5-noverify-ignore-custom-reject-server +client = 5-noverify-ignore-custom-reject-client + +[5-noverify-ignore-custom-reject-server] +Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem +CipherString = DEFAULT +PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem + +[5-noverify-ignore-custom-reject-client] +CipherString = DEFAULT + +[test-5] +ExpectedResult = Success +client = 5-noverify-ignore-custom-reject-client-extra + +[5-noverify-ignore-custom-reject-client-extra] VerifyCallback = RejectAll # =========================================================== -[5-noverify-accept-custom-allow] -ssl_conf = 5-noverify-accept-custom-allow-ssl +[6-noverify-accept-custom-allow] +ssl_conf = 6-noverify-accept-custom-allow-ssl -[5-noverify-accept-custom-allow-ssl] -server = 5-noverify-accept-custom-allow-server -client = 5-noverify-accept-custom-allow-client +[6-noverify-accept-custom-allow-ssl] +server = 6-noverify-accept-custom-allow-server +client = 6-noverify-accept-custom-allow-client -[5-noverify-accept-custom-allow-server] +[6-noverify-accept-custom-allow-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[5-noverify-accept-custom-allow-client] +[6-noverify-accept-custom-allow-client] CipherString = DEFAULT -[test-5] +[test-6] ExpectedResult = Success -client = 5-noverify-accept-custom-allow-client-extra +client = 6-noverify-accept-custom-allow-client-extra -[5-noverify-accept-custom-allow-client-extra] +[6-noverify-accept-custom-allow-client-extra] VerifyCallback = AcceptAll # =========================================================== -[6-verify-fail-no-root] -ssl_conf = 6-verify-fail-no-root-ssl +[7-verify-fail-no-root] +ssl_conf = 7-verify-fail-no-root-ssl -[6-verify-fail-no-root-ssl] -server = 6-verify-fail-no-root-server -client = 6-verify-fail-no-root-client +[7-verify-fail-no-root-ssl] +server = 7-verify-fail-no-root-server +client = 7-verify-fail-no-root-client -[6-verify-fail-no-root-server] +[7-verify-fail-no-root-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[6-verify-fail-no-root-client] +[7-verify-fail-no-root-client] CipherString = DEFAULT VerifyMode = Peer -[test-6] +[test-7] ExpectedClientAlert = UnknownCA ExpectedResult = ClientFail # =========================================================== -[7-verify-custom-success-no-root] -ssl_conf = 7-verify-custom-success-no-root-ssl +[8-verify-custom-success-no-root] +ssl_conf = 8-verify-custom-success-no-root-ssl -[7-verify-custom-success-no-root-ssl] -server = 7-verify-custom-success-no-root-server -client = 7-verify-custom-success-no-root-client +[8-verify-custom-success-no-root-ssl] +server = 8-verify-custom-success-no-root-server +client = 8-verify-custom-success-no-root-client -[7-verify-custom-success-no-root-server] +[8-verify-custom-success-no-root-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[7-verify-custom-success-no-root-client] +[8-verify-custom-success-no-root-client] CipherString = DEFAULT VerifyMode = Peer -[test-7] +[test-8] ExpectedResult = Success -client = 7-verify-custom-success-no-root-client-extra +client = 8-verify-custom-success-no-root-client-extra -[7-verify-custom-success-no-root-client-extra] +[8-verify-custom-success-no-root-client-extra] VerifyCallback = AcceptAll # =========================================================== -[8-verify-custom-fail-no-root] -ssl_conf = 8-verify-custom-fail-no-root-ssl +[9-verify-custom-fail-no-root] +ssl_conf = 9-verify-custom-fail-no-root-ssl -[8-verify-custom-fail-no-root-ssl] -server = 8-verify-custom-fail-no-root-server -client = 8-verify-custom-fail-no-root-client +[9-verify-custom-fail-no-root-ssl] +server = 9-verify-custom-fail-no-root-server +client = 9-verify-custom-fail-no-root-client -[8-verify-custom-fail-no-root-server] +[9-verify-custom-fail-no-root-server] Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem CipherString = DEFAULT PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem -[8-verify-custom-fail-no-root-client] +[9-verify-custom-fail-no-root-client] CipherString = DEFAULT VerifyMode = Peer -[test-8] +[test-9] ExpectedClientAlert = HandshakeFailure ExpectedResult = ClientFail -client = 8-verify-custom-fail-no-root-client-extra +client = 9-verify-custom-fail-no-root-client-extra -[8-verify-custom-fail-no-root-client-extra] +[9-verify-custom-fail-no-root-client-extra] VerifyCallback = RejectAll diff --git a/test/ssl-tests/03-custom_verify.cnf.in b/test/ssl-tests/03-custom_verify.cnf.in index 28b57216a1..a6b33ba4ca 100644 --- a/test/ssl-tests/03-custom_verify.cnf.in +++ b/test/ssl-tests/03-custom_verify.cnf.in @@ -51,6 +51,20 @@ our @tests = ( }, }, + # Same test as above but with a custom callback that requests retry once. + { + name => "verify-custom-retry", + server => { }, + client => { + extra => { + "VerifyCallback" => "RetryOnce", + }, + }, + test => { + "ExpectedResult" => "Success", + }, + }, + # Sanity-check that verification indeed succeeds if peer verification # is not requested. { |