diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-12 20:24:26 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-21 09:04:09 +0200 |
| commit | 06cee80a843cae6bcb2dcba7eab26c963e10f825 (patch) | |
| tree | ef5df87115cca88e27ee82d0ce2c57ba7757e1c4 /test/ct_test.c | |
| parent | 1a7ceb6c74d930fd5dfbcd06350b4cef0228936b (diff) | |
testutil: Make SETUP_TEST_FIXTURE return 0 on fixture == NULL
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11808)
Diffstat (limited to 'test/ct_test.c')
| -rw-r--r-- | test/ct_test.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/test/ct_test.c b/test/ct_test.c index 79ffcbf9a2..2e161a74d2 100644 --- a/test/ct_test.c +++ b/test/ct_test.c @@ -338,8 +338,6 @@ end: 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"; @@ -351,8 +349,6 @@ static int test_no_scts_in_certificate(void) 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"; @@ -366,8 +362,6 @@ static int test_one_sct_in_certificate(void) 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"; @@ -381,8 +375,6 @@ static int test_multiple_scts_in_certificate(void) 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"; @@ -395,8 +387,6 @@ static int test_verify_one_sct(void) 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"; @@ -409,8 +399,6 @@ static int test_verify_multiple_scts(void) static int test_verify_fails_for_future_sct(void) { SETUP_CT_TEST_FIXTURE(); - if (fixture == NULL) - return 0; fixture->epoch_time_in_ms = 1365094800000ULL; /* Apr 4 17:00:00 2013 GMT */ fixture->certs_dir = certs_dir; fixture->certificate_file = "embeddedSCTs1.pem"; @@ -443,8 +431,6 @@ 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; @@ -463,8 +449,6 @@ 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, |