From patchwork Wed Dec 8 03:41:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Fillinger X-Patchwork-Id: 2146 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend41.mail.ord1d.rsapps.net with LMTP id qLh8HUrEsGHEFwAAqwncew (envelope-from ) for ; Wed, 08 Dec 2021 09:42:18 -0500 Received: from proxy19.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id YBYhMUnEsGFGZgAAIasKDg (envelope-from ) for ; Wed, 08 Dec 2021 09:42:17 -0500 Received: from smtp32.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy19.mail.ord1d.rsapps.net with LMTPS id WP8OIUrEsGHuaAAAyH2SIw (envelope-from ) for ; Wed, 08 Dec 2021 09:42:18 -0500 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp32.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (key not found in DNS) header.d=foxcrypto.com; dmarc=fail (p=none; dis=none) header.from=foxcrypto.com X-Suspicious-Flag: YES X-Classification-ID: 0a3b3924-5835-11ec-b462-52540099eaf5-1-1 Received: from [216.105.38.7] ([216.105.38.7:60448] helo=lists.sourceforge.net) by smtp32.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 3E/D7-23534-944C0B16; Wed, 08 Dec 2021 09:42:17 -0500 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.94.2) (envelope-from ) id 1muy8O-0001Md-1n; Wed, 08 Dec 2021 14:41:28 +0000 Received: from [172.30.20.202] (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.94.2) (envelope-from ) id 1muy8L-0001MX-V5 for openvpn-devel@lists.sourceforge.net; Wed, 08 Dec 2021 14:41:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:MIME-Version:Message-ID:Date:Subject: CC:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0z1j8Q5vrMIOC9CnFhehR29iVtYKgFwjJDObFN8wPvQ=; b=AlyAl3D3sZOj0GtbXavMiSxKmX YG0IZap37WUf395kHwSscrqtYlC4jtSDBthUWwrul/kM77SrN9C8CyDEvM2BJJYJsPuSIwt229AsY ThOiCpLMm2GIrwbxzVy65ZJ872S6VSppRq3l7STXt8e8qMLsePGrihWMKhl7SKuzX4uU=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From:Sender: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=0z1j8Q5vrMIOC9CnFhehR29iVtYKgFwjJDObFN8wPvQ=; b=T alPWDvv2Tk2XgXsXK5FtA/ezZFyrllShNKc796iVIXUoAcvSV2L+eQ4+7AT+ertrhVuxmjzW5CvuY IVsHfjsXx5mL7tXnzKxno4lH0IO+xjsqKRX5mb26SvjIWE+1lJ0sL2CBO4GhS3Vw0fa/hVlSqZjTc NEsivpOBlQHRlExs=; Received: from nl-dft-mx-01.fox-it.com ([178.250.144.135]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1muy8L-008l5J-6L for openvpn-devel@lists.sourceforge.net; Wed, 08 Dec 2021 14:41:25 +0000 From: Max Fillinger To: Date: Wed, 8 Dec 2021 15:41:01 +0100 Message-ID: <20211208144101.19166-1-maximilian.fillinger@foxcrypto.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-ClientProxiedBy: FOXDFT1EX01.FOX.local (10.0.0.129) To FOXDFT1EX01.FOX.local (10.0.0.129) X-FE-Policy-ID: 13:3:2:SYSTEM DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; d=foxcrypto.com; s=NL-DFT-MX-01; c=relaxed/relaxed; h=from:to:cc:subject:date:message-id:mime-version:content-type; bh=0z1j8Q5vrMIOC9CnFhehR29iVtYKgFwjJDObFN8wPvQ=; b=iOyYWdjyYn4IJGklp0ckTY3QAs/6kxF0LXps0IAgsxfDLkhiMG0qLoiMwpXNt/obBTHD1+RwkzdV HBCIyuusle4zoqMqbfmvE5UpEFz7IyHDnd0upeaHiF2VAXqoXRTuNzaeY/VDKVihP4Odv59f/9LA tUaa7ZxPlSG831JaX9lx6cT9tjcMUAk/67epziPnnZnLIQ1ps22kBd9BBbhd4+lPGvzLtzgbEsJI isBAWFOjgQ1r1E3nYAM9xnURF/iBQWA+69EXePSrOCqiOQnrc/lzCbEyJzaSLO4TDrQn9hkpyicE d/9Dis+kLKuI1Kco7eAmOKS5UVhHqhJccTJGjQ== X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", 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: The previous commit was backported from master and needs this variable to exist. Signed-off-by: Max Fillinger --- tests/unit_tests/openvpn/test_ncp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Content analysis details: (0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid X-Headers-End: 1muy8L-008l5J-6L Subject: [Openvpn-devel] [PATCH 2.5] Define have_blowfish variable in ncp 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 The previous commit was backported from master and needs this variable to exist. Signed-off-by: Max Fillinger Acked-by: Gert Doering --- tests/unit_tests/openvpn/test_ncp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit_tests/openvpn/test_ncp.c b/tests/unit_tests/openvpn/test_ncp.c index 8da76c03..bcafd232 100644 --- a/tests/unit_tests/openvpn/test_ncp.c +++ b/tests/unit_tests/openvpn/test_ncp.c @@ -49,6 +49,7 @@ test_check_ncp_ciphers_list(void **state) { struct gc_arena gc = gc_new(); bool have_chacha = cipher_kt_get("CHACHA20-POLY1305"); + bool have_blowfish = cipher_kt_get("BF-CBC"); assert_string_equal(mutate_ncp_cipher_list("none", &gc), "none"); assert_string_equal(mutate_ncp_cipher_list("AES-256-GCM:none", &gc), @@ -56,7 +57,7 @@ test_check_ncp_ciphers_list(void **state) assert_string_equal(mutate_ncp_cipher_list(aes_ciphers, &gc), aes_ciphers); - if (have_chacha) + if (have_chacha && have_blowfish) { assert_string_equal(mutate_ncp_cipher_list(bf_chacha, &gc), bf_chacha); assert_string_equal(mutate_ncp_cipher_list("BF-CBC:CHACHA20-POLY1305", &gc),