From patchwork Mon Mar 16 12:25:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4838 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:2755:b0:83c:d90d:321 with SMTP id j21csp2834352maq; Mon, 16 Mar 2026 05:26:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVuKg9077/+t7rVDYymG7XOMI4Fyw+Ac4fAForCb6BFeWU1Yn4OMnYuT+2+JhnH6KhvmNDWDBdiwdY=@openvpn.net X-Received: by 2002:a05:6870:6589:b0:404:15e7:b86c with SMTP id 586e51a60fabf-417b906d0femr7216750fac.3.1773663992580; Mon, 16 Mar 2026 05:26:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1773663992; cv=none; d=google.com; s=arc-20240605; b=L2ItaNH9bY2SRUm2dO8BtVJdyRjZgU+mLRFXybY2SpENJ+kXyqBSlniweYvQ8xP/D8 Ft5HlIE0doc1cYVLuqxXaJpyY2aSuw7y9cXS/ugvbcS3EIE6I5N2uhKCUO2WGPR7Rxd+ JtNqLH7tZ4FvhgQIVURkcI95yBk/phECWg7yGX2GtT7GT8FVVMPyUg5FjWcbZugvWg67 6H5wY3m1Wqc5uRlXGfauC0zBuMJByYgsMgdsENQuguJ1VYGoBoJVddJEHC9P29FnmHhF MvLKSWrWWccNWQUhfsEELIVCHvmCZGQBPO2jDnV7s+edHrmwFU8cGCI5s09OYEW6fuaL nl0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=oqZkqu6ijdwUDOZGZOVjkmH4uhKs9f3j5XuXPvHjQCw=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=h+fcollgsWkOHav2DdlgH47TKvg5rtlvqfRfeXDGVoQUF/0EtP1BVEHMPvpnQvpGB4 5uQFVj/2wwFS+BO8yyFzEmwe18rTCxXEDkbm+2qtEk5E1aace8uvUZpCUvefnXvmYNXr M43lmQvQoPu977+32YYyn4kNcQNqklGMyi0KcxQSgJ6H57ZkVHeaa7FICQD9Lq8/QF1D WyVlyIAC6yQJzuFcsCjG9KUKXGhuawjyxlt88EI8eSvYEFnhKunNiNou8Z2AEDyLbCe8 s/ADVGMlP1JJx6WyLotlUn1+xjL8aRgPK7cJc3mEY2kZv4dRJe5ARutIkYEjmZ4o3fTG dk8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Oqk33cBR; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="XP/tfYLS"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=A2RmTMdB; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-4177e87ab32si10621627fac.407.2026.03.16.05.26.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2026 05:26:32 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Oqk33cBR; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="XP/tfYLS"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=A2RmTMdB; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oqZkqu6ijdwUDOZGZOVjkmH4uhKs9f3j5XuXPvHjQCw=; b=Oqk33cBRlkYSF8uYoprljm9QRf BkBBMMCyMkr+BaKRJvABj15Z6R+pays5Q6jpICv2kX4foZZY8uKzyRhK5QKT2i35ixMU4mKdNXz51 nIq5wNRWpPQe4hEzlQ/cJVb5KWvAY8vFjaGuoPKmgtnpE+n6a4t6QRZG3T7kv0QAjShs=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1w271g-0004NM-RW; Mon, 16 Mar 2026 12:26:29 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1w271L-0004Lx-G4 for openvpn-devel@lists.sourceforge.net; Mon, 16 Mar 2026 12:26:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DPU78FI/bQGdxtEoKCML16OyBEFRR+YWOdgEge55P6s=; b=XP/tfYLSm+6GBAgAUnJRFgqJ0z 0P9nGUpPvP4m8Rs3Gg/56uRiUjUlQwHTHKgehGtRMlo4RSZMlnIXTeU/WVlPIwX9leYyiddO+lHnM DA5zioTCpclfrzMN2Mw8tlPiPsutAFDCUTgEDFhB92M8vFIGuswawf3pkJvFP8uGdJpc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DPU78FI/bQGdxtEoKCML16OyBEFRR+YWOdgEge55P6s=; b=A2RmTMdBiz1lnjIwiDBm22+1pa xaAtvNAwduh0CiuDhaeYJNQW6Y5G53CIjYXfdVX+bdzUtG3hO/jrCA0AGVE7+7D33A8SPMGNO3PUo ntmDbprGnlrfg37M8wDmNKefJM80kW72l8AJeW52wfHqnPlPXFpNHwnwxV6vsYH5xzjo=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1w271K-0002zW-Tg for openvpn-devel@lists.sourceforge.net; Mon, 16 Mar 2026 12:26:08 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 62GCPsDD021503 for ; Mon, 16 Mar 2026 13:25:54 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 62GCPsRl021502 for openvpn-devel@lists.sourceforge.net; Mon, 16 Mar 2026 13:25:54 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 16 Mar 2026 13:25:48 +0100 Message-ID: <20260316122554.21488-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.52.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Arne Schwabe 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. Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1w271K-0002zW-Tg Subject: [Openvpn-devel] [PATCH v3] Remove unnecessary OpenSSL init and unit commands in unit tests X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1859821494878806618?= X-GMAIL-MSGID: =?utf-8?q?1859821494878806618?= From: Arne Schwabe 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 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1568 This mail reflects revision 3 of this Change. Signed-off-by line for the author was added as per our policy. Acked-by according to Gerrit (reflected above): Frank Lichtenheld diff --git a/tests/unit_tests/openvpn/test_auth_token.c b/tests/unit_tests/openvpn/test_auth_token.c index 82c20c1..d28bd8a 100644 --- a/tests/unit_tests/openvpn/test_auth_token.c +++ b/tests/unit_tests/openvpn/test_auth_token.c @@ -428,11 +428,5 @@ 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 1679d88..cb4eaa2 100644 --- a/tests/unit_tests/openvpn/test_crypto.c +++ b/tests/unit_tests/openvpn/test_crypto.c @@ -963,15 +963,5 @@ 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 52a41ee..29365db 100644 --- a/tests/unit_tests/openvpn/test_ncp.c +++ b/tests/unit_tests/openvpn/test_ncp.c @@ -407,8 +407,6 @@ 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 a94732d..cad2ce0 100644 --- a/tests/unit_tests/openvpn/test_pkt.c +++ b/tests/unit_tests/openvpn/test_pkt.c @@ -765,15 +765,5 @@ 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 ed82279..1776d71 100644 --- a/tests/unit_tests/openvpn/test_tls_crypt.c +++ b/tests/unit_tests/openvpn/test_tls_crypt.c @@ -673,15 +673,5 @@ 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); }