From patchwork Fri Jan 30 07:11:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 4744 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:6911:b0:80a:3855:ce6a with SMTP id o17csp7832map; Thu, 29 Jan 2026 23:11:56 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUEG58L3/xRv28RVIzTkHTrbNiNLxr+KhS3NnbY64/qFXL3Q5QHsEcebNOY6X9qnyAoMZm3O4NQCyU=@openvpn.net X-Received: by 2002:a05:6820:1621:b0:662:f543:5d45 with SMTP id 006d021491bc7-6630f3d4c0fmr947044eaf.77.1769757116014; Thu, 29 Jan 2026 23:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769757116; cv=none; d=google.com; s=arc-20240605; b=gaKOOi0yPAXPmNAYsKt3tAIBHLbvZFbJmRTUwPqBdANWuDNuLv9W9SNDDLlhtwximx NqixvMw1hS+xkgKedwE4yrMXsRKVzj2CNw5Y2TMPKYM3D9asDsYyTqXuDd4fGp+JoGqo dnRkmcHOLCii/hTYVtKkG3iHge2+OUDZNgdhLQMst4uKbPZp6TZGegUnEVEKp9sT2oBG fRHrgj4H2vEmcLxw2zwKRnKmh0OhRydE5/QzPTHfZZNvmkYafGGSZ4csFws2TnKJneQc yNpQLTlxk67HvXX1yIgyj4aFlU2Vkvk36kRRdxq3IoBCOUWZhj1mVK5scZ2SmplDyj1W hsZg== 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=qOjRjqdaM3m9UQpByv2sNfau5gTM1DdgHiSw8a4RRbc=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=DxNS0RGc0832a0NRLi3xpwQwNSU6gitC2TgY50xvikgR9bpgsc/vR6/apDDFMiAF8q yCWzOj7YeqDiC01SJNkQxbu7CdtWQDB5/r2gPa2C/gCJLjVvsQ/d24UqiybRO/PY92qn id/Zn5uSwCS/AEU+OnO6u0fLiL72m54aAgiYx7pMCW+g1yOiogN7MwcKoybLGVXeNjBF lcPuxSWc28PAbxCnXQtazTSq8GK1It+zVZ1p0ob2e7nE9keHHKY5LkFQUe5/51hGMSq8 iCrtebgauhAmBPm9gxV71s+qD32sbzSqrSCUVw/7GLMf8mapqMK+kleKcvUU4VG4+m/d j3hw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=EF7L3xw+; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Lt6pNZCw; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=cO+Vy5Wo; 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-409577dc61esi5872820fac.361.2026.01.29.23.11.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jan 2026 23:11:55 -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=EF7L3xw+; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Lt6pNZCw; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=cO+Vy5Wo; 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=qOjRjqdaM3m9UQpByv2sNfau5gTM1DdgHiSw8a4RRbc=; b=EF7L3xw+s3pzJhnQRj6MeWgPPy gv5NN+eDbDhjhFNW7HPGw/6g1CTpRDEpeMMEANQJJ87Chh2c3kx/+VNYHfmKoMdIthe538mexSy9j naHl1Kz4NVEbe1BUOW+ZJWN5O/iQGehLYwq++GLlB94CQ2x3bl2CsvfxP+XD49SItrh0=; 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 1vlifT-0002kk-0L; Fri, 30 Jan 2026 07:11:47 +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 1vlifR-0002kd-MY for openvpn-devel@lists.sourceforge.net; Fri, 30 Jan 2026 07:11:45 +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=xQwSDzMin7cmfkhFh/u9z6Zlyb9Z3OfXW+S3E1P974U=; b=Lt6pNZCwE10foMb5SfFHxp4FYk chSbBaEpif9KanQsUrsyiOdezkQbCONitWhBb06GHi84rviwyd+pMBTHxJLSMCD/mZbAQmtdLWU5Y fkGhkGQD9k5S+GITHmUyehjoP4hGAciY7mzkUuHnpo9aRofgsFvHwu6AeGR1zHE2tSUc=; 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=xQwSDzMin7cmfkhFh/u9z6Zlyb9Z3OfXW+S3E1P974U=; b=cO+Vy5WoLmV8N1qUgpHuKR+y8v Vu5ECCGeCcmbk83Yhw7NgrOV+m9L4ZQZyazBx0iAf4HBXeoPqPgMZUMvkyeLk9e8nLmPSRZV/Kn4J D0udw5VPGG/VH2bR81IW2j81mBa7mNNbs7kbnzN76DX28PU7bTeqJPVo7NGBRbW57wlY=; 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 1vlifQ-0004fL-Es for openvpn-devel@lists.sourceforge.net; Fri, 30 Jan 2026 07:11:45 +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 60U7BbUL014412 for ; Fri, 30 Jan 2026 08:11:37 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.1/8.18.1/Submit) id 60U7BbOH014411 for openvpn-devel@lists.sourceforge.net; Fri, 30 Jan 2026 08:11:37 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Fri, 30 Jan 2026 08:11:31 +0100 Message-ID: <20260130071137.14398-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-1.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: Max Fillinger Expand the tables of hash functions and elliptic curve groups, and also check if they are compiled in. Change-Id: I740991f22b728fe2f5a48bc18d5ca4b62f56f399 Signed-off-by: Max Fillinger Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openv [...] 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: 1vlifQ-0004fL-Es Subject: [Openvpn-devel] [PATCH v3] Mbed TLS 4: Add more algorithms 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?1855724837582835539?= X-GMAIL-MSGID: =?utf-8?q?1855724837582835539?= From: Max Fillinger Expand the tables of hash functions and elliptic curve groups, and also check if they are compiled in. Change-Id: I740991f22b728fe2f5a48bc18d5ca4b62f56f399 Signed-off-by: Max Fillinger Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1500 --- 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/+/1500 This mail reflects revision 3 of this Change. Acked-by according to Gerrit (reflected above): Arne Schwabe diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index 5418df9..02735cd 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -605,10 +605,36 @@ } static const md_info_t md_info_table[] = { - /* TODO: Fill out table. */ +#if defined(PSA_WANT_ALG_MD5) { "MD5", PSA_ALG_MD5 }, +#endif +#if defined(PSA_WANT_ALG_SHA_1) { "SHA1", PSA_ALG_SHA_1 }, +#endif +#if defined(PSA_WANT_ALG_SHA_224) + { "SHA224", PSA_ALG_SHA_224 }, +#endif +#if defined(PSA_WANT_ALG_SHA_256) { "SHA256", PSA_ALG_SHA_256 }, +#endif +#if defined(PSA_WANT_ALG_SHA_384) + { "SHA384", PSA_ALG_SHA_384 }, +#endif +#if defined(PSA_WANT_ALG_SHA_512) + { "SHA512", PSA_ALG_SHA_512 }, +#endif +#if defined(PSA_WANT_ALG_SHA3_224) + { "SHA3-224", PSA_ALG_SHA3_224 }, +#endif +#if defined(PSA_WANT_ALG_SHA3_256) + { "SHA3-256", PSA_ALG_SHA3_256 }, +#endif +#if defined(PSA_WANT_ALG_SHA3_384) + { "SHA3-384", PSA_ALG_SHA3_384 }, +#endif +#if defined(PSA_WANT_ALG_SHA3_512) + { "SHA3-512", PSA_ALG_SHA3_512 }, +#endif }; const size_t md_info_table_entries = sizeof(md_info_table) / sizeof(md_info_t); diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 3e1698f..5227eb8 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -356,15 +356,54 @@ #if MBEDTLS_VERSION_NUMBER >= 0x04000000 static const mbedtls_ecp_curve_info ecp_curve_info_table[] = { - /* TODO: Fill out the table. */ +/* secp curves. */ +#if defined(PSA_WANT_ECC_SECP_R1_256) { "secp256r1", MBEDTLS_SSL_IANA_TLS_GROUP_SECP256R1 }, +#endif +#if defined(PSA_WANT_ECC_SECP_R1_384) { "secp384r1", MBEDTLS_SSL_IANA_TLS_GROUP_SECP384R1 }, +#endif +#if defined(PSA_WANT_ECC_SECP_R1_521) + { "secp521r1", MBEDTLS_SSL_IANA_TLS_GROUP_SECP521R1 }, +#endif + +/* Curve25519. */ +#if defined(PSA_WANT_ECC_MONTGOMERY_255) { "X25519", MBEDTLS_SSL_IANA_TLS_GROUP_X25519 }, +#endif + +/* Curve448. */ +#if defined(PSA_WANT_ECC_MONTGOMERY_448) + { "X448", MBEDTLS_SSL_IANA_TLS_GROUP_X448 }, +#endif + +/* Brainpool curves. */ +#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_256) + { "brainpoolP256r1", MBEDTLS_SSL_IANA_TLS_GROUP_BP256R1 }, +#endif +#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384) + { "brainpoolP384r1", MBEDTLS_SSL_IANA_TLS_GROUP_BP384R1 }, +#endif +#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_512) + { "brainpoolP512r1", MBEDTLS_SSL_IANA_TLS_GROUP_BP512R1 }, +#endif + +/* Named Diffie-Hellman groups. */ +#if defined(PSA_WANT_DH_RFC7919_2048) { "ffdhe2048", MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE2048 }, +#endif +#if defined(PSA_WANT_DH_RFC7919_3072) { "ffdhe3072", MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE3072 }, +#endif +#if defined(PSA_WANT_DH_RFC7919_4096) { "ffdhe4096", MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE4096 }, +#endif +#if defined(PSA_WANT_DH_RFC7919_6144) { "ffdhe6144", MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE6144 }, +#endif +#if defined(PSA_WANT_DH_RFC7919_8192) { "ffdhe8192", MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE8192 }, +#endif }; static const size_t ecp_curve_info_table_items = sizeof(ecp_curve_info_table) / sizeof(mbedtls_ecp_curve_info); @@ -1523,7 +1562,11 @@ pcurve++; } #else - msg(M_FATAL, "Mbed TLS 4 has no mechanism to list supported curves."); + printf("Available elliptic curves:\n\n"); + for (size_t i = 0; i < ecp_curve_info_table_items; i++) + { + printf("%s\n", ecp_curve_info_table[i].name); + } #endif /* MBEDTLS_VERSION_NUMBER < 0x04000000 */ }