From: "plaisthos (Code Review)" Date: Wed, 9 Jul 2025 11:57:25 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <53f08ac208c22aad1a779a926414f31eab29c251-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="8b8Nu9artd4="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Do not compile mbed key helper with MBEDTLS_SSL_KEYING_MATERIAL_EXPORT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --8b8Nu9artd4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1081?usp=3Demail to review the following change. Change subject: Do not compile mbed key helper with MBEDTLS_SSL_KEYING_MATE= RIAL_EXPORT ...................................................................... Do not compile mbed key helper with MBEDTLS_SSL_KEYING_MATERIAL_EXPORT The helper methods are only used when we don't have MBEDTLS_SSL_KEYING_MATERIAL_EXPORT and mbedtls_ssl_export_keying_material. Change-Id: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efd Signed-off-by: Arne Schwabe --- M src/openvpn/ssl_mbedtls.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/1081/1 diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index ecccc26..911d4bb 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -174,7 +174,7 @@ return ctx->initialised; } -#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) /* * Key export callback for older versions of mbed TLS, to be used with * mbedtls_ssl_conf_export_keys_ext_cb(). It is called with the master @@ -205,7 +205,7 @@ return 0; } -#elif HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#elif defined(HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB) && !defined(MBEDTLS_SSL= _KEYING_MATERIAL_EXPORT) /* * Key export callback for newer versions of mbed TLS, to be used with * mbedtls_ssl_set_export_keys_cb(). When used with TLS 1.2, the callback @@ -255,6 +255,7 @@ #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 key_state_export_keying_material(struct tls_session *session, const char *label, size_t label_size, -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1081?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: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efd Gerrit-Change-Number: 1081 Gerrit-PatchSet: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --8b8Nu9artd4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

V= iew Change

Do not compile mbed key helper with MBEDTLS_SSL_KEYING_MATER=
IAL_EXPORT

The helper methods are only used when we don't haveMBEDTLS_SSL_KEYING_MATERIAL_EXPORT and mbedtls_ssl_export_keying_material= .

Change-Id: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efd
Signed-off= -by: Arne Schwabe <arne@...1227...>
---
M src/openvpn/ssl_mbedt= ls.c
1 file changed, 3 insertions(+), 2 deletions(-)

git pull =
ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/1081/1
diff =
--git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c
index ecccc26..911d4bb 100644
--- a/src/openvpn/ssl_mbed= tls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -1= 74,7 +174,7 @@
return ctx->initialised;
<= span> }

-#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB
+#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB &= amp;& !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
/*<= /span>
* Key export callback for older versions of mbed TLS, to = be used with
* mbedtls_ssl_conf_export_keys_ext_cb(). It = is called with the master
@@ -205,7 +205,7 @@

return 0;
}
-#elif HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB<= /span>
+#elif defined(HAVE_M= BEDTLS_SSL_SET_EXPORT_KEYS_CB) && !defined(MBEDTLS_SSL_KEYING_MATER= IAL_EXPORT)
/*
* Key export callback for= newer versions of mbed TLS, to be used with
* mbedtls_ss= l_set_export_keys_cb(). When used with TLS 1.2, the callback
@@ -255,6 +255,7 @@

#error mbedtls_ssl_conf_export_keys_= ext_cb, mbedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_materia= l must be available in mbed TLS
#endif /* HAVE_MBEDTLS_SSL= _CONF_EXPORT_KEYS_EXT_CB */

+
bool
key_state= _export_keying_material(struct tls_session *session,
= const char *label, size_t label_size,

To view, visit change 1081. To unsubscribe, or for h= elp writing mail filters, visit settings.

=
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0f325800ebeb20bd5ef3ff78e5c= 5fcf0f6f74efd
Gerrit-Change-Number: 1081
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--8b8Nu9artd4=--