From: "cron2 (Code Review)" Date: Tue, 3 Jun 2025 14:14:46 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., max@...2606... Message-ID: <43769f39dc8e8bef71fa8cde910bdfbb750aa825-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="ySZpVXnkwqo="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Use mbedtls_ssl_export_keying_material() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: MaxF Cc: flichtenheld , plaisthos , openvpn-devel --ySZpVXnkwqo= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 41?usp=3Demail ) Change subject: Use mbedtls_ssl_export_keying_material() ...................................................................... Use mbedtls_ssl_export_keying_material() Mbed TLS now has an implementation of the TLS-Exporter feature (though not yet in a released version). Use it if it's available. v2: Rebased, changed feature detection in configure.ac Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4 Signed-off-by: Max Fillinger Acked-by: Frank Lichtenheld Message-Id: <20250603140414.10970-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 856.html Signed-off-by: Gert Doering --- M configure.ac M src/openvpn/ssl_mbedtls.c M src/openvpn/ssl_mbedtls.h 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index c70892a..8bdec32 100644 --- a/configure.ac +++ b/configure.ac @@ -1072,7 +1072,10 @@ [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] ) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" !=3D xyes; then - AC_MSG_ERROR(This version of mbed TLS has no support for exporting key = material.) + AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) + if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" !=3D xyes; th= en + AC_MSG_ERROR(This version of mbed TLS has no support for exporting key= material.) + fi fi fi diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 5936ca3..7452c30 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -251,8 +251,8 @@ memcpy(cache->master_secret, secret, sizeof(cache->master_secret)); cache->tls_prf_type =3D tls_prf_type; } -#else /* if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ -#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_expor= t_keys_cb must be available in mbed TLS +#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#error mbedtls_ssl_conf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb= or mbedtls_ssl_export_keying_material must be available in mbed TLS #endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */ bool @@ -262,6 +262,20 @@ { ASSERT(strlen(label) =3D=3D label_size); +#if defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) + /* Our version of mbed TLS has a built-in TLS-Exporter. */ + + mbedtls_ssl_context *ctx =3D session->key[KS_PRIMARY].ks_ssl.ctx; + if (mbed_ok(mbedtls_ssl_export_keying_material(ctx, ekm, ekm_size, lab= el, label_size, NULL, 0, 0))) + { + return true; + } + else + { + return false; + } + +#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ struct tls_key_cache *cache =3D &session->key[KS_PRIMARY].ks_ssl.tls_k= ey_cache; /* If the type is NONE, we either have no cached secrets or @@ -286,6 +300,7 @@ secure_memzero(ekm, session->opt->ekm_size); return false; } +#endif /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ } bool @@ -1226,7 +1241,7 @@ mbedtls_ssl_conf_max_tls_version(ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYIN= G_MATERIAL_EXPORT) /* Initialize keying material exporter, old style. */ mbedtls_ssl_conf_export_keys_ext_cb(ks_ssl->ssl_config, mbedtls_ssl_export_keys_cb, sessio= n); @@ -1241,7 +1256,7 @@ * verification. */ ASSERT(mbed_ok(mbedtls_ssl_set_hostname(ks_ssl->ctx, NULL))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MAT= ERIAL_EXPORT) /* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb(ks_ssl->ctx, mbedtls_ssl_export_keys_cb= , session); #endif diff --git a/src/openvpn/ssl_mbedtls.h b/src/openvpn/ssl_mbedtls.h index 3841eff..9f124cd 100644 --- a/src/openvpn/ssl_mbedtls.h +++ b/src/openvpn/ssl_mbedtls.h @@ -85,14 +85,21 @@ void *sign_ctx; }; -/** struct to cache TLS secrets for keying material exporter (RFC 5705). - * The constants (64 and 48) are inherent to TLS version and - * the whole keying material export will likely change when they change */ +#if !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +/** + * struct to cache TLS secrets for keying material exporter (RFC 5705). + * Not needed if the library itself implements the keying material exporte= r. + * + * The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, it is not + * possible to obtain the exporter master secret from mbed TLS. */ struct tls_key_cache { unsigned char client_server_random[64]; mbedtls_tls_prf_types tls_prf_type; unsigned char master_secret[48]; }; +#else /* !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */ +struct tls_key_cache { }; +#endif /** * Structure that wraps the TLS context. Contents differ depending on the -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1041?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1caae90e5065bc4 Gerrit-Change-Number: 1041 Gerrit-PatchSet: 4 Gerrit-Owner: MaxF Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: cron2 Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --ySZpVXnkwqo= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Use mbedtls_ssl_export_keying_material()
<= br>Mbed TLS now has an implementation of the TLS-Exporter feature (thoughnot yet in a released version). Use it if it's available.

v2: = Rebased, changed feature detection in configure.ac

Change-Id: I1204b= c2ff85952160a86f0b9d1caae90e5065bc4
Signed-off-by: Max Fillinger <max= imilian.fillinger@...2507...>
Acked-by: Frank Lichtenheld <frank@...220...= ..2641...>
Message-Id: <20250603140414.10970-1-gert@...1296...>=
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/m= sg31856.html
Signed-off-by: Gert Doering <gert@...1296...>
---<= br>M configure.ac
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedt= ls.h
3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index c70892a..= 8bdec32 100644
--- a/configure.ac
+++ b/con= figure.ac
@@ -1072,7 +1072,10 @@
[AC_DE= FINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])]
= )
if test "x$ac_cv_func_mbedtls_ssl_set_export_keys= _cb" !=3D xyes; then
- AC_MSG_ERROR(This version of mbed TLS has no support for exporting k= ey material.)
+ AC_= CHECK_FUNC([mbedtls_ssl_export_keying_material])
+ if test "x$ac_cv_func_mbedtls_ssl_expo= rt_keying_material" !=3D xyes; then
+ AC_MSG_ERROR(This version of mbed TLS has no suppo= rt for exporting key material.)
+ fi
fi
fi

diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ss= l_mbedtls.c
index 5936ca3..7452c30 100644
-= -- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtl= s.c
@@ -251,8 +251,8 @@
memcpy(cache-&= gt;master_secret, secret, sizeof(cache->master_secret));
cache->tls_prf_type =3D tls_prf_type;
}-#else /* if HAVE_MBEDTLS_SSL_C= ONF_EXPORT_KEYS_EXT_CB */
-#error either mbedtls_ssl_conf_export_keys_ext_cb or mbedtls_ssl_set_ex= port_keys_cb must be available in mbed TLS
+#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
+#error mbedtls_ssl_co= nf_export_keys_ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export= _keying_material must be available in mbed TLS
#endif /* H= AVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */

bool

@@ -262,6 +262,20 @@
{
<= span> ASSERT(strlen(label) =3D=3D label_size);
=
+#if defined(MBEDTLS_SSL_KE= YING_MATERIAL_EXPORT)
+ /* Our version of mbed TLS has a built-in TLS-Exporter. */
= +
+ mbedtls_ssl_context *ctx =3D session->key[= KS_PRIMARY].ks_ssl.ctx;
+ if (mbed_ok(mbedtls_ssl_export_keying_material(ctx, ekm, ekm_size, = label, label_size, NULL, 0, 0)))
+ {
+ = return true;
+= }
+ else

+ {
+ return false;
+ }
+
+#else /* defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) */
struct tls_key_cache *cache =3D &session->key[KS_PRIMARY].ks= _ssl.tls_key_cache;

/* If the type i= s NONE, we either have no cached secrets or
@@ -286,6 +300,= 7 @@
secure_memzero(ekm, session->opt->ekm_s= ize);
return false;
}<= br>+#endif /* defined(MBEDTLS_= SSL_KEYING_MATERIAL_EXPORT) */
}
<= br> bool
@@ -1226,7 +1241,7 @@
= mbedtls_ssl_conf_max_tls_version(ks_ssl->ssl_config, version);=
}

-#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB
+#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS= _EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
<= span> /* Initialize keying material exporter, old style. */
<= span> mbedtls_ssl_conf_export_keys_ext_cb(ks_ssl->ssl_config,=
mbedtls_ssl_export_keys_= cb, session);
@@ -1241,7 +1256,7 @@
*= verification. */
ASSERT(mbed_ok(mbedtls_ssl_set_hostn= ame(ks_ssl->ctx, NULL)));

-#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB
= +#if HAVE_MBEDTLS_SSL_SET_EXPOR= T_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) /* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb(ks_ssl->ctx, mbedtls_ssl_expo= rt_keys_cb, session);
#endif
diff --git a/= src/openvpn/ssl_mbedtls.h b/src/openvpn/ssl_mbedtls.h
index= 3841eff..9f124cd 100644
--- a/src/openvpn/ssl_mbedtls.h
+++ b/src/openvpn/ssl_mbedtls.h
@@ -85,14 +85= ,21 @@
void *sign_ctx;
};
<= span>

-/** struct to c= ache TLS secrets for keying material exporter (RFC 5705).
- * The constants (64 and 48) are inhere= nt to TLS version and
-= * the whole keying material export will likely change when they change */<= /span>
+#if !defined(MBEDTLS= _SSL_KEYING_MATERIAL_EXPORT)
+/**
+ * stru= ct to cache TLS secrets for keying material exporter (RFC 5705).
= + * Not needed if the library i= tself implements the keying material exporter.
+ *
+ * The constants 64 and 48 are inherent to TLS 1.2. For TLS 1.3, = it is not
+ * possibl= e to obtain the exporter master secret from mbed TLS. */
s= truct tls_key_cache {
unsigned char client_server_rand= om[64];
mbedtls_tls_prf_types tls_prf_type;
= unsigned char master_secret[48];
};
<= span style=3D"color: hsl(120, 100%, 40%);">+#else /* !defined(MBEDTLS_SSL_= KEYING_MATERIAL_EXPORT) */

+struct tls_key_cache { };
+#endif

/**
= * Structure that wraps the TLS context. Contents differ depending on the<= /span>

To view, visit change 1041. To unsubscribe,= or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1204bc2ff85952160a86f0b9d1c= aae90e5065bc4
Gerrit-Change-Number: 1041
Gerrit-PatchSet: 4
Gerrit-Owner: MaxF <max@...2606...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: cron2 <gert@...1296...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--ySZpVXnkwqo=--