/*
- * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
return 1;
}
+static int check_session_id(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
+{
+ if (test_ctx->session_id_expected == SSL_TEST_SESSION_ID_IGNORE)
+ return 1;
+ if (!TEST_int_eq(result->session_id, test_ctx->session_id_expected)) {
+ TEST_info("Client SessionIdExpected mismatch, expected %s, got %s\n.",
+ ssl_session_id_name(test_ctx->session_id_expected),
+ ssl_session_id_name(result->session_id));
+ return 0;
+ }
+ return 1;
+}
+
static int check_compression(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
{
if (!TEST_int_eq(result->compression, test_ctx->compression_expected))
return ret;
}
+static int check_session_ticket_app_data(HANDSHAKE_RESULT *result,
+ SSL_TEST_CTX *test_ctx)
+{
+ size_t result_len = 0;
+ size_t expected_len = 0;
+
+ /* consider empty and NULL strings to be the same */
+ if (result->result_session_ticket_app_data != NULL)
+ result_len = strlen(result->result_session_ticket_app_data);
+ if (test_ctx->expected_session_ticket_app_data != NULL)
+ expected_len = strlen(test_ctx->expected_session_ticket_app_data);
+ if (result_len == 0 && expected_len == 0)
+ return 1;
+
+ if (!TEST_str_eq(result->result_session_ticket_app_data,
+ test_ctx->expected_session_ticket_app_data))
+ return 0;
+
+ return 1;
+}
+
static int check_resumption(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
{
if (!TEST_int_eq(result->client_resumed, result->server_resumed))
result->client_ca_names);
}
+static int check_cipher(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx)
+{
+ if (test_ctx->expected_cipher == NULL)
+ return 1;
+ if (!TEST_ptr(result->cipher))
+ return 0;
+ if (!TEST_str_eq(test_ctx->expected_cipher,
+ result->cipher))
+ return 0;
+ return 1;
+}
+
/*
* This could be further simplified by constructing an expected
* HANDSHAKE_RESULT, and implementing comparison methods for
ret &= check_servername(result, test_ctx);
ret &= check_session_ticket(result, test_ctx);
ret &= check_compression(result, test_ctx);
+ ret &= check_session_id(result, test_ctx);
ret &= (result->session_ticket_do_not_call == 0);
#ifndef OPENSSL_NO_NEXTPROTONEG
ret &= check_npn(result, test_ctx);
#endif
+ ret &= check_cipher(result, test_ctx);
ret &= check_alpn(result, test_ctx);
+ ret &= check_session_ticket_app_data(result, test_ctx);
ret &= check_resumption(result, test_ctx);
ret &= check_tmp_key(result, test_ctx);
ret &= check_server_cert_type(result, test_ctx);
#ifndef OPENSSL_NO_DTLS
if (test_ctx->method == SSL_TEST_METHOD_DTLS) {
server_ctx = SSL_CTX_new(DTLS_server_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx,
+ DTLS_MAX_VERSION)))
+ goto err;
if (test_ctx->extra.server.servername_callback !=
SSL_TEST_SERVERNAME_CB_NONE) {
- server2_ctx = SSL_CTX_new(DTLS_server_method());
- TEST_check(server2_ctx != NULL);
+ if (!TEST_ptr(server2_ctx = SSL_CTX_new(DTLS_server_method())))
+ goto err;
}
client_ctx = SSL_CTX_new(DTLS_client_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx,
+ DTLS_MAX_VERSION)))
+ goto err;
if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) {
resume_server_ctx = SSL_CTX_new(DTLS_server_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx,
+ DTLS_MAX_VERSION)))
+ goto err;
resume_client_ctx = SSL_CTX_new(DTLS_client_method());
- TEST_check(resume_server_ctx != NULL);
- TEST_check(resume_client_ctx != NULL);
+ if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx,
+ DTLS_MAX_VERSION)))
+ goto err;
+ if (!TEST_ptr(resume_server_ctx)
+ || !TEST_ptr(resume_client_ctx))
+ goto err;
}
}
#endif
if (test_ctx->method == SSL_TEST_METHOD_TLS) {
server_ctx = SSL_CTX_new(TLS_server_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx,
+ TLS_MAX_VERSION)))
+ goto err;
/* SNI on resumption isn't supported/tested yet. */
if (test_ctx->extra.server.servername_callback !=
SSL_TEST_SERVERNAME_CB_NONE) {
- server2_ctx = SSL_CTX_new(TLS_server_method());
- TEST_check(server2_ctx != NULL);
+ if (!TEST_ptr(server2_ctx = SSL_CTX_new(TLS_server_method())))
+ goto err;
+ if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx,
+ TLS_MAX_VERSION)))
+ goto err;
}
client_ctx = SSL_CTX_new(TLS_client_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(client_ctx,
+ TLS_MAX_VERSION)))
+ goto err;
if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) {
resume_server_ctx = SSL_CTX_new(TLS_server_method());
+ if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx,
+ TLS_MAX_VERSION)))
+ goto err;
resume_client_ctx = SSL_CTX_new(TLS_client_method());
- TEST_check(resume_server_ctx != NULL);
- TEST_check(resume_client_ctx != NULL);
+ if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx,
+ TLS_MAX_VERSION)))
+ goto err;
+ if (!TEST_ptr(resume_server_ctx)
+ || !TEST_ptr(resume_client_ctx))
+ goto err;
}
}
- TEST_check(server_ctx != NULL);
- TEST_check(client_ctx != NULL);
-
- TEST_check(CONF_modules_load(conf, test_app, 0) > 0);
+ if (!TEST_ptr(server_ctx)
+ || !TEST_ptr(client_ctx)
+ || !TEST_int_gt(CONF_modules_load(conf, test_app, 0), 0))
+ goto err;
if (!SSL_CTX_config(server_ctx, "server")
|| !SSL_CTX_config(client_ctx, "client")) {
result = do_handshake(server_ctx, server2_ctx, client_ctx,
resume_server_ctx, resume_client_ctx, test_ctx);
- ret = check_test(result, test_ctx);
+ if (result != NULL)
+ ret = check_test(result, test_ctx);
err:
CONF_modules_unload(0);
return ret;
}
-int test_main(int argc, char **argv)
+int setup_tests(void)
{
- int result = 0;
long num_tests;
- if (argc != 2)
- return 1;
-
- conf = NCONF_new(NULL);
- TEST_check(conf != NULL);
-
- /* argv[1] should point to the test conf file */
- TEST_check(NCONF_load(conf, argv[1], NULL) > 0);
-
- TEST_check(NCONF_get_number_e(conf, NULL, "num_tests", &num_tests));
+ if (!TEST_ptr(conf = NCONF_new(NULL))
+ /* argv[1] should point to the test conf file */
+ || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)
+ || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests",
+ &num_tests), 0))
+ return 0;
- ADD_ALL_TESTS(test_handshake, (int)(num_tests));
- result = run_tests(argv[0]);
+ ADD_ALL_TESTS(test_handshake, (int)num_tests);
+ return 1;
+}
+void cleanup_tests(void)
+{
NCONF_free(conf);
- return result;
}
projects / openssl.git / blobdiff