diff options
| author | Matt Caswell <matt@openssl.org> | 2023-08-11 09:41:57 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-15 15:22:05 +0200 |
| commit | 65f59604bc036d9482046d8f53b31ad9b8fb7027 (patch) | |
| tree | 9eafa41e8dbe969df6838e3797173cdebe2e7b3a | |
| parent | 36ff77b28469a9827005a7c42938662b1dfe731c (diff) | |
Fix no-dtls and no-tls in combination
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21722)
(cherry picked from commit fb32f6ea42e6916ff88cc44cf5de6e63ba596aca)
| -rw-r--r-- | test/sslapitest.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index a27f5b881c..2191b297d0 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -1681,6 +1681,8 @@ end: return testresult; } +#if !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3) \ + || !defined(OPENSSL_NO_DTLS) static int execute_cleanse_plaintext(const SSL_METHOD *smeth, const SSL_METHOD *cmeth, int min_version, int max_version) @@ -1702,15 +1704,13 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth, privkey))) goto end; -#ifdef OPENSSL_NO_DTLS1_2 - if (smeth == DTLS_server_method()) { # ifdef OPENSSL_NO_DTLS1_2 + if (smeth == DTLS_server_method()) { /* Not supported in the FIPS provider */ if (is_fips) { testresult = 1; goto end; }; -# endif /* * Default sigalgs are SHA1 based in <DTLS1.2 which is in security * level 0 @@ -1720,7 +1720,7 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth, "DEFAULT:@SECLEVEL=0"))) goto end; } -#endif +# endif if (!TEST_true(create_ssl_objects(sctx, cctx, &serverssl, &clientssl, NULL, NULL))) @@ -1784,6 +1784,10 @@ static int execute_cleanse_plaintext(const SSL_METHOD *smeth, return testresult; } +#endif /* + * !defined(OPENSSL_NO_TLS1_2) || !defined(OSSL_NO_USABLE_TLS1_3) + * || !defined(OPENSSL_NO_DTLS) + */ static int test_cleanse_plaintext(void) { |