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/cipherlist_test.c | |
| parent | Correct the #define's of EVP_PKEY_CTRL_SET1_ID and EVP_PKEY_CTRL_GET1_ID{,_LEN} (diff) | |
| download | openssl-06cee80a843cae6bcb2dcba7eab26c963e10f825.tar.xz openssl-06cee80a843cae6bcb2dcba7eab26c963e10f825.zip | |
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/cipherlist_test.c')
| -rw-r--r-- | test/cipherlist_test.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/cipherlist_test.c b/test/cipherlist_test.c index f850d7bbe9..0f337b4054 100644 --- a/test/cipherlist_test.c +++ b/test/cipherlist_test.c @@ -199,8 +199,6 @@ static int execute_test(CIPHERLIST_TEST_FIXTURE *fixture) static int test_default_cipherlist_implicit(void) { SETUP_CIPHERLIST_TEST_FIXTURE(); - if (fixture == NULL) - return 0; EXECUTE_CIPHERLIST_TEST(); return result; } @@ -208,8 +206,6 @@ static int test_default_cipherlist_implicit(void) static int test_default_cipherlist_explicit(void) { SETUP_CIPHERLIST_TEST_FIXTURE(); - if (fixture == NULL) - return 0; if (!TEST_true(SSL_CTX_set_cipher_list(fixture->server, "DEFAULT")) || !TEST_true(SSL_CTX_set_cipher_list(fixture->client, "DEFAULT"))) tear_down(fixture); @@ -220,11 +216,8 @@ static int test_default_cipherlist_explicit(void) /* SSL_CTX_set_cipher_list() should fail if it clears all TLSv1.2 ciphers. */ static int test_default_cipherlist_clear(void) { - SETUP_CIPHERLIST_TEST_FIXTURE(); SSL *s = NULL; - - if (fixture == NULL) - return 0; + SETUP_CIPHERLIST_TEST_FIXTURE(); if (!TEST_int_eq(SSL_CTX_set_cipher_list(fixture->server, "no-such"), 0)) goto end; |