From patchwork Fri Sep 6 11:55:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "plaisthos (Code Review)" X-Patchwork-Id: 3802 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6bd4:b0:5b9:581e:f939 with SMTP id c20csp91183max; Fri, 6 Sep 2024 04:55:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlDJEfqNxpuIn2p6pEfpU9xsTRM2Rog/kuXXyirUJB3mu6oHAQ0JkMVp3jXFhszyUyxFHe1WYDYFk=@openvpn.net X-Google-Smtp-Source: AGHT+IESCY2GYv37n5o6iahsGhAvG/6TblM3O+/qkZmj9Y0uMYzZvMtWcAwm69em1dMQy/ADEJC8 X-Received: by 2002:a05:6a20:9f05:b0:1cf:122b:37d1 with SMTP id adf61e73a8af0-1cf1d148ab7mr1771096637.30.1725623757726; Fri, 06 Sep 2024 04:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725623757; cv=none; d=google.com; s=arc-20240605; b=JvtQr7DuiR+tcUf0Xro5Lk8sQlD1s/1gdnTxwZ3J/g++dh4PIC2SzfAwrSOMveABTU gi3Hg+Y9FrlczVCy33sdPELRpX3PgQkBnUhP8ejWwzScevWg5amRomhS8LkdifpP2zM7 GcZf+jgsFh1yEBH3QWAXKHACyvAiYTxNz7o4YdfpLQUrolbFzWsVAe6z3deeQs0umU3u NB1Mr5GLuZs86VsVS8gWU1gqoYZAMAKZ9kH6LJ/tElIoz7jAue1JfY24swiEb/hEE6h6 KnOQsVMC1V2Q62Q3WBuKpw0Qc+HRzu+jXSDzH2tFDCLbLPKbwnnj2Ae9RieTA+cVUnp8 RcwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Sea8GDnl3aSen7NAywEH7BsRrKY29H7j9rcoZAb9dHo=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=DEJwq1u9YoJy7O1Xw4hbtjwr/jxhYjFycNdaPMMYBGd3PSR+mVgjTuXyOW73kV+0PF ai4UyxRIKvdeC3KXRZEly+iieRpu7+9Hdp5x6INNN9yGxmx7EQcKv8DpuLLhc4IDYCJ2 zLcXD7yhLaTkv1mGWNH1aEvl7J1LUFOy3yefpUy1ZAD8MUV9b//K8WUd6MPdbE4TCrAe ozHvcj9e0mEtrqAIl/mKeTkwF5WVDvdEJlCK0cCQ901EmTDD2lHRw2KotK7qYZKCIXez vZHMHkDg470arTJRfcqqEV1uFkEXf28K4adJHiL48WWIwm+8BgLdp2h2eP8sdoBIT2Qn aQ5A==; 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=TKY3txX1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=bL86iePK; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=LWRXdNwr; 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; dara=fail header.i=@openvpn.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2dadc05144esi1389126a91.88.2024.09.06.04.55.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Sep 2024 04:55:57 -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=TKY3txX1; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=bL86iePK; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=LWRXdNwr; 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; dara=fail header.i=@openvpn.net 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 1smXYl-0002Vb-Ua; Fri, 06 Sep 2024 11:55:27 +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 1smXYk-0002VV-FU for openvpn-devel@lists.sourceforge.net; Fri, 06 Sep 2024 11:55:26 +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=/GGH5E/2ueo0MZr5pIs/rJ5CY3yYGYD9t7xcPdXKqgI=; b=TKY3txX1oqA2d1+TGN8f9kl/vq CiI7CJ4zTFPeN0DihMhYbO7nTulWM20v/Oo9DoqNTU7UFfNYtIiV3ejBpiHlc8FWmPqJFm/qaldHq re4pKlN0RUw3BauukCajILnjeTHPMRpErCHKvD+oR2P+BEq5p7CHx1m8dZYGas8kNOaQ=; 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=/GGH5E/2ueo0MZr5pIs/rJ5CY3yYGYD9t7xcPdXKqgI=; b=b L86iePKzKM2VmrfQ8PSUyYMUihY08bd8TlUyhQuvhZpYB7C8HQoXuu0fivHenRq/UldwXDxtcd17B og86/Q5p/6nASlWDekxSyHEJpQS6UiflWe1BJw2uYr6bd8VMGu5Tc4MBRxjFynuSx8MJRTNGw1263 EHTYh3BQati1/0/c=; Received: from mail-wr1-f52.google.com ([209.85.221.52]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1smXYj-00009v-Fl for openvpn-devel@lists.sourceforge.net; Fri, 06 Sep 2024 11:55:26 +0000 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3787f30d892so1092608f8f.0 for ; Fri, 06 Sep 2024 04:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1725623714; x=1726228514; 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=/GGH5E/2ueo0MZr5pIs/rJ5CY3yYGYD9t7xcPdXKqgI=; b=LWRXdNwr8HMmnbC3PgaWYy4kXsbKApjwmJEo7lwgZSmzJo9zXPT17YA5a4xlpeFn6G 6kHU5Fj4TCmUKAk7XWhZBtzh7bNZmDmWEeqQHTttx5RQkI/QLaflZXENlV0mnWXX+D5Y GxTgw4q/tjRTm9+p2rqVN3vOCxYN7DBkXeFSzfxtiaEUEvgshW9pj94Kz8QrlnhYX75L Tr8bCey0OAlTf1GVnAFBLRGldop453zDX2F1XUGZAhpoW3IqgKUafmAT9NTh7Te43dWS 8T308OupSY/I+JyB3w24CpENL7ngXOljBs+Kj0pEa6PZ3IHCD4ilr6x47LNE0F5nJGje ra7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725623714; x=1726228514; 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=/GGH5E/2ueo0MZr5pIs/rJ5CY3yYGYD9t7xcPdXKqgI=; b=n52JQ+n6gk6lNInf8bjIPCiljtbLF/ONituq6qBRbjZ9KXGRKI+EaHjv/YHUWSUdix QNWZ/S+wkcWRCMK5AQ02wXyCCB6XkMmswPcmfP6UXwn8LH2+kg9BhzoU4Sw3rGzQw+pD DDfLbuFZ4dMqJQYeYo0+4tu6QKL2oeZPTxEpf5gehz7inlVtaJtEPlQbz96+1rg1TZDH brGelFqJrVi1YOk6NJuE5TGZVdJ41eV6h3FyiOHNGBBsYYy6pZRaAMQbqg/mQJEsX8tQ E+GTNFTj4rS5I9ujFcDwTKZQ0Yuac0sP7qjnwdjsS2NX5kc55yVdQ5/sIbZ0t3VHRwCM o4ZA== X-Gm-Message-State: AOJu0YwNbX/JPcrnHYMx+WvhYbdR2GXjypzLW7ewNVd7tAA8ITMNJfnB b3ayuDxLLQ3B1MqSk2efjA/RCMAcgNHbSGeb2dJkIS2Mg3uFlSFy0Y2j+gGZJ121PhpGyHsQqmv R X-Received: by 2002:adf:fdc2:0:b0:371:8cd6:b2c1 with SMTP id ffacd0b85a97d-378896c38ebmr1475301f8f.48.1725623713160; Fri, 06 Sep 2024 04:55:13 -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 5b1f17b1804b1-42ca06005desm18351055e9.34.2024.09.06.04.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 04:55:12 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Fri, 6 Sep 2024 11:55:12 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I37a3a316027197ab336f05a0ee674310fc3df57d X-Gerrit-Change-Number: 735 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: 41d579ad5259dc978fc34c643e76440741e203ae References: Message-ID: <9c69a319f625bc0da974cfa599bef4076499f47c-HTML@gerrit.openvpn.net> 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-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: Attention is currently required from: plaisthos. Hello plaisthos, 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.221.52 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.52 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_KAM_HTML_FONT_INVALID Test for Invalidly Named or Formatted Colors in HTML X-Headers-End: 1smXYj-00009v-Fl Subject: [Openvpn-devel] [S] Change in openvpn[master]: crypto_openssl: Suppress deprecation warnings with OpenSSL 3 for GCC ... 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: frank@lichtenheld.com, arne-openvpn@rfc2549.org, openvpn-devel@lists.sourceforge.net Cc: openvpn-devel Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1809447657283229658?= X-GMAIL-MSGID: =?utf-8?q?1809447657283229658?= X-getmail-filter-classifier: gerrit message type newchange Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/735?usp=email to review the following change. Change subject: crypto_openssl: Suppress deprecation warnings with OpenSSL 3 for GCC as well ...................................................................... crypto_openssl: Suppress deprecation warnings with OpenSSL 3 for GCC as well When a user explicitly wants to use OpenSSL engine support with OpenSSL 3 (we will disable it by default), then allow them to use -Werror. We already had code for MSVC, add GCC as well. Change-Id: I37a3a316027197ab336f05a0ee674310fc3df57d Signed-off-by: Frank Lichtenheld --- M src/openvpn/crypto_openssl.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/735/1 diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index fbd38f3..295fd47 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -61,9 +61,14 @@ #error Windows build with OPENSSL_NO_EC: disabling EC key is not supported. #endif +#if HAVE_OPENSSL_ENGINE && OPENSSL_VERSION_NUMBER >= 0x30000000L +/* mute ossl3 deprecation warnings */ #ifdef _MSC_VER -/* mute ossl3 deprecation warnings treated as errors in msvc */ #pragma warning(disable: 4996) +#else +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif #endif /* @@ -1454,4 +1459,12 @@ return false; } #endif /* if LIBRESSL_VERSION_NUMBER */ + +#if HAVE_OPENSSL_ENGINE && OPENSSL_VERSION_NUMBER >= 0x30000000L +/* mute ossl3 deprecation warnings */ +#ifndef _MSC_VER +#pragma GCC diagnostic pop +#endif +#endif + #endif /* ENABLE_CRYPTO_OPENSSL */