From patchwork Thu Jan 8 15:42:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4697 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:b01a:b0:80a:3855:ce6a with SMTP id nz26csp1059563mab; Thu, 8 Jan 2026 07:43:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV5vg6XJQIGOgXrawi6ri9g78iQ6+HXwEY9LAVcN5xoiSHmTOluEdv1jEo9X/Z8obd9lQY/o3e8Q8E=@openvpn.net X-Google-Smtp-Source: AGHT+IGyuixiajLcW+D9kE44tT5/uZV0c6zaLTkEOm74zI4GMGBiTcDGbuq9jG2gRaAuCC2EnSXx X-Received: by 2002:a05:6820:220c:b0:659:9a49:8fe5 with SMTP id 006d021491bc7-65f54ee4024mr2591957eaf.18.1767886990463; Thu, 08 Jan 2026 07:43:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1767886990; cv=none; d=google.com; s=arc-20240605; b=af6CDgOcarA7gkqy47rOeJBN/UVwHdRSPjuLMc1hGrhLP4bv9UiHv8ly+VjeSsqtqx ILyOCsZgLnPwJI/l6Ti5adifElxiJ8vpFnvnz7boiljVZyy1EW0+J3xrCCz8YyyFpuk2 waeYN1TXkYnDzM5wBTI2xMnqrOYrw1SLm7AwEX2evU698hN0otwLXg3ANK2geV87ZXfb Im2s/XD925bWaLVY62TBGg9BFaBygxa8dxZO+5V2VT4k5qQjFsKOr1t0AJFnGoWEet/x IkgE+b6qag4U3Z/OuI8UCyAUY7oA8l5F25pKIlFdWWYifPIokevb/KBSsp/qQPswQZrY pqKw== 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=C9rzZcLepX1KATR4D6z6H8n/zHrMgUc9dUeDcGhQ7pg=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Q9sPNenP5LKBDw9p8OxiYX+fZ0YoTR4T43W/ZT654KrXmPCX1Pv7l+FoJy2Fkuh73e sbN7/pucBboOQ0nnEdtBvfrqQSs9xorceLUaZ7+Wmgn7GkgxPlWMI0/Dygni9x+Bsj9y M+G4581aThuMmUIh6LNFV6ntVBVilQ8v80XSuwQlCbum+H/9L3kMRp7RIDyGE8fQFeZZ XkE3LnQdclYdsbLSa6g8+AwQtMlhBUWc9+c4Y+uLsmbsVgHM75XYw99rT6I1Y0nflxyx ySU8gB+34Vkk4+bG7GXBxHLBIqb1Mce9CpDdKAGB34GThCEroRxNagMtmkNkhf6Vzigz wjLQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=b8EDk3ie; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VeS8uE53; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fcOvn3CP; 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 006d021491bc7-65f48d59469si4472173eaf.92.2026.01.08.07.43.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jan 2026 07:43:10 -0800 (PST) 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=b8EDk3ie; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=VeS8uE53; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fcOvn3CP; 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=C9rzZcLepX1KATR4D6z6H8n/zHrMgUc9dUeDcGhQ7pg=; b=b8EDk3ie41PFs2DowTRXn4Dg4h RMKj1cetk+etHbOupNFacxR+hsEZTDoiHzOHSt530g6Pyw+zcXdIoNjG4eQa9c5tsen7aj3ldN/dp nWUib14r65RzxIi2k24aecTWMkcUg2i9RvsQvnScA544AYVjv/MRyEXetkZS6LJbJu+4=; 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 1vdsAB-0004Yt-VZ; Thu, 08 Jan 2026 15:43:03 +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 1vdsAA-0004Yl-1v for openvpn-devel@lists.sourceforge.net; Thu, 08 Jan 2026 15:43:02 +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=0PdI1z77xgi+88bqzGf6M1pthFMeIGh1zaKTTUrOVZs=; b=VeS8uE535FR79aAVF5X9vat31d Ke5xIj1yzGy2PPwxe7OD79lNTAN3sn7nmoq4uGOy7L9BNldsSYx3+DGQzCZGU1z//tpuU2M1MXnpx 060wx54aKJXXpZ+rl9QCjLMONxW1Sas2JoHgoMQVg9cbgXyuPMYLQRGaLbKhDkQdVqP4=; 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=0PdI1z77xgi+88bqzGf6M1pthFMeIGh1zaKTTUrOVZs=; b=fcOvn3CPHAf4kLWandFxFuUwUL icyRgRAUUbUZ6NUq7QdsftEupek2rDBig72WqYxiUSrB1SEIlhz+6mG1DrjHUTy8A9FFdycFJpFpx 0tjCrOOaEWDo+VTZzOIifcaQXOJAFVJCeUIfH7LK7LnR+/94HjaB3vkzN9ZgpLWBy0s4=; Received: from [193.149.48.134] (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 1vdsA8-0006Jn-O6 for openvpn-devel@lists.sourceforge.net; Thu, 08 Jan 2026 15:43:01 +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 608FgmeF021720 for ; Thu, 8 Jan 2026 16:42:48 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 608Fgm6W021719 for openvpn-devel@lists.sourceforge.net; Thu, 8 Jan 2026 16:42:48 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Thu, 8 Jan 2026 16:42:43 +0100 Message-ID: <20260108154248.21706-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 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-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: Frank Lichtenheld This was missed in commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778 since we only built with cmocka 2.0 on macOS and that doesn't build test_tls_crypt. Now that we build with cmocka 2.0 also on Debian Sid we noticed the additional issues. 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: 1vdsA8-0006Jn-O6 Subject: [Openvpn-devel] [PATCH v1] Fix building test_tls_crypt with cmocka 2.0 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?1853763869070580390?= X-GMAIL-MSGID: =?utf-8?q?1853763869070580390?= From: Frank Lichtenheld This was missed in commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778 since we only built with cmocka 2.0 on macOS and that doesn't build test_tls_crypt. Now that we build with cmocka 2.0 also on Debian Sid we noticed the additional issues. Change-Id: Ibc964c13724316ca96276ba6b7d34dbbfcf52064 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1460 --- 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/+/1460 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/openvpn/test_tls_crypt.c index 4a80a4c..730841e 100644 --- a/tests/unit_tests/openvpn/test_tls_crypt.c +++ b/tests/unit_tests/openvpn/test_tls_crypt.c @@ -110,8 +110,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem = BSTR(buf); - check_expected(filename); - check_expected(pem); + check_expected_ptr(filename); + check_expected_ptr(pem); return mock_type(bool); } @@ -119,7 +119,7 @@ struct buffer __wrap_buffer_read_from_file(const char *filename, struct gc_arena *gc) { - check_expected(filename); + check_expected_ptr(filename); const char *pem_str = mock_ptr_type(const char *); struct buffer ret = alloc_buf_gc(strlen(pem_str) + 1, gc);