diff options
author | Pauli <paul.dale@oracle.com> | 2017-08-04 10:49:38 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2017-08-07 08:57:05 +1000 |
commit | 99801878c09404e45d8176739d3a555c41b77d0b (patch) | |
tree | 17849c441cb202056cfc94d91377878400c7feed /test/ct_test.c | |
parent | 5f8dd0f849d3bb87b2224715f8880716f39e9b0a (diff) |
Change SETUP_TEST_FIXTURE so that the fixture structure is passed by
reference not by value. This allows an error return from the setup function.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4083)
Diffstat (limited to 'test/ct_test.c')
-rw-r--r-- | test/ct_test.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/test/ct_test.c b/test/ct_test.c index 5123e50d0d..45dd2e92f5 100644 --- a/test/ct_test.c +++ b/test/ct_test.c @@ -344,22 +344,27 @@ end: return success; } -# define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE *, set_up) +# define SETUP_CT_TEST_FIXTURE() SETUP_TEST_FIXTURE(CT_TEST_FIXTURE, set_up) # define EXECUTE_CT_TEST() EXECUTE_TEST(execute_cert_test, tear_down) static int test_no_scts_in_certificate(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->certs_dir = certs_dir; fixture->certificate_file = "leaf.pem"; fixture->issuer_file = "subinterCA.pem"; fixture->expected_sct_count = 0; EXECUTE_CT_TEST(); + return result; } static int test_one_sct_in_certificate(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs1.pem"; fixture->issuer_file = "embeddedSCTs1_issuer.pem"; @@ -367,11 +372,14 @@ static int test_one_sct_in_certificate(void) fixture->sct_dir = certs_dir; fixture->sct_text_file = "embeddedSCTs1.sct"; EXECUTE_CT_TEST(); + return result; } static int test_multiple_scts_in_certificate(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs3.pem"; fixture->issuer_file = "embeddedSCTs3_issuer.pem"; @@ -379,33 +387,42 @@ static int test_multiple_scts_in_certificate(void) fixture->sct_dir = certs_dir; fixture->sct_text_file = "embeddedSCTs3.sct"; EXECUTE_CT_TEST(); + return result; } static int test_verify_one_sct(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs1.pem"; fixture->issuer_file = "embeddedSCTs1_issuer.pem"; fixture->expected_sct_count = fixture->expected_valid_sct_count = 1; fixture->test_validity = 1; EXECUTE_CT_TEST(); + return result; } static int test_verify_multiple_scts(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs3.pem"; fixture->issuer_file = "embeddedSCTs3_issuer.pem"; fixture->expected_sct_count = fixture->expected_valid_sct_count = 3; fixture->test_validity = 1; EXECUTE_CT_TEST(); + return result; } static int test_verify_fails_for_future_sct(void) { SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->epoch_time_in_ms = 1365094800000; /* Apr 4 17:00:00 2013 GMT */ fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs1.pem"; @@ -414,6 +431,7 @@ static int test_verify_fails_for_future_sct(void) fixture->expected_valid_sct_count = 0; fixture->test_validity = 1; EXECUTE_CT_TEST(); + return result; } static int test_decode_tls_sct(void) @@ -437,11 +455,14 @@ static int test_decode_tls_sct(void) "\xED\xBF\x08"; SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->tls_sct_list = tls_sct_list; fixture->tls_sct_list_len = 0x7a; fixture->sct_dir = ct_dir; fixture->sct_text_file = "tls1.sct"; EXECUTE_CT_TEST(); + return result; } static int test_encode_tls_sct(void) @@ -454,6 +475,8 @@ static int test_encode_tls_sct(void) SCT *sct = NULL; SETUP_CT_TEST_FIXTURE(); + if (fixture == NULL) + return 0; fixture->sct_list = sk_SCT_new_null(); if (!TEST_ptr(sct = SCT_new_from_base64(SCT_VERSION_V1, log_id, @@ -466,6 +489,7 @@ static int test_encode_tls_sct(void) fixture->sct_dir = ct_dir; fixture->sct_text_file = "tls1.sct"; EXECUTE_CT_TEST(); + return result; } /* |