From patchwork Mon Aug 4 19:50:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4354 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6302:b0:671:5a2c:6455 with SMTP id a2csp1574090maf; Mon, 4 Aug 2025 12:51:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXOTvmqQ/B/b0Hn91voqEva0b+dH7hC88ga+kjzF+hycZMI52mstMsDZ+NdlanE2+MdrB8SCGxjAjY=@openvpn.net X-Google-Smtp-Source: AGHT+IEpfMlDszOIPik4CxHbfzA/FiRsIvns+rQ1nMNBDhQe72pk7cj1jq+maqjSH8oGef+SJ0x8 X-Received: by 2002:a05:6870:c141:b0:2ff:9905:134 with SMTP id 586e51a60fabf-30b67bdc2c0mr5339747fac.39.1754337072379; Mon, 04 Aug 2025 12:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754337072; cv=none; d=google.com; s=arc-20240605; b=MjkoosiCulo3z4VV4WXexc2PiVDv2YJLnUuIEpvBMWhfiM2ysKc8mzLbhXeMkueneA QcvczmeCD8kHer7yiJcCPKYcSgfqaIZFfb8kb7lRO8gOaiXe2vp+Encwu6TqUf2jHhFK Ef6vcmEYKAyFWYpEapZVr9mTETTeJ9IiTnDjcZp7V4dKy10hiRpHHto+JVTYruKT9EyI /2UDrVu0YM6iVHs350BBImQSEQ6n1RuYs7RSxXBCckWnGIm7ermYkPVghwmdTzX9bpgs 1bknE9FhParZqe6MTwuuR7vMX9FJ61p/cMVM7wYVZFqYNFNgUq7xP2dU8dZZ6vTX4Yod Q09g== 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=Nm+oF5R9nUvkRy+tDGWyin3uEqsCIoqR8gunB+IBrW0=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=D5lD4L4TR1Mgab4gDoOWiT8Mhhdjw3+8ePbG+cOOO1Gz4y+rbuchvHm2D8SQQ34cTz 6CK6o5zWRabYtSH3D4al7ycMtAquCB+rWAAXeOvwqorvtGpyEJctoo0lGgzWX33UDz6O Phga1TybdmvPDDf/8vPFnJ03+jukNvYv3lLLWSrMQjrVbiqYWl505zZQniyN4MEp+s4d XQ8+d1yEoamvcpm3sVmEqzxJ+0ZVwKVmOJb847jjLV0Memy1Sa27EvqGzXSf8z36T+f0 ZBtSfUZzN86Xw4nX/gK38rtZqI9T8QIIqr/PT8MgjhzVPIkCi4XhTVdR4V8NPEJeiPB9 RyfQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=S95DvylR; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=QCFyDgoz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RhJahBFC; 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 46e09a7af769-74186e24c80si3058726a34.494.2025.08.04.12.51.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Aug 2025 12:51: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=S95DvylR; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=QCFyDgoz; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=RhJahBFC; 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=Nm+oF5R9nUvkRy+tDGWyin3uEqsCIoqR8gunB+IBrW0=; b=S95DvylR4hVbpauZ0wx3LqAUEe lry7Oimmoz+hN1kX+FiZSQS8ZFaRgWEfULNJY4ADeAnFFKWGVcakkDeGtK8uByc+TKMn1sicbjJAK 0O9A7QTdMC81n5gcKjhdaalAsAe0HKxGCO4MztiORlORT+FYmENdeD7nPC/osYrTju0c=; 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 1uj1DB-00051w-JY; Mon, 04 Aug 2025 19:51: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 1uj1DA-00051n-1C for openvpn-devel@lists.sourceforge.net; Mon, 04 Aug 2025 19:51: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=G2RE8Imj9WZ6pvNU0WfPG+W8Sa8tDRcRFS/4Cgz3KOI=; b=QCFyDgozUN7OCXDDUKanEXZEDr 936QqzC0TrSv/q6FJXBRM8SuqqHM/7co4k1A47m8duecBes7rBUz3g9onFL9BOJe4welg/gZiDt3U lJ5CqManPKT2/A6V1XUXKtO/ztb9vPVkNJSj2gtpU6waa4J06OGvboHBaKVdp+e+33Lo=; 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=G2RE8Imj9WZ6pvNU0WfPG+W8Sa8tDRcRFS/4Cgz3KOI=; b=RhJahBFCG/Kfcuy/EqEohNahui XLIanRMaRm0+oY2e2nMXejbHDuAI/Obq47lEmNg4+A6hcAyPUpo6bmISlgzsobulh2g0XSMtLxaAq Dx3yZCtGQblPxbGkpAO7fkO+EZk1xexbRj9dIbQy2Y7mHVMN6OhyTseKSuX8g9pXHhwU=; Received: from [193.149.48.143] (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 1uj1D8-0005LN-WB for openvpn-devel@lists.sourceforge.net; Mon, 04 Aug 2025 19:51:07 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.17.1.9/8.17.1.9) with ESMTP id 574JotsO021757 for ; Mon, 4 Aug 2025 21:50:55 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 574JotF6021756 for openvpn-devel@lists.sourceforge.net; Mon, 4 Aug 2025 21:50:55 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 4 Aug 2025 21:50:48 +0200 Message-ID: <20250804195054.21729-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.49.1 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: Frank Lichtenheld Found when testing windows-2025 runner in GHA. So switch to that to make sure the error is fixed. Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#DnsBlocklists-dnsbl-block for more information. [193.149.48.143 listed in list.dnswl.org] 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1uj1D8-0005LN-WB Subject: [Openvpn-devel] [PATCH v1] Fix build error with clang-cl on latest Windows SDK 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?1839555749959430368?= X-GMAIL-MSGID: =?utf-8?q?1839555749959430368?= From: Frank Lichtenheld Found when testing windows-2025 runner in GHA. So switch to that to make sure the error is fixed. Change-Id: I3046f4b09a4700001a1d9dcce802990dfa701b52 Signed-off-by: Frank Lichtenheld Acked-by: Gert Doering --- 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/+/1127 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bd5895b..cc17fba 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -125,7 +125,7 @@ arch: [x86, x64] test: [argv, auth_token, buffer, cryptoapi, crypto, misc, ncp, packet_id, pkt, provider, ssl, tls_crypt, user_pass] - runs-on: windows-latest + runs-on: windows-2025 name: "mingw unittest ${{ matrix.test }} - ${{ matrix.arch }} - OSSL" steps: - name: Checkout OpenVPN @@ -273,7 +273,7 @@ env: BUILD_CONFIGURATION: Release - runs-on: windows-latest + runs-on: windows-2025 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: lukka/get-cmake@6b3e96a9bc9976b8b546346fdd102effedae0ca8 # v4.0.3 diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index e77f313..da53635 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -44,7 +44,7 @@ #define srandom srand #endif -#ifdef _MSC_VER /* Visual Studio */ +#if defined(_MSC_VER) && !defined(__clang__) /* Microsoft compiler */ #define __func__ __FUNCTION__ #define __attribute__(x) #endif