#include "e_os.h"
#include "ssl_test_ctx.h"
#include "testutil.h"
+#include "test_main_custom.h"
#include <openssl/e_os2.h>
#include <openssl/err.h>
#include <openssl/conf.h>
if (!strings_equal("Client ALPNProtocols", client->alpn_protocols,
client2->alpn_protocols))
return 0;
+ if (client->ct_validation != client2->ct_validation) {
+ fprintf(stderr, "CTValidation mismatch: %s vs %s.\n",
+ ssl_ct_validation_name(client->ct_validation),
+ ssl_ct_validation_name(client2->ct_validation));
+ return 0;
+ }
return 1;
}
server->broken_session_ticket, server2->broken_session_ticket);
return 0;
}
+ if (server->cert_status != server2->cert_status) {
+ fprintf(stderr, "CertStatus mismatch: %s vs %s.\n",
+ ssl_certstatus_name(server->cert_status),
+ ssl_certstatus_name(server2->cert_status));
+ return 0;
+ }
return 1;
}
ssl_handshake_mode_name(ctx2->handshake_mode));
return 0;
}
+ if (ctx->app_data_size != ctx2->app_data_size) {
+ fprintf(stderr, "ApplicationData mismatch: %d vs %d.\n",
+ ctx->app_data_size, ctx2->app_data_size);
+ return 0;
+ }
+
+ if (ctx->max_fragment_size != ctx2->max_fragment_size) {
+ fprintf(stderr, "MaxFragmentSize mismatch: %d vs %d.\n",
+ ctx->max_fragment_size, ctx2->max_fragment_size);
+ return 0;
+ }
if (!SSL_TEST_EXTRA_CONF_equal(&ctx->extra, &ctx2->extra)) {
fprintf(stderr, "Extra conf mismatch.\n");
ssl_session_ticket_name(ctx2->session_ticket_expected));
return 0;
}
+ if (ctx->compression_expected != ctx2->compression_expected) {
+ fprintf(stderr, "ComrpessionExpected mismatch: %s vs %s.\n",
+ ssl_compression_name(ctx->compression_expected),
+ ssl_compression_name(ctx2->compression_expected));
+ return 0;
+ }
if (!strings_equal("ExpectedNPNProtocol", ctx->expected_npn_protocol,
ctx2->expected_npn_protocol))
return 0;
SSL_TEST_CTX_TEST_FIXTURE fixture;
fixture.test_case_name = test_case_name;
fixture.expected_ctx = SSL_TEST_CTX_new();
- OPENSSL_assert(fixture.expected_ctx != NULL);
+ TEST_check(fixture.expected_ctx != NULL);
return fixture;
}
return success;
}
-static int execute_failure_test(SSL_TEST_CTX_TEST_FIXTURE fixture)
-{
- SSL_TEST_CTX *ctx = SSL_TEST_CTX_create(conf, fixture.test_section);
-
- if (ctx != NULL) {
- fprintf(stderr, "Parsing bad configuration %s succeeded.\n",
- fixture.test_section);
- SSL_TEST_CTX_free(ctx);
- return 0;
- }
-
- return 1;
-}
-
static void tear_down(SSL_TEST_CTX_TEST_FIXTURE fixture)
{
SSL_TEST_CTX_free(fixture.expected_ctx);
- ERR_print_errors_fp(stderr);
}
#define SETUP_SSL_TEST_CTX_TEST_FIXTURE() \
SETUP_TEST_FIXTURE(SSL_TEST_CTX_TEST_FIXTURE, set_up)
#define EXECUTE_SSL_TEST_CTX_TEST() \
EXECUTE_TEST(execute_test, tear_down)
-#define EXECUTE_SSL_TEST_CTX_FAILURE_TEST() \
- EXECUTE_TEST(execute_failure_test, tear_down)
static int test_empty_configuration()
{
fixture.test_section = "ssltest_good";
fixture.expected_ctx->method = SSL_TEST_METHOD_DTLS;
fixture.expected_ctx->handshake_mode = SSL_TEST_HANDSHAKE_RESUME;
+ fixture.expected_ctx->app_data_size = 1024;
+ fixture.expected_ctx->max_fragment_size = 2048;
fixture.expected_ctx->expected_result = SSL_TEST_SERVER_FAIL;
fixture.expected_ctx->expected_client_alert = SSL_AD_UNKNOWN_CA;
fixture.expected_ctx->expected_protocol = TLS1_1_VERSION;
fixture.expected_ctx->expected_servername = SSL_TEST_SERVERNAME_SERVER2;
fixture.expected_ctx->session_ticket_expected = SSL_TEST_SESSION_TICKET_YES;
+ fixture.expected_ctx->compression_expected = SSL_TEST_COMPRESSION_NO;
fixture.expected_ctx->resumption_expected = 1;
fixture.expected_ctx->extra.client.verify_callback =
fixture.expected_ctx->extra.client.servername = SSL_TEST_SERVERNAME_SERVER2;
fixture.expected_ctx->extra.client.npn_protocols =
OPENSSL_strdup("foo,bar");
- OPENSSL_assert(fixture.expected_ctx->extra.client.npn_protocols != NULL);
+ TEST_check(fixture.expected_ctx->extra.client.npn_protocols != NULL);
fixture.expected_ctx->extra.server.servername_callback =
SSL_TEST_SERVERNAME_IGNORE_MISMATCH;
fixture.expected_ctx->resume_extra.server2.alpn_protocols =
OPENSSL_strdup("baz");
- OPENSSL_assert(
+ TEST_check(
fixture.expected_ctx->resume_extra.server2.alpn_protocols != NULL);
+ fixture.expected_ctx->resume_extra.client.ct_validation =
+ SSL_TEST_CT_VALIDATION_STRICT;
+
EXECUTE_SSL_TEST_CTX_TEST();
}
static const char *bad_configurations[] = {
"ssltest_unknown_option",
+ "ssltest_wrong_section",
"ssltest_unknown_expected_result",
"ssltest_unknown_alert",
"ssltest_unknown_protocol",
"ssltest_unknown_servername",
"ssltest_unknown_servername_callback",
"ssltest_unknown_session_ticket_expected",
+ "ssltest_unknown_compression_expected",
"ssltest_unknown_method",
"ssltest_unknown_handshake_mode",
"ssltest_unknown_resumption_expected",
+ "ssltest_unknown_ct_validation",
};
static int test_bad_configuration(int idx)
{
- SETUP_SSL_TEST_CTX_TEST_FIXTURE();
- fixture.test_section = bad_configurations[idx];
- EXECUTE_SSL_TEST_CTX_FAILURE_TEST();
+ SSL_TEST_CTX *ctx = SSL_TEST_CTX_create(conf, bad_configurations[idx]);
+
+ if (ctx != NULL) {
+ fprintf(stderr, "Parsing bad configuration %s succeeded.\n",
+ bad_configurations[idx]);
+ SSL_TEST_CTX_free(ctx);
+ return 0;
+ }
+
+ return 1;
}
-int main(int argc, char **argv)
+int test_main(int argc, char **argv)
{
int result = 0;
return 1;
conf = NCONF_new(NULL);
- OPENSSL_assert(conf != NULL);
+ TEST_check(conf != NULL);
/* argv[1] should point to test/ssl_test_ctx_test.conf */
- OPENSSL_assert(NCONF_load(conf, argv[1], NULL) > 0);
-
+ TEST_check(NCONF_load(conf, argv[1], NULL) > 0);
ADD_TEST(test_empty_configuration);
ADD_TEST(test_good_configuration);
projects / openssl.git / blobdiff