From patchwork Mon Mar 16 12:11:48 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 4836 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:2755:b0:83c:d90d:321 with SMTP id j21csp2825459maq; Mon, 16 Mar 2026 05:12:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW+E6q5rL8mjelxy1Y4fTa+uGes2VDVe4MpD4O9EQPvwQ+eqJjTH6sbhhBvVbNs/EkUpYEOvJF3jY8=@openvpn.net X-Received: by 2002:a05:6870:6c09:b0:417:2047:5a05 with SMTP id 586e51a60fabf-417b9397c4dmr6524065fac.35.1773663133112; Mon, 16 Mar 2026 05:12:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1773663133; cv=none; d=google.com; s=arc-20240605; b=OGdaghuZqzVs667ejg6TGNO4r7qqpttHVRyBmJLPZs1f7HAqGyfuJelefKtjWfWz6V n+cqFC3tOoZhjOpsiMPC4GOFq03zF1fsSlWqwTYWhTnPiXCTC8HLDVb5pPOnmSRyEqpN EkpC1bO9L4ZADhSqy8zJrAdboSj8hSqJMcIBTXG6qlQHHEvjJJypRlZvoYZGodJBdGcy VXIUmDr0VYuUH5AMUZgZMBqBUCJF6kBjukAVpGRw9UnQ2QZ7IpOCIVMMQS2BkurRSzK7 p3Xljg6f3OZTADwlTaokjVybdkw8kjRsgn1mAu8eqgdbQCAWyeohtkFq//wfBj9YOl50 /aGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:cc: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:dkim-signature; bh=hTOdGjPkbEolWNrj1mCNy3s+qLlkCvaLYWMsEwwZVds=; fh=CfxSpwd5kfiMJoL3kcov7PTxVKT7pGe/79idnx9XlBs=; b=E14PnOkj7mgCwDrjKqWCTj78myDrGYR+/wa3uo7eSb8MGRsbbhITpUQicOW12ltIhz gqZfNhHwXqZz75Tgm81LcdkAdz1sF0kV7ukuF3jMm5p6lHovptRMexAR+nG+tsh64b9i N/x3kXvwkhpkLRLvdYnwOSHdPuFOOP2+oJ4TDMTkT8Qi3VyQid9YxGEw5c+3zKf1qWeg We9CoD8fuT8kXU4wqCJiXSvqhD/5SUbx7gPi0l7V7dbGB2VL51iR9r5E5+5KsYFwkcPX v8tqbbmShMFCzVDILy1spZzHTVO9Jai+K+4pJ16oLolwYNo/rmtAXJoGtjAdtF6gh5OD pryg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=ZbWdgpML; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HFJoxi4b; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DdkS40sT; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=l2BP8y0O; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-4177e207567si10523815fac.79.2026.03.16.05.12.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2026 05:12:12 -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=ZbWdgpML; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=HFJoxi4b; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=DdkS40sT; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=l2BP8y0O; 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 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:Cc: 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:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hTOdGjPkbEolWNrj1mCNy3s+qLlkCvaLYWMsEwwZVds=; b=ZbWdgpMLEMnP+ZCSyTi7TYRAoJ +nutdYNL6fJFr3Jrffze5Ps6l0TFRs+MXBtm0IysTwpbuzGOdO0pLJh9rLC5gJH0wVXLmHDm/J9lf cxYaop16XEfXgOwB9OKj+uDYOr4VGvvrlXTIIjTSGqUQ2aznHPa2ZracLlL+M4keqM2g=; Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1w26np-0007y9-Q2; Mon, 16 Mar 2026 12:12:09 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1w26nn-0007xz-10 for openvpn-devel@lists.sourceforge.net; Mon, 16 Mar 2026 12:12:07 +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:Cc:To:From:Sender:Reply-To: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=2EGHrvbtAKByr+GIrW6p9on+zk7LZErNTMKLF83IeWQ=; b=HFJoxi4b1W4ywqdZo3lHBxWJE+ RD1ExhsQmhdYTkfdd2XmgoqZP8QE4TONtCvOcf8/M0N3i6137zcC7eg/wM9j4U71xk9uysI/Zmcl9 hUXOGrV8Qed1Q6v08cMYMj4zyYzVM0cGJ7yAA5SD/1cON8rEsmdglLDzoNo0STInRnTs=; 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:Cc:To:From:Sender:Reply-To: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=2EGHrvbtAKByr+GIrW6p9on+zk7LZErNTMKLF83IeWQ=; b=DdkS40sTkPTEGX7oMKB5z9mNr/ bdHpqA8A6e5l3M+STZSVot0wdfqhYVoqB/QDIF3FHRWlsNJG9grHUefJ6cbggyyePHt4F9/8jdDdl iHj180+vh+0m9RMrEZJtpTOGRlkbU9Nifqw+bSvX7YGVE3emrGMPt6+mghjM8LGi0P08=; Received: from mout-p-201.mailbox.org ([80.241.56.171]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1w26nl-0001vb-3i for openvpn-devel@lists.sourceforge.net; Mon, 16 Mar 2026 12:12:06 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4fZDTz08gNz9tHG; Mon, 16 Mar 2026 13:11:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1773663111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2EGHrvbtAKByr+GIrW6p9on+zk7LZErNTMKLF83IeWQ=; b=l2BP8y0Oged1l7HGZMTP456g9m5TYUEpVvdJmNfskwQ+a0dvYb1En8chUfPFT2WxVUd5oT IbNTrfUbjY6xWwTxCq7OeY9QRJHJVkki3DHA/MnNT+FVi6dPfTk/ZSg/qfo34hFv2pORm6 AwX/OcgnCrfEk8dtiED3JE+Agvnz2bo8Nt4m0mOy66pVQXZOtvLadHGaG+7obmvRG3hcZ1 Db89r8L/83G0DdBBBcLCaNWPtdqjIAxb8zZ7TBKH7MYxR5MQjjhUMssIkRgGJU2CM2txAF F/cGJ3QMVT/9DtxGRTkPIUBRX6wZ/KNcVWV/qWNKqTc+WHdUK0ntYu+A9JlITQ== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of frank@lichtenheld.com designates 2001:67c:2050:b231:465::2 as permitted sender) smtp.mailfrom=frank@lichtenheld.com From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Mon, 16 Mar 2026 13:11:48 +0100 Message-ID: <20260316121148.25189-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4fZDTz08gNz9tHG X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.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: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1w26nl-0001vb-3i Subject: [Openvpn-devel] [PATCH v3] Remove unnecessary OpenSSL init and cleanup 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: , Cc: Arne Schwabe Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1859820593025771472?= X-GMAIL-MSGID: =?utf-8?q?1859820593025771472?= 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 Note that I fixed the commit message subject line. 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); }