diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-04-07 19:07:50 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2016-05-12 19:02:42 +0200 |
| commit | a263f320ebdb32ccc058ef02a617edbfe4a63e7f (patch) | |
| tree | aa0e8b9d93f591a7752cc312053d9333caecae33 /test/ssl_test_ctx.h | |
| parent | d82c27589b5f9e9128f1ae9fce89fadd03c1c229 (diff) | |
| download | openssl-a263f320ebdb32ccc058ef02a617edbfe4a63e7f.tar.gz | |
Remove proxy tests. Add verify callback tests.
The old proxy tests test the implementation of an application proxy
policy callback defined in the test itself, which is not particularly
useful.
It is, however, useful to test cert verify overrides in
general. Therefore, replace these tests with tests for cert verify
callback behaviour.
Also glob the ssl test inputs on the .in files to catch missing
generated files.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/ssl_test_ctx.h')
| -rw-r--r-- | test/ssl_test_ctx.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h index a183272b4e..9aaa4cea50 100644 --- a/test/ssl_test_ctx.h +++ b/test/ssl_test_ctx.h @@ -15,12 +15,18 @@ #include <openssl/ssl.h> typedef enum { - SSL_TEST_SUCCESS, /* Default */ + SSL_TEST_SUCCESS = 0, /* Default */ SSL_TEST_SERVER_FAIL, SSL_TEST_CLIENT_FAIL, SSL_TEST_INTERNAL_ERROR } ssl_test_result_t; +typedef enum { + SSL_TEST_VERIFY_NONE = 0, /* Default */ + SSL_TEST_VERIFY_ACCEPT_ALL, + SSL_TEST_VERIFY_REJECT_ALL +} ssl_verify_callback_t; + typedef struct ssl_test_ctx { /* Test expectations. */ /* Defaults to SUCCESS. */ @@ -34,11 +40,14 @@ typedef struct ssl_test_ctx { /* Negotiated protocol version. 0 if no expectation. */ /* See ssl.h for protocol versions. */ int protocol; + /* One of a number of predefined custom callbacks. */ + ssl_verify_callback_t client_verify_callback; } SSL_TEST_CTX; -const char *ssl_test_result_t_name(ssl_test_result_t result); +const char *ssl_test_result_name(ssl_test_result_t result); const char *ssl_alert_name(int alert); const char *ssl_protocol_name(int protocol); +const char *ssl_verify_callback_name(ssl_verify_callback_t verify_callback); /* * Load the test case context from |conf|. |