From patchwork Tue Apr 2 06:36:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 3679 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:292f:b0:569:ad12:4fde with SMTP id f15csp83529maw; Mon, 1 Apr 2024 23:37:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgD/exeUWbaRTmNJltULSoRT0Cv2mTxsWVowaZ3zFuduBp/X8JnGE3pjN+S/ofQDJHpvVL/Rbrm3JXif5VD2r7/Xlfh58= X-Google-Smtp-Source: AGHT+IHcA/TEiiiSDbm4wgvsy6WkWG11N0LN1vAY1ajFp1Dmi68wSKFKCAnnshSpWw5l9vu0FrxR X-Received: by 2002:a05:6358:9890:b0:183:e7b6:60b1 with SMTP id q16-20020a056358989000b00183e7b660b1mr375216rwa.1.1712039841611; Mon, 01 Apr 2024 23:37:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712039841; cv=none; d=google.com; s=arc-20160816; b=STTWPgNq2poRsLZfgbYmZsBW2oH4yq10NgfRz3o7S4f/brhd4kDUAC7k2qTwoPP6+3 47PgsRGDqZkh1JeGC93ETABfgDPCnaAUVRnXkscTq1vhhYqZO2JhU4o0OlIeYD7vG8ox 1VxcNp9B32RAjsovTQ2aaVNYsagJy5EFtId5f8LV/ccXeJXvwoqwkneq053LyCUWEELF nB/a3+XgYM63iCmnw9mIHcJljx2t22Eyoo3jzGSu5j8Pc4hfCvCgLkkVcAGclbNdlRt1 uqFEGUIvw5THjDtbj3CnCuizATMnepB8xFwioOwsxkkjGSuVkvmm4UxbEoTporBy7be9 GABg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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; bh=/G8uM3TAooXXOFrZ4fioIVdBo/S7TMHDJcaXSyPvyVs=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=Jb5l26ZT2OBadoLXMdSsruIY/q+IxO85ZSMv8N3/+L676cpQuO3d49Y30/LeET6uk1 2g5hXL5YcU+0W3J8VaPOFfHG0fpV//xCd6MTz5amxENJ7MPLmkcPpsVWLoniTiO0z2sb L0aNfSGKEiJJNceARCuJvJ2nsQZ7G88jN5WTBFOg3tibNFKZpl853jTaffP3EC5YCsLt hK5VvrDSjsSWOoKCLMAicucSmueKTyph4tQkJR43T0+V2ZiPMeFMBn5PjZ7HCHGk5PVG vLBJk8uUftxWgKcEfBBaynr3XP9WKZXh0qu6MYSAakYXnm5KfI3AbYABy2AMMEN6726+ PZUw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="My/53z/B"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=PXYE9kpM; 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 34-20020a631962000000b005e4f076f51asi10596268pgz.762.2024.04.01.23.37.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2024 23:37:21 -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=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="My/53z/B"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=PXYE9kpM; 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 [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rrXlZ-00076x-Cq; Tue, 02 Apr 2024 06:37:05 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rrXlX-00076q-FK for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 06:37:03 +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=SmiZDT44lKa1anooDGbjJb/MmD03/Jz1NJvnfbsqjpU=; b=My/53z/Bx/ByDr90YD9BKiVF+F MeWhUU+hB0wL+8YX53h6tFDdPCHan29seFPgJHmhTqe/q32XvtZY/VtAceJjHf6pLTaQNsMA6ZcKP IGMp0+eGWxyuZBcQ3CwHwgiSC0f0wUEMr5wVbbkrm181NpkMqh+NWFvXKjznhZ3U+/M0=; 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=SmiZDT44lKa1anooDGbjJb/MmD03/Jz1NJvnfbsqjpU=; b=PXYE9kpM5Qt2hFVWHu/4Mc+qSz ts9UQFcktlLofsHbvH6AQ7D/XMRPZomCsaHz4sKhpwMAyOdS0xCzvKDQ0mvxQaAATTb3RT/PyBf5F 4Na+UoRnRQE8a9jW018t6XPtevo/4EvVNYsC8Op3AirwcmpmzY2KnCeEAIRqJiXGDkxI=; Received: from dhcp-174.greenie.muc.de ([193.149.48.174] 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 1rrXlT-0006aW-2d for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 06:37:03 +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 4326alwG025500 for ; Tue, 2 Apr 2024 08:36:47 +0200 Received: (from gert@localhost) by blue.greenie.muc.de (8.17.1.9/8.17.1.9/Submit) id 4326alFY025499 for openvpn-devel@lists.sourceforge.net; Tue, 2 Apr 2024 08:36:47 +0200 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 2 Apr 2024 08:36:46 +0200 Message-ID: <20240402063646.25490-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.43.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-2.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: From: Arne Schwabe These two ifdef needs to be the same otherwise the compiler will break with a undefined function. Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- Content analysis details: (-0.0 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1rrXlT-0006aW-2d Subject: [Openvpn-devel] [PATCH v1] Match ifdef for get_sigtype function with if ifdef of caller 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?1795203888680977372?= X-GMAIL-MSGID: =?utf-8?q?1795203888680977372?= From: Arne Schwabe These two ifdef needs to be the same otherwise the compiler will break with a undefined function. Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f Signed-off-by: Arne Schwabe 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/+/551 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 6f29c3d..a158617 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -2166,7 +2166,8 @@ EVP_PKEY_free(pkey); } -#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL +#if (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL) \ + || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x3090000fL) /** * Translate an OpenSSL NID into a more human readable name * @param nid