From: "MaxF (Code Review)" Date: Thu, 29 Jan 2026 15:40:21 +0000 In-Reply-To: References: Reply-To: max@...2606..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <729b8090dda1f2e6bc6f4020f389bc1118b6f93b-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="KEuX8ON8Ezk="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Mbed TLS 4: Add more algorithms List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --KEuX8ON8Ezk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: MaxF. Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1500?usp=3Demail to look at the new patch set (#3). Change subject: Mbed TLS 4: Add more algorithms ...................................................................... Mbed TLS 4: Add more algorithms 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 --- M src/openvpn/crypto_mbedtls.c M src/openvpn/ssl_mbedtls.c 2 files changed, 72 insertions(+), 3 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/00/1500/3 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[] =3D { - /* 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 =3D sizeof(md_info_table) / sizeof(md_i= nfo_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 >=3D 0x04000000 static const mbedtls_ecp_curve_info ecp_curve_info_table[] =3D { - /* 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 =3D sizeof(ecp_curve_info_t= able) / 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 =3D 0; i < ecp_curve_info_table_items; i++) + { + printf("%s\n", ecp_curve_info_table[i].name); + } #endif /* MBEDTLS_VERSION_NUMBER < 0x04000000 */ } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1500?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I740991f22b728fe2f5a48bc18d5ca4b62f56f399 Gerrit-Change-Number: 1500 Gerrit-PatchSet: 3 Gerrit-Owner: MaxF Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: MaxF --KEuX8ON8Ezk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: MaxF.

MaxF uploaded patch set #3 to this change.

View Change

Mbed TLS 4: Add more algorithms

Expand the tables= of hash functions and elliptic curve groups, and also
check if they are= compiled in.

Change-Id: I740991f22b728fe2f5a48bc18d5ca4b62f56f399Signed-off-by: Max Fillinger <maximilian.fillinger@...2918...>
-= --
M src/openvpn/crypto_mbedtls.c
M src/openvpn/ssl_mbedtls.c
2 fi= les changed, 72 insertions(+), 3 deletions(-)

gi=
t pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/00/1500/3
<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c<= /span>
index 5418df9..02735cd 100644
--- a/src/ope= nvpn/crypto_mbedtls.c
+++ b/src/openvpn/crypto_mbedtls.c
@@ -605,10 +605,36 @@
}

static const md_info_t md_info_table[] =3D {
- /* 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 },<= br>+#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_S= HA_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", PS= A_ALG_SHA3_256 },
+#e= ndif
+#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 =3D 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_mbedtl= s.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -356= ,15 +356,54 @@

#if MBEDTLS_VERSION_NUMBE= R >=3D 0x04000000
static const mbedtls_ecp_curve_info e= cp_curve_info_table[] =3D {
- /* 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)<= /span>
{ "secp384r1", MBEDTLS_SSL_IANA_TLS_GROUP_SE= CP384R1 },
+#endif
+#if defined(PSA_WANT_E= CC_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. */
+ { "X448", MBEDTLS_SSL_IANA_TLS_GROUP_= X448 },
+#endif
+
+/* Brainpool curves. */
+#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_= 256)
+ { "bra= inpoolP256r1", MBEDTLS_SSL_IANA_TLS_GROUP_BP256R1 },
+#endif
+#if defined(PSA_WANT_ECC_BRAINPOOL_P_R1_384)
+ { "brainpoolP384= r1", 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 Diffi= e-Hellman groups. */
= +#if defined(PSA_WANT_DH_RFC7919_2048)
{ "ffdhe20= 48", 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_FFDHE= 4096 },
+#endif
+#if defined(PSA_WANT_DH_R= FC7919_6144)
{ "ffdhe6144", MBEDTLS_SSL_IANA= _TLS_GROUP_FFDHE6144 },
+#endif
+#if defin= ed(PSA_WANT_DH_RFC7919_8192)
{ "ffdhe8192", = MBEDTLS_SSL_IANA_TLS_GROUP_FFDHE8192 },
+#endif
};
static cons= t size_t ecp_curve_info_table_items =3D sizeof(ecp_curve_info_table) / size= of(mbedtls_ecp_curve_info);

@@ -1523,7 +1= 562,11 @@
pcurve++;
}<= br> #else
- ms= g(M_FATAL, "Mbed TLS 4 has no mechanism to list supported curves."= ;);
+ printf("= ;Available elliptic curves:\n\n");
+ for (size_t i =3D 0; i < ecp_curve_info_table_it= ems; i++)
+ {

+ printf("%s\= n", ecp_curve_info_table[i].name);
+ }
#endif /* MBEDTLS_VERSION_NUMBER= < 0x04000000 */
}


To view, visit change 1500. To unsubscribe, or for help writi= ng mail filters, visit settings.

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I740991f22b728fe2f5a48bc18d5= ca4b62f56f399
Gerrit-Change-Number: 1500
Gerrit-PatchSet: 3
Gerrit-Owner: MaxF <max@...2606...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: MaxF <max@...2606...> =
= --KEuX8ON8Ezk=--