From 0bb9a2502124d97c937a910dc95154ab2db54036 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 16 Mar 2026 13:11:48 +0100 Subject: [PATCH] Remove unnecessary OpenSSL init and cleanup commands in unit tests After the removal of OpenSSL 1.0.2 support these instructions are no longer needed and the main OpenVPN program also no longer calls them in init_ssl_lib or free_ssl_lib. Also remove them from the unit tests. This also solves a deprecation warning on EVP_cleanup when compiling with aws-lc Change-Id: I228f6fd9ff18256f09d4348df1fc48853f8e7306 Signed-off-by: Arne Schwabe Acked-by: Frank Lichtenheld Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1568 Message-Id: <20260316121148.25189-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36153.html Signed-off-by: Gert Doering (cherry picked from commit 369c7510788d44747b75fceb61edbf30b87638f0) --- tests/unit_tests/openvpn/test_auth_token.c | 8 +------- tests/unit_tests/openvpn/test_crypto.c | 12 +----------- tests/unit_tests/openvpn/test_ncp.c | 4 +--- tests/unit_tests/openvpn/test_pkt.c | 12 +----------- tests/unit_tests/openvpn/test_tls_crypt.c | 12 +----------- 5 files changed, 5 insertions(+), 43 deletions(-) diff --git a/tests/unit_tests/openvpn/test_auth_token.c b/tests/unit_tests/openvpn/test_auth_token.c index e1fcc699..9438b6c8 100644 --- a/tests/unit_tests/openvpn/test_auth_token.c +++ b/tests/unit_tests/openvpn/test_auth_token.c @@ -418,11 +418,5 @@ main(void) cmocka_unit_test_setup_teardown(auth_token_test_session_mismatch, setup, teardown) }; -#if defined(ENABLE_CRYPTO_OPENSSL) - OpenSSL_add_all_algorithms(); -#endif - - int ret = cmocka_run_group_tests_name("auth-token tests", tests, NULL, NULL); - - return ret; + return cmocka_run_group_tests_name("auth-token tests", tests, NULL, NULL); } diff --git a/tests/unit_tests/openvpn/test_crypto.c b/tests/unit_tests/openvpn/test_crypto.c index a1d7ddd6..7ee163db 100644 --- a/tests/unit_tests/openvpn/test_crypto.c +++ b/tests/unit_tests/openvpn/test_crypto.c @@ -963,15 +963,5 @@ main(void) cmocka_unit_test(epoch_test_derive_data_key) }; -#if defined(ENABLE_CRYPTO_OPENSSL) - OpenSSL_add_all_algorithms(); -#endif - - int ret = cmocka_run_group_tests_name("crypto tests", tests, NULL, NULL); - -#if defined(ENABLE_CRYPTO_OPENSSL) - EVP_cleanup(); -#endif - - return ret; + return cmocka_run_group_tests_name("crypto tests", tests, NULL, NULL); } diff --git a/tests/unit_tests/openvpn/test_ncp.c b/tests/unit_tests/openvpn/test_ncp.c index 9f569a7e..224a017e 100644 --- a/tests/unit_tests/openvpn/test_ncp.c +++ b/tests/unit_tests/openvpn/test_ncp.c @@ -394,8 +394,6 @@ int main(void) { openvpn_unit_test_setup(); -#if defined(ENABLE_CRYPTO_OPENSSL) - OpenSSL_add_all_algorithms(); -#endif + return cmocka_run_group_tests(ncp_tests, NULL, NULL); } diff --git a/tests/unit_tests/openvpn/test_pkt.c b/tests/unit_tests/openvpn/test_pkt.c index ca62b38a..d51d35eb 100644 --- a/tests/unit_tests/openvpn/test_pkt.c +++ b/tests/unit_tests/openvpn/test_pkt.c @@ -765,15 +765,5 @@ main(void) cmocka_unit_test(test_extract_control_message) }; -#if defined(ENABLE_CRYPTO_OPENSSL) - OpenSSL_add_all_algorithms(); -#endif - - int ret = cmocka_run_group_tests_name("pkt tests", tests, NULL, NULL); - -#if defined(ENABLE_CRYPTO_OPENSSL) - EVP_cleanup(); -#endif - - return ret; + return cmocka_run_group_tests_name("pkt tests", tests, NULL, NULL); } diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/openvpn/test_tls_crypt.c index 730841e4..69f78fd9 100644 --- a/tests/unit_tests/openvpn/test_tls_crypt.c +++ b/tests/unit_tests/openvpn/test_tls_crypt.c @@ -673,15 +673,5 @@ main(void) cmocka_unit_test(test_tls_crypt_v2_write_client_key_file_metadata), }; -#if defined(ENABLE_CRYPTO_OPENSSL) - OpenSSL_add_all_algorithms(); -#endif - - int ret = cmocka_run_group_tests_name("tls-crypt tests", tests, NULL, NULL); - -#if defined(ENABLE_CRYPTO_OPENSSL) - EVP_cleanup(); -#endif - - return ret; + return cmocka_run_group_tests_name("tls-crypt tests", tests, NULL, NULL); }