From patchwork Mon Dec 8 19:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4665 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:29c3:b0:7b1:439f:bdf with SMTP id g3csp889050max; Mon, 8 Dec 2025 11:42:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXbxH6xA+WphwNPwT3SlZ69GELP7nlT3qdLvhdkPyTqxKrJ5x6P+6LxSFs4W9mXHreJTO9IeYPX4GQ=@openvpn.net X-Google-Smtp-Source: AGHT+IHJ5QfDEgLus9CCYg6fuoqGu2qzNKVUdTckmMUnccG3SkTedEwSCUH3VYol4yVAdvSbTZnB X-Received: by 2002:a05:6870:ac2b:b0:3ec:4d8f:f952 with SMTP id 586e51a60fabf-3f54405a48dmr4064722fac.43.1765222923439; Mon, 08 Dec 2025 11:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1765222923; cv=none; d=google.com; s=arc-20240605; b=NSqtBo+RKWvOLAEMm9e3k3lRPzVOKzFiTgYhDmZWtmEZ24OEGKMEYhskG3pFiz0rtW Zr31twwBPb7ZlPlUW6pq/ch46M4LQgqDkjY+Ldr8jlJ2K6duvfNJUdQ9R3Iz439eZcuG cL8Oa5IePNKg7r29mDvRf9qpOfvEy4eVgJGFWefdhqs+R7YYFJ9HUL8yJrnZnbx4wq29 fUvkXh02tGy45LETuFvPqi92nwijeJ7L4pKZU8NSDN2baYKx9Mn3eKhQsewQfjJD66bz go0Ovl7+5OlNN+UwNkdxefKBkHUwRsxekd9Fgg9exyV3KATbHq1PmwvtX+mjLUVGGULF VfGA== 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=0SQFET/m3JQekLU6+GUyfvLzSZdEIy8bh+tVn9tTYqc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=ZhJNGhwH3ypKJyAxle/vUcgBI4p6klTdYwcXBtdefBCQDCuYAmjiC5jbfUw+4V9t/F IXA4B9uCtz84UIUeFxecg2axkVMB/nEj8wcscDpcsL/SBccak08rDi8vAdDQrIVGpQte WLYQ58B09sbI3MupmgArF7cONUKcMampsoV4tgaAgxksc5sjdRcDDxaywJnqtfMIWRUs NRsUlCk5FKKjBU8gIMLD4XM/DA2W15lgr8VzGMhsnDow+c5l8hG/9wV0M/uDtkLH+0re 5mRKPea7rDyJAW+bE1wQOjCjuq2DGkySSt3/VzXFIWGs6DupYh06uWBibrQ1YBC9itFC /cAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Ew76B0ow; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=mEOt2WE0; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=cArdqO+K; 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 586e51a60fabf-3f50b50f796si8639339fac.384.2025.12.08.11.42.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Dec 2025 11:42:03 -0800 (PST) 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=Ew76B0ow; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=mEOt2WE0; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=cArdqO+K; 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=0SQFET/m3JQekLU6+GUyfvLzSZdEIy8bh+tVn9tTYqc=; b=Ew76B0owYyZJkdVKq/DbSDe3aY N9GuJltdnSQMwpp2Ui52IMgEv0uJ3sPCdsRUJ+mBbKbKP0VbGlbTmtV6QEPHyW/OYJ8lufhvxvGFv lD379uNqOJtFw3MKgjWa0qrY5Yw487Yt+fQlm+VQKb7l5e0GOWTTi5hUl/15IrCOfyuY=; 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 1vSh7R-0000V6-Ic; Mon, 08 Dec 2025 19:42:01 +0000 Received: from [172.30.29.66] (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 1vSh7P-0000Uu-M1 for openvpn-devel@lists.sourceforge.net; Mon, 08 Dec 2025 19:41:59 +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=8VSJ9p4kSyQLEKilAGT5tmveUElW6Q84Z1c8TogcwOU=; b=mEOt2WE0PKXicbEuXtTXpK09EX whKwXAJUTzdLG7QAJKoKmCyfEzPJUKJucuD8dQb/tVmzj79J02L+/HqLDVZIi4CqUFrlNLocBl92k rLlFFmr3MfQMMOuE8y24j0PUhPBIZHKNcLOWKMNDAlrWSbHweRFlVaA2b0y6FKBcd2Do=; 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=8VSJ9p4kSyQLEKilAGT5tmveUElW6Q84Z1c8TogcwOU=; b=cArdqO+KNt8YmVV9SEGx8idWvs EaJluFUawr54mziv2weyOuBq2+8pNeVUiMkreeNkic2N9SZ5LtjjU/CIqtrORLsfmWwdbA8uTuuQU poRPpjHNEsDMTuy0HsiTgsWHTcTlywaETCFX3B8J1iBS5p4BXTGQeNhdleLLVAUy+RxA=; Received: from [193.149.48.134] (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 1vSh7O-00030i-I8 for openvpn-devel@lists.sourceforge.net; Mon, 08 Dec 2025 19:41:59 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 5B8Jfq47017435 for ; Mon, 8 Dec 2025 20:41:52 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 5B8Jfqf8017434 for openvpn-devel@lists.sourceforge.net; Mon, 8 Dec 2025 20:41:52 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Mon, 8 Dec 2025 20:41:46 +0100 Message-ID: <20251208194151.17419-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.51.2 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-2.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 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 Acked-by: Yuriy Darnobyt Message-Id: <20240906160510.76387-1-frank@l [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1vSh7O-00030i-I8 Subject: [Openvpn-devel] [PATCH v1] 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1850970392438492623?= X-GMAIL-MSGID: =?utf-8?q?1850970392438492623?= From: Frank Lichtenheld 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 Acked-by: Yuriy Darnobyt Message-Id: <20240906160510.76387-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29090.html Signed-off-by: Gert Doering Acked-by: Gert Doering Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1422 (cherry picked from commit c829f57096cb6951aa4698eff388aeebf9310334) --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1422 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering diff --git a/configure.ac b/configure.ac index bf252c9..307329d 100644 --- a/configure.ac +++ b/configure.ac @@ -1010,14 +1010,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}"