From 6faecf21ff3aad208a6389ddfcc76630462f5d7c Mon Sep 17 00:00:00 2001 From: Soner Tari Date: Sat, 24 Dec 2022 01:14:10 +1300 Subject: [PATCH] Fix unit tests with opaque x509 struct X509 is opaque since LibreSSL 3.5.2, as in OpenSSL 1.1: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.2-relnotes.txt --- tests/check/cachefkcrt.t.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/check/cachefkcrt.t.c b/tests/check/cachefkcrt.t.c index 1fa6f4e..8ac14c7 100644 --- a/tests/check/cachefkcrt.t.c +++ b/tests/check/cachefkcrt.t.c @@ -91,7 +91,7 @@ START_TEST(cache_fkcrt_03) } END_TEST -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050200fL) START_TEST(cache_fkcrt_04) { X509 *c1, *c2; @@ -136,7 +136,7 @@ cachefkcrt_suite(void) tcase_add_test(tc, cache_fkcrt_01); tcase_add_test(tc, cache_fkcrt_02); tcase_add_test(tc, cache_fkcrt_03); -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) +#if (OPENSSL_VERSION_NUMBER < 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x3050200fL) tcase_add_test(tc, cache_fkcrt_04); #endif suite_add_tcase(s, tc);