From patchwork Tue Apr 2 00:22:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "d12fk (Code Review)" X-Patchwork-Id: 3678 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:5a41:b0:55c:c090:46f0 with SMTP id w1csp3458663may; Mon, 1 Apr 2024 17:22:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4I50GHtQpji+mEpTDKyJWayijdkHbjfwoTdzfF7UGrCxg9SqgunOdj6f4X8Vbl3hs9yPQJeCY1ojxzjFfX1sd9o/ljDM= X-Google-Smtp-Source: AGHT+IGG+CmoVelQYwXdohqC2dC4yL/xxZ8VUC7BxjVfAR8hfqc86/l66pLDZQO6acGczyY12Jgj X-Received: by 2002:a17:903:503:b0:1dd:b883:3398 with SMTP id jn3-20020a170903050300b001ddb8833398mr11778289plb.4.1712017376920; Mon, 01 Apr 2024 17:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712017376; cv=none; d=google.com; s=arc-20160816; b=Lku7HFnXxrkn+o79vJ3soXusdRKSPliizvjyv5muiC1WypSaxQqnUb9cOQfaqsPgwT 4QsWHTHi7FRcC/CVlPulS4ZGZ+Igk9+U+iw558TPAY0Api/Hx+l4ndDnaY20radSsWoP 7C3PJXH0CbnpMVxLzVndL7hl8iRVdsZu2Unc/d+L18NEGIMikZqYfTF7wgo6PCM28LQE 5m165zrdOyU6AMMQ7uparISRduOBxq+yDUjkl/TPcsuRupaZvrk1mHTcVcxKtQr6I0Wc tasj8rrmt9TJ9bK/KNSNsj261YaiSaxfjIMyf8NyHQJQAl04mRJKjRftfbeERcBFz10G /oCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:cc:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:user-agent :mime-version:message-id:references:auto-submitted:to:date:from :dkim-signature:dkim-signature:dkim-signature; bh=Uc2hgaEAVBS4Hz7ckXYL4IKYVJsnWUGoHJR6Vy6uPf0=; fh=lm0MLPW7DntlrDqRECIiC9JlE1uPxhepE0URYHIf+eE=; b=xkYhbWEtwdfewWWPJCE/WkwHE0xpMtTeRr9YjCKbDDc02z7CfxRGrpS4KNymbRvCAV 3O5s/p8agpLFl3agUxLAhpqKpeyt1qpFx43FExViZcWl/poBvu6wzlDxAtpPLPB0q4uh RFIlKxraLgOONHftIYPXEAk8EIEEvOX2AtPIogk247MoMZVAaQZcWHiRPza8sf3c/ETp jjFprfpYviqkV/KUI5sdLf7V1JWm8ZyqiDwyUnJYvwXIErm7AkQsJ1wTs8T/3gEAIgbD FAQhuPvF1XCgiqHN5TsyJmIPkdGbpXZhT5VnP/X9FRv0WjReF8sueiVr1I/AotZKRsHw PGHA==; 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=Y4WC26cs; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Q6wjq/zo"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=ck66kNow; 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=openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id m2-20020a170902db0200b001dd67c1b4e8si10362943plx.310.2024.04.01.17.22.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2024 17:22:56 -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=Y4WC26cs; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="Q6wjq/zo"; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=ck66kNow; 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=openvpn.net Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rrRut-0007SX-VN; Tue, 02 Apr 2024 00:22:20 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rrRus-0007SR-Fx for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 00:22:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :Message-ID:Reply-To:References:Subject:List-Unsubscribe:List-Id:Cc:To:Date: From:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BsA5dusDeazWlVkBsoPXHXvjKqUrDbqtecd9LHDwhNE=; b=Y4WC26csQuB++/OWhebuoqKS1R 90YCmaDs6PeUqPKEOo8NDQqJfeeOOQK/R40YM1/w702rlHUQ81xnnBtMiR53Iwz1exZkl+97Breib KelYxdNZ8Gf7xqi1fcIXS32YHaYKPJJ1SJaYHqpWJ7RMGzkRVj6WoReAxq7Jzborer14=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Reply-To: References:Subject:List-Unsubscribe:List-Id:Cc:To:Date:From:Sender:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:List-Help:List-Subscribe:List-Post: List-Owner:List-Archive; bh=BsA5dusDeazWlVkBsoPXHXvjKqUrDbqtecd9LHDwhNE=; b=Q 6wjq/zoLkCNXF6ra8QFY5QtprtM2IQRg316+p64YG5Ryl1Sm+QTZWfn/6egApTMqB8ULQt4s/sqF/ bLDRUw2TKO9BRG1GEwLA7taDSzZ6mMQqBYwRstO+0R/LKUD9Ru1l7XsJbh/ZMaZKE2BL8XSnP1xGZ nAwdTz4dxHbz993w=; Received: from mail-wm1-f50.google.com ([209.85.128.50]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1rrRuo-0003Xj-7d for openvpn-devel@lists.sourceforge.net; Tue, 02 Apr 2024 00:22:18 +0000 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4156684ee9cso8837725e9.1 for ; Mon, 01 Apr 2024 17:22:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1712017322; x=1712622122; darn=lists.sourceforge.net; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from:from:to:cc :subject:date:message-id:reply-to; bh=BsA5dusDeazWlVkBsoPXHXvjKqUrDbqtecd9LHDwhNE=; b=ck66kNowyuviLVNwj8e7rxBmcFVMpbjk87pfM9+higEH/mojOuorG5yALv02eexrxb JQuunZ2aoRjDJmdGd8ztITXiCphzZk22j/AY43HXiI6EzngWShEQpC+HmYgmGJ0gTEoA Yl+ux3ho+ZiIiqFlKgjuMxiiKlGoZD0YYSzzC8WmW49JvJCcezcIv6GLVEH8dy0FqfMt MsgflA6UCfdbZxjuEIR4sB8MNrs3OKe4aJr6nWrVhdXjdGIr4kgoKuq9qlobIbOzCyof KHWfKxc61W+68DbzEzz43Sx1ZLlIC2PdnyG7k7rRM4CK7z8K7tffPZXCQS0vjvGFBEGi z2lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712017322; x=1712622122; h=user-agent:content-disposition:content-transfer-encoding :mime-version:message-id:reply-to:references:subject :list-unsubscribe:list-id:auto-submitted:cc:to:date:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BsA5dusDeazWlVkBsoPXHXvjKqUrDbqtecd9LHDwhNE=; b=gawbJdw0Is3g+CNVI4kkpGjEng9AaDeqigsOw5FQTmJEUeaLuTdg2NrnJxZ7hs6U9e 7mDh6mHdPoCB9sTQtq6b/nBHAySEGXK4Yfzn3fJ4fuAFCmcUVAd1/WF/kt/yabCYi6u7 Zaw+f6xO8/h1W/LS0qKi0z6BzzSGyUwycS3RqblJ1SoRmhgnukADmbwOyOkVFg6jTlZz LbGwcFJdEXaiVkG3kvBHwoM7VImp4U27Iv83yk0EGWb3FUz3AB52m4tJulRtwZ5GtZR+ F3CsV+mOozs0YiOPonmnBmtPxNcpkPGbu8gGMABhRox9+k0GwOApQ7LP44cFLFjuVF3h uNLA== X-Gm-Message-State: AOJu0YxocgwSML0cgNIq/rctNmbQgJK1B4KOa2vDmkgqcF4sFVE3llGU APVuKx77ZAXdpSrOsYjpdv8ClwbaPGSSFIDihTlccdaTXF8trT7Z1fGo05AzzjT/M159otXiQqj M X-Received: by 2002:a7b:c35a:0:b0:415:6afa:1d15 with SMTP id l26-20020a7bc35a000000b004156afa1d15mr1824887wmj.28.1712017322384; Mon, 01 Apr 2024 17:22:02 -0700 (PDT) Received: from gerrit.openvpn.in (ec2-18-159-0-78.eu-central-1.compute.amazonaws.com. [18.159.0.78]) by smtp.gmail.com with ESMTPSA id t7-20020a05600c198700b004155afe0c11sm8941239wmq.15.2024.04.01.17.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 17:22:01 -0700 (PDT) From: "plaisthos (Code Review)" X-Google-Original-From: "plaisthos (Code Review)" X-Gerrit-PatchSet: 1 Date: Tue, 2 Apr 2024 00:22:01 +0000 To: flichtenheld Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I5b14bf90bb07935f0bb84373ec4e62352752c03f X-Gerrit-Change-Number: 551 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: d2f88be7b72779fac83e748b297605d9d29fc4e3 References: Message-ID: MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -0.2 (/) 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: Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.50 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.50 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 WEIRD_PORT URI: Uses non-standard port number for HTTP 0.0 HTML_MESSAGE BODY: HTML included in message -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1rrRuo-0003Xj-7d Subject: [Openvpn-devel] [XS] Change in openvpn[master]: 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: , Reply-To: arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net, frank@lichtenheld.com Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1795180333230610425?= X-GMAIL-MSGID: =?utf-8?q?1795180333230610425?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/551?usp=email to review the following change. Change subject: Match ifdef for get_sigtype function with if ifdef of caller ...................................................................... Match ifdef for get_sigtype function with if ifdef of caller 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 --- M src/openvpn/ssl_openssl.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/51/551/1 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