From patchwork Thu Jun 27 16:53:11 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: 3749 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:8a4:b0:57d:b2cb:6cf with SMTP id iw36csp140201mab; Thu, 27 Jun 2024 09:54:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlO5IegVy4T7XZWlINgASdGXpp4uJ2X7DlDtcd4F+AEJUxZ60Mb5+COFuJ9XhegbVfbLkFcZnklvTgwngJ7h2xRSmWcE4= X-Google-Smtp-Source: AGHT+IG8MWV7ytLMzMw5WckeMdLGr271WW2SvnFshwhAuWwO9FzQ/sYlMP6Vgy6aTSjSEYnjlBdo X-Received: by 2002:a17:90a:c091:b0:2c2:204d:6c2 with SMTP id 98e67ed59e1d1-2c845e4d1b8mr14253820a91.2.1719507246281; Thu, 27 Jun 2024 09:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719507246; cv=none; d=google.com; s=arc-20160816; b=S3p++smSzTe/PEj4yXGK3YO39cfFSgKWCnSfGQfDsi34+VV4lLweaIbu3zOkzyxofG 7tgcGFKuyogCDlu/Qfca16z/DwON/sWHWwuDksjGYCtUKjwrkh51Yk/VLLgRkETilAm/ wBC52cZG7au9AJuORO66eJ7QGgRIRHNG4puB5F2LPEh5aWHNwETN1lMUJz0oXRTdkdTa jYOcTkrar50Rm3/zuZtzHttM1neMrx6q25EcBLwhweyqjJgt+1hw9jUAWlcKWpQaa5gC j2N6k+Zhm3TPEsEW52pbciCx77QJVhNrlaFxl6Q3oVodlY2i2iDh+dyRR3/qsLF9YqhS gonw== 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=6pn6PbwlGy0zKBKaq+3W5pm8fzDwjFVtIp5vi42Krf0=; fh=GFP4qDxgyJ2WEPo/oeLZg3Mj4NqvY1j2nTvTt7psNwg=; b=aXRGCUDRkU3pqxLMIVYKQT3/zUQZoOhYbl1S3t7jf16lNXpHEtqfuXNGqrYXtuFmSa MWrsLtPWymv3wLFSZkMBH+kbeTV9F47x1RksQVeENlgyg/xOOrIMrI2HhyJ6F/iUx6ZF X14CQ8RTA+GJ5fkSVkQwJusWVwOV1BXOoaO6PA4Z+7I7Qfy0NtvaHPcbw+k68aUlZoIa KfMqfPW/ZcO/UEQR72jcg+xlzXRpXs+J2fFuBYJ23KbPi62v9bU298Z/ljJSQaEUHqNu UVxZTxP0MQ41MJLyZMZjDAZZVC0XjcycKNynsrwjIPOdeK1Mo/IY4wr95zPfY38TxcO+ JI9w==; 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=LxXw2nSO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J37s+7g5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=J4JP6bjY; 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 98e67ed59e1d1-2c91d17b34dsi397a91.81.2024.06.27.09.54.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Jun 2024 09:54:06 -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=LxXw2nSO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=J37s+7g5; dkim=neutral (body hash did not verify) header.i=@openvpn.net header.s=google header.b=J4JP6bjY; 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 1sMsND-0000Bi-6X; Thu, 27 Jun 2024 16:53:26 +0000 Received: from [172.30.29.66] (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 1sMsNB-0000Bb-SW for openvpn-devel@lists.sourceforge.net; Thu, 27 Jun 2024 16:53:25 +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=pg9LDmL2H7WYf4upXe10lSmGw++xdB1iGJTBxJPPwYU=; b=LxXw2nSO/gf5pQ6TiyiQ1DbIe7 eRHRRI8j2KQo+bbo3qv7tVuCPWVV2WinCmPxsm2UNttVC+Ev0F1Nx5xYfx8fp0HssFHWAqwaTLDnv 5BjA8rLdbGnTsIXrrbfnj2Gsw+koDwgc6lJCTTbrvo4q7iCzBnscemPoUBsbEF/NiAQk=; 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=pg9LDmL2H7WYf4upXe10lSmGw++xdB1iGJTBxJPPwYU=; b=J 37s+7g5BEKbLPT66KbIlDSf92Rz/dULON8DUtDGSTdjguldeqIsQEEA4a4JEglqrUP/tmQKygyUXF Imk7L42lqf2jBfCcoAVYoXHW21DwvDlGPgTGPpS8s+1KM4kYdtt3jwI2uJfe8TdA1iSdEbUCiArP3 jW8glFlodeKihcGA=; Received: from mail-wr1-f44.google.com ([209.85.221.44]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1sMsNB-0007jW-5k for openvpn-devel@lists.sourceforge.net; Thu, 27 Jun 2024 16:53:25 +0000 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-363bd55bcc2so6197222f8f.2 for ; Thu, 27 Jun 2024 09:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvpn.net; s=google; t=1719507193; x=1720111993; 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=pg9LDmL2H7WYf4upXe10lSmGw++xdB1iGJTBxJPPwYU=; b=J4JP6bjYPpgzZFkqPDioRUdR97DvlpgM7Adew70eeV8KyYl22AYo49vbhvXOR/dCj2 f5/yXyX+etQEpf+cGjnkDXBCafvxKrjV/l2jAQEqjnCjdczrjIrtGp6f4N8PihudDL6R PyvIeCIpdW2Nj6a9RX+vSE1sVKaXJT/b4YzdQNd13CDoGVlTDsKpOsgsNSwPGuUSHsmA JfHBCESwJnMuvlweCqlOlsbBnupjKEL6vSNitWRmAPCK4c9T3scmF2RhcopYeK1KFQA8 ZFMm2y1T+z1u2ITx7DUXBW/qMmt3MGIWWHiR0HEtVNJrzDfYFxc1lYp2q9QRU8gSrbeO DxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719507193; x=1720111993; 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=pg9LDmL2H7WYf4upXe10lSmGw++xdB1iGJTBxJPPwYU=; b=u38yDzfMUK7+8UkjNrFBWkcsVSKb8qac9AUCRjCqM7je5aSxj2UnsIem5yzzjzcVDg 6ucoAp7kgoiZid1R1isBB3+Ao1nxFqTSJuRDdLfikII6WnZdZRsosTVo6MPYz7SLCRIq K2NcJ2k2XhW7BJ7ZfqWEShjpK4eEEYmcgU6xwUit5pb1m0GyF6UqsFCG1vOJxUaXhTUY ALgHS8zbbh18LlCDd1C6o0JMwByg7TsXe9jsFECVRPpK0oE7f5oId2UqspXTj7BGSCXV u3BwTO2S4vhOT7UvrMaBWEVJSHAeZz+edngJj9ReFhy4uZuDPG8kAW1J1NB7okF+vBjE H69w== X-Gm-Message-State: AOJu0Yx8E+gkIhTVSZBRL0H/pBgE/lvSj/3E1bnYbE4B/+o7KBvejPA7 cwlO07WUGtCornW56iVdx/BbPZxyaGQ2Q4CvhCpgHAKL2a0mn8XaNL6KgGtfg1b7xjWajs1nac3 9 X-Received: by 2002:adf:fd85:0:b0:360:9180:760f with SMTP id ffacd0b85a97d-366e962ff92mr8496697f8f.66.1719507192718; Thu, 27 Jun 2024 09:53:12 -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 ffacd0b85a97d-3674357c0f5sm2462533f8f.4.2024.06.27.09.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jun 2024 09:53:12 -0700 (PDT) From: "flichtenheld (Code Review)" X-Google-Original-From: "flichtenheld (Code Review)" X-Gerrit-PatchSet: 1 Date: Thu, 27 Jun 2024 16:53:11 +0000 To: plaisthos Auto-Submitted: auto-generated X-Gerrit-MessageType: newchange X-Gerrit-Change-Id: I5d0da76018e874cda5dbab9202a2b817ad5e4692 X-Gerrit-Change-Number: 671 X-Gerrit-Project: openvpn X-Gerrit-ChangeURL: X-Gerrit-Commit: fb3a7f6b740405f0aac39595a916b71d58e1daad References: Message-ID: <869e7a84d0034d95718c1cd9b1454753bc8118b2-HTML@gerrit.openvpn.net> MIME-Version: 1.0 User-Agent: Gerrit/3.8.2 X-Spam-Score: -5.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: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit Content analysis details: (-5.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: openvpn.net] -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [209.85.221.44 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.44 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [209.85.221.44 listed in sa-accredit.habeas.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.44 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_SIGNED Message has a DKIM or DK signature, not necessarily valid -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_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: 1sMsNB-0007jW-5k Subject: [Openvpn-devel] [S] Change in openvpn[master]: configure: Try to use pkg-config to detect mbedTLS 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?1803034030570305897?= X-GMAIL-MSGID: =?utf-8?q?1803034030570305897?= 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/+/671?usp=email to review the following change. Change subject: configure: Try to use pkg-config to detect mbedTLS ...................................................................... configure: Try to use pkg-config to detect mbedTLS mbedTLS does not seem to have pkg-config support on e.g. Debian/Ubuntu, so we definitely need to keep the fallback check as well. Change-Id: I5d0da76018e874cda5dbab9202a2b817ad5e4692 Signed-off-by: Frank Lichtenheld --- M configure.ac 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/71/671/1 diff --git a/configure.ac b/configure.ac index 555c97e..b2d27cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1000,14 +1000,21 @@ if test -z "${MBEDTLS_CFLAGS}" -a -z "${MBEDTLS_LIBS}"; then # if the user did not explicitly specify flags, try to autodetect - LIBS="${LIBS} -lmbedtls -lmbedx509 -lmbedcrypto" - AC_CHECK_LIB( - [mbedtls], - [mbedtls_ssl_init], - [MBEDTLS_LIBS="-lmbedtls -lmbedx509 -lmbedcrypto"], - [AC_MSG_ERROR([Could not find mbed TLS.])], - [${PKCS11_HELPER_LIBS}] + PKG_CHECK_MODULES([MBEDTLS], + [mbedtls >= 2.0.0 mbedx509 >= 2.0.0 mbedcrypto >= 2.0.0], + [have_mbedtls="yes"], + [LIBS="${LIBS} -lmbedtls -lmbedx509 -lmbedcrypto"] ) + # mbedtls might not have pkgconfig integration, so try manually + if test "${have_mbedtls}" != "yes"; then + AC_CHECK_LIB( + [mbedtls], + [mbedtls_ssl_init], + [MBEDTLS_LIBS="-lmbedtls -lmbedx509 -lmbedcrypto"], + [AC_MSG_ERROR([Could not find mbed TLS.])], + [${PKCS11_HELPER_LIBS}] + ) + fi fi CFLAGS="${MBEDTLS_CFLAGS} ${PKCS11_HELPER_CFLAGS} ${CFLAGS}"