diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-06-10 00:39:22 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-06-13 16:03:06 +0200 |
commit | 81fc33c951b645f31727dc811e02200bde4a0982 (patch) | |
tree | 7b14f860635eb488254815300aecdf1792f46584 /test/handshake_helper.h | |
parent | a7be5759cf9d8e2bf7c1ecd0efa2d53aae9ab706 (diff) |
Clean up following new SNI tests
- Only send SNI in SNI tests. This allows us to test handshakes without
the SNI extension as well.
- Move all handshake-specific machinery to handshake_helper.c
- Use enum types to represent the enum everywhere
(Resorting to plain ints can end in sign mismatch when the enum is
represented by an unsigned type.)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/handshake_helper.h')
-rw-r--r-- | test/handshake_helper.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/handshake_helper.h b/test/handshake_helper.h index d04655a9ed..4a51ad4a6e 100644 --- a/test/handshake_helper.h +++ b/test/handshake_helper.h @@ -27,18 +27,15 @@ typedef struct handshake_result { int server_protocol; int client_protocol; /* Server connection */ - int servername; + ssl_servername_t servername; /* Session ticket status */ - int session_ticket; + ssl_session_ticket_t session_ticket; /* Was this called on the second context? */ int session_ticket_do_not_call; } HANDSHAKE_RESULT; /* Do a handshake and report some information about the result. */ -HANDSHAKE_RESULT do_handshake(SSL_CTX *server_ctx, SSL_CTX *client_ctx, - const SSL_TEST_CTX *test_ctx); - -int do_not_call_session_ticket_callback(SSL* s, unsigned char* key_name, unsigned char *iv, - EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc); +HANDSHAKE_RESULT do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, + SSL_CTX *client_ctx, const SSL_TEST_CTX *test_ctx); #endif /* HEADER_HANDSHAKE_HELPER_H */ |