From: "plaisthos (Code Review)" Date: Tue, 15 Jul 2025 10:45:40 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., gert@...1296... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="UsXMonGIecw="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Cleanup/simplify mbed TLS related define from autoconf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --UsXMonGIecw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld. Hello cron2, flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1081?usp=3Demail to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by cron2 Change subject: Cleanup/simplify mbed TLS related define from autoconf ...................................................................... Cleanup/simplify mbed TLS related define from autoconf Instead of a custom logic using 0/1 to be defined when the functions are present or not, use the standard check and adjust the source code accordingly. Also 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. Remove AEAD check that tests for presence of mbedtls_cipher_write_tag and mbedtls_cipher_check_tag. Having an mbed TLS version that does not support that is highly unlikely. It might have been a good check in PolarSSL's time but is not today anymore. This also adds some missing support for mbed 2.x related defines to cmake based build. Change-Id: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efd Signed-off-by: Arne Schwabe --- M CMakeLists.txt M config.h.cmake.in M configure.ac M src/openvpn/crypto_mbedtls.c M src/openvpn/mbedtls_compat.h M src/openvpn/ssl_mbedtls.c 6 files changed, 23 insertions(+), 45 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/1081/8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 40bffd4..75afcea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,7 @@ check_symbol_exists(mbedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAV= E_MBEDTLS_CTR_DRBG_UPDATE_RET) check_symbol_exists(mbedtls_ssl_conf_export_keys_ext_cb mbedtls/ssl.h = HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) check_symbol_exists(mbedtls_ssl_set_export_keys_cb mbedtls/ssl.h HAVE_= MBEDTLS_SSL_SET_EXPORT_KEYS_CB) + check_symbol_exists(mbedtls_ssl_tls_prf mbedtls/ssl.h HAVE_MBEDTLS_SSL= _TLS_PRF) check_include_files(psa/crypto.h HAVE_MBEDTLS_PSA_CRYPTO_H) endfunction() diff --git a/config.h.cmake.in b/config.h.cmake.in index 5df0ac8..911f7d3 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -370,10 +370,11 @@ #undef HAVE_VFORK_H /* Availability of different mbed TLS features and APIs */ -#cmakedefine01 HAVE_MBEDTLS_PSA_CRYPTO_H -#define HAVE_MBEDTLS_SSL_TLS_PRF 1 -#cmakedefine01 HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB -#cmakedefine01 HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET +#cmakedefine HAVE_MBEDTLS_PSA_CRYPTO_H +#cmakedefine HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#cmakedefine HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#cmakedefine HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET +#cmakedefine HAVE_MBEDTLS_SSL_TLS_PRF /* Path to ifconfig tool */ #define IFCONFIG_PATH "@IFCONFIG_PATH@" diff --git a/configure.ac b/configure.ac index 02b45f8..8fc48ba 100644 --- a/configure.ac +++ b/configure.ac @@ -1038,38 +1038,12 @@ [AC_MSG_ERROR([mbed TLS version >=3D 2.0.0 or >=3D 3.2.1 required])] ) - AC_CHECK_HEADER( - psa/crypto.h, - [AC_DEFINE([HAVE_MBEDTLS_PSA_CRYPTO_H], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_PSA_CRYPTO_H], [0], [no])] - ) + AC_CHECK_HEADERS(psa/crypto.h) - AC_CHECK_FUNCS( - [ \ - mbedtls_cipher_write_tag \ - mbedtls_cipher_check_tag \ - ], - , - [AC_MSG_ERROR([mbed TLS check for AEAD support failed])] - ) + AC_CHECK_FUNCS([mbedtls_ssl_tls_prf mbedtls_ssl_conf_export_keys_ext_cb]) - AC_CHECK_FUNC( - [mbedtls_ssl_tls_prf], - [AC_DEFINE([HAVE_MBEDTLS_SSL_TLS_PRF], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_TLS_PRF], [0], [no])] - ) - - AC_CHECK_FUNC( - [mbedtls_ssl_conf_export_keys_ext_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [0], [no])] - ) if test "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" !=3D xyes; then - AC_CHECK_FUNC( - [mbedtls_ssl_set_export_keys_cb], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])], - [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])] - ) + AC_CHECK_FUNCS([mbedtls_ssl_set_export_keys_cb]) if test "x$ac_cv_func_mbedtls_ssl_set_export_keys_cb" !=3D xyes; then AC_CHECK_FUNC([mbedtls_ssl_export_keying_material]) if test "x$ac_cv_func_mbedtls_ssl_export_keying_material" !=3D xyes; th= en diff --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c index c05902d..1f3dcba 100644 --- a/src/openvpn/crypto_mbedtls.c +++ b/src/openvpn/crypto_mbedtls.c @@ -981,7 +981,7 @@ } /* mbedtls-2.18.0 or newer implements tls_prf, but prf_tls1 is removed * from recent versions, so we use our own implementation if necessary. */ -#if HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) +#if defined(HAVE_MBEDTLS_SSL_TLS_PRF) && defined(MBEDTLS_SSL_TLS_PRF_TLS1) bool ssl_tls1_PRF(const uint8_t *seed, int seed_len, const uint8_t *secret, int secret_len, uint8_t *output, int output_len) @@ -990,7 +990,7 @@ secret_len, "", seed, seed_len, out= put, output_len)); } -#else /* HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */ +#else /* defined(HAVE_MBEDTLS_SSL_TLS_PRF) && defined(MBEDTLS_SSL_TLS_PRF_= TLS1) */ /* * Generate the hash required by for the \c tls1_PRF function. * diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbedtls_compat.h index 145a7ae..68c4cc3 100644 --- a/src/openvpn/mbedtls_compat.h +++ b/src/openvpn/mbedtls_compat.h @@ -48,7 +48,7 @@ #include #include -#if HAVE_MBEDTLS_PSA_CRYPTO_H +#ifdef HAVE_MBEDTLS_PSA_CRYPTO_H #include #endif @@ -61,14 +61,14 @@ static inline void mbedtls_compat_psa_crypto_init(void) { -#if HAVE_MBEDTLS_PSA_CRYPTO_H && defined(MBEDTLS_PSA_CRYPTO_C) +#if defined(HAVE_MBEDTLS_PSA_CRYPTO_H) && defined(MBEDTLS_PSA_CRYPTO_C) if (psa_crypto_init() !=3D PSA_SUCCESS) { msg(M_FATAL, "mbedtls: psa_crypto_init() failed"); } #else return; -#endif /* HAVE_MBEDTLS_PSA_CRYPTO_H && defined(MBEDTLS_PSA_CRYPTO_C) */ +#endif } static inline mbedtls_compat_group_id @@ -96,7 +96,7 @@ { #if MBEDTLS_VERSION_NUMBER > 0x03000000 return mbedtls_ctr_drbg_update(ctx, additional, add_len); -#elif HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET +#elif defined(HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET) return mbedtls_ctr_drbg_update_ret(ctx, additional, add_len); #else mbedtls_ctr_drbg_update(ctx, additional, add_len); diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index ecccc26..a4bb772 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -173,8 +173,9 @@ ASSERT(NULL !=3D ctx); return ctx->initialised; } - -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB +#ifdef MBEDTLS_SSL_KEYING_MATERIAL_EXPORT +/* mbedtls_ssl_export_keying_material does not need helper/callback method= s */ +#elif defined(HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) /* * 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 +206,7 @@ return 0; } -#elif HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB +#elif defined(HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB) /* * 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 @@ -251,10 +252,11 @@ memcpy(cache->master_secret, secret, sizeof(cache->master_secret)); cache->tls_prf_type =3D tls_prf_type; } -#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT) +#else /* ifdef 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 key_state_export_keying_material(struct tls_session *session, const char *label, size_t label_size, @@ -1244,7 +1246,7 @@ mbedtls_ssl_conf_max_tls_version(ks_ssl->ssl_config, version); } -#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYIN= G_MATERIAL_EXPORT) +#if defined(HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) && !defined(MBEDTLS_= SSL_KEYING_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); @@ -1259,7 +1261,7 @@ * verification. */ ASSERT(mbed_ok(mbedtls_ssl_set_hostname(ks_ssl->ctx, NULL))); -#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MAT= ERIAL_EXPORT) +#if defined(HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB) && !defined(MBEDTLS_SSL_K= EYING_MATERIAL_EXPORT) /* Initialize keying material exporter, new style. */ mbedtls_ssl_set_export_keys_cb(ks_ssl->ctx, mbedtls_ssl_export_keys_cb= , session); #endif -- 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: 8 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --UsXMonGIecw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: cron2, flichtenheld.

plaisthos uploaded patch set #8 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/1081?usp=3Demail">View Chan= ge

The following approvals got outdated and were removed: Code-Review+1 by cron2

Cleanup/simplify mbed TLS related define from autoco=
nf

Instead of a custom logic using 0/1 to be defined when the functi= ons
are present or not, use the standard check and adjust the source cod= e
accordingly.

Also not compile mbed key helper with MBEDTLS_SSL_= KEYING_MATERIAL_EXPORT

The helper methods are only used when we don&= #39;t have
MBEDTLS_SSL_KEYING_MATERIAL_EXPORT and mbedtls_ssl_export_key= ing_material.

Remove AEAD check that tests for presence of mbedtls_c= ipher_write_tag
and mbedtls_cipher_check_tag. Having an mbed TLS version= that does not
support that is highly unlikely. It might have been a goo= d check in
PolarSSL's time but is not today anymore.

This als= o adds some missing support for mbed 2.x related defines to
cmake based = build.

Change-Id: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efd
Signe= d-off-by: Arne Schwabe <arne@...1227...>
---
M CMakeLists.txtM config.h.cmake.in
M configure.ac
M src/openvpn/crypto_mbedtls.cM src/openvpn/mbedtls_compat.h
M src/openvpn/ssl_mbedtls.c
6 files = changed, 23 insertions(+), 45 deletions(-)

git pull ssh://gerrit.=
openvpn.net:29418/openvpn refs/changes/81/1081/8
diff --git a/CMake=
Lists.txt b/CMakeLists.txt
index 40bffd4..75afcea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,6 +302,7 @@
check_symbol_exists(m= bedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAVE_MBEDTLS_CTR_DRBG_UPDATE_= RET)
check_symbol_exists(mbedtls_ssl_conf_export_keys_= ext_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB)
check_symbol_exists(mbedtls_ssl_set_export_keys_cb mbedtls/ssl.h H= AVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB)

+ check_symbol_exists(mbedtls_ssl_tls_prf mbedtls/ssl.h H= AVE_MBEDTLS_SSL_TLS_PRF)
check_include_files(psa/crypt= o.h HAVE_MBEDTLS_PSA_CRYPTO_H)
endfunction()

diff --git a/config.h.cmake.in b/config.h.cmake.in
index 5df0ac8..911f7d3 100644
--- a/config.h.c= make.in
+++ b/config.h.cmake.in
@@ -370,10 = +370,11 @@
#undef HAVE_VFORK_H
/* Availability of different mbed TLS features and APIs */-#cmakedefine01 HAVE_MBEDTLS_PS= A_CRYPTO_H
-#define HAV= E_MBEDTLS_SSL_TLS_PRF 1
-#cmakedefine01 HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB
-#cmakedefine01 HAVE_MBEDTLS_CTR_DRBG_UPDATE= _RET
+#cmakedefine HA= VE_MBEDTLS_PSA_CRYPTO_H
+#cmakedefine HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB
+#cmakedefine HAVE_MBEDTLS_SSL_CONF_EXPORT= _KEYS_EXT_CB
+#cmaked= efine HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET
+#cmakedefine HAVE_MBEDTLS_SSL_TLS_PRF
<= /span>
/* Path to ifconfig tool */
#define IFCON= FIG_PATH "@IFCONFIG_PATH@"
diff --git a/configure= .ac b/configure.ac
index 02b45f8..8fc48ba 100644
= --- a/configure.ac
+++ b/configure.ac
@@ -1038,38 +1038,12 @@

[AC_MSG_ERROR([mbed TLS version= >=3D 2.0.0 or >=3D 3.2.1 required])]
)
<= span>

- AC_CHECK_HEADE= R(
- psa/crypto.h,
- [AC_DEFINE([HAVE_MBEDTL= S_PSA_CRYPTO_H], [1], [yes])],
- [AC_DEFINE([HAVE_MBEDTLS_PSA_CRYPTO_H], [0], [no])]
- )

+ AC_CHECK_HEADERS(psa/crypto.h)

- AC_CHECK_FUNCS(=
- [ \
- mbedtls_cipher_write_tag \
- mbedtls_cipher_check_tag \
- ],
- ,
- [AC_MSG_ERROR([mbed TLS check for AEAD support failed])]
- )
+ AC_CHECK_FUNCS([mbedtls_ssl_tls_prf mbed= tls_ssl_conf_export_keys_ext_cb])

- AC_CHECK_FUNC(
- [mbedtls_ssl_tls_prf],
- [AC_DEFINE([HAVE_MBEDTLS_SSL_TLS_PRF], [1], = [yes])],
- [AC_DEFINE(= [HAVE_MBEDTLS_SSL_TLS_PRF], [0], [no])]
- )
-<= /span>
- AC_CHECK_FUNC(=
- [mbedtls_ssl_conf_export_k= eys_ext_cb],
- [AC_DEF= INE([HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB], [1], [yes])],
- [AC_DEFINE([HAVE_MBEDTLS_SSL_CONF= _EXPORT_KEYS_EXT_CB], [0], [no])]

- )
if test "x$ac_cv_func_mbedtls_ssl_con= f_export_keys_ext_cb" !=3D xyes; then
- AC_CHECK_FUNC(
- [mbedtls_ssl_set_export_keys_cb],
- [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_= KEYS_CB], [1], [yes])],
- [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [0], [no])]- )
+ AC_CHECK_FUNCS([mbedtls_ssl_set_export_keys_= cb])
if test "x$ac_cv_func_mbedtls_ssl_set_export_k= eys_cb" !=3D xyes; then
AC_CHECK_FUNC([mbedtls_ssl= _export_keying_material])
if test "x$ac_cv_func_mb= edtls_ssl_export_keying_material" !=3D xyes; then
diff= --git a/src/openvpn/crypto_mbedtls.c b/src/openvpn/crypto_mbedtls.c=
index c05902d..1f3dcba 100644
--- a/src/openvpn/c= rypto_mbedtls.c
+++ b/src/openvpn/crypto_mbedtls.c@@ -981,7 +981,7 @@
}
/* mbedtls-= 2.18.0 or newer implements tls_prf, but prf_tls1 is removed
* from recent versions, so we use our own implementation if necessary. *= /

-#if HAVE_MBEDTLS_SSL= _TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1)
+#if defined(HAVE_MBEDTLS_SSL_TLS_PRF) &am= p;& defined(MBEDTLS_SSL_TLS_PRF_TLS1)
bool
<= span> ssl_tls1_PRF(const uint8_t *seed, int seed_len, const uint8_t *secret= ,

int secret_len, uint8_t *output, int output= _len)
@@ -990,7 +990,7 @@
= secret_len, "", seed, seed_len, output,
output_len));<= br> }
-#else /* H= AVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */
+#else /* defined(HAVE_M= BEDTLS_SSL_TLS_PRF) && defined(MBEDTLS_SSL_TLS_PRF_TLS1) */<= br> /*
* Generate the hash required by for the \c t= ls1_PRF function.
*
diff --git a/src/open= vpn/mbedtls_compat.h b/src/openvpn/mbedtls_compat.h
index 1= 45a7ae..68c4cc3 100644
--- a/src/openvpn/mbedtls_compat.h
+++ b/src/openvpn/mbedtls_compat.h
@@ -48,7 = +48,7 @@
#include <mbedtls/version.h>
#include <mbedtls/x509_crt.h>


-#if HAVE_MBEDTLS_PSA_CRYPTO_H
= +#ifdef HAVE_MBEDTLS_PSA_CRYPTO= _H
#include <psa/crypto.h>
#end= if

@@ -61,14 +61,14 @@
s= tatic inline void
mbedtls_compat_psa_crypto_init(void)
{
-#if HA= VE_MBEDTLS_PSA_CRYPTO_H && defined(MBEDTLS_PSA_CRYPTO_C)
= +#if defined(HAVE_MBEDTLS_PSA_C= RYPTO_H) && defined(MBEDTLS_PSA_CRYPTO_C)
if (= psa_crypto_init() !=3D PSA_SUCCESS)
{
= msg(M_FATAL, "mbedtls: psa_crypto_init() failed");
}
#else
return;
-#endif /* HAVE_MBEDTLS_PSA_= CRYPTO_H && defined(MBEDTLS_PSA_CRYPTO_C) */
+#endif
}

static inline mbedtls_compat_group_id
@= @ -96,7 +96,7 @@
{
#if MBEDTLS_VERSION_NU= MBER > 0x03000000
return mbedtls_ctr_drbg_update(ct= x, additional, add_len);
+#elif defined(HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET)
return mbedtls_ctr_drbg_update_ret(ctx, additional, add_len= );
#else
mbedtls_ctr_drbg_update(ctx,= additional, add_len);
diff --git a/src/openvpn/ssl_mbedtls= .c b/src/openvpn/ssl_mbedtls.c
index ecccc26..a4bb772 10064= 4
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src= /openvpn/ssl_mbedtls.c
@@ -173,8 +173,9 @@
= ASSERT(NULL !=3D ctx);
return ctx->initialised= ;
}
-<= /span>
-#if HAVE_MBEDTLS_SSL_C= ONF_EXPORT_KEYS_EXT_CB
+/* mbedtls_ssl_export_keying_material does not nee= d helper/callback methods */
+#elif defined(HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB)
= /*
* Key export callback for older versions of mbe= d TLS, to be used with
* mbedtls_ssl_conf_export_keys_ext= _cb(). It is called with the master
@@ -205,7 +206,7 @@

return 0;
}
= -#elif HAVE_MBEDTLS_SSL_SET_EXPOR= T_KEYS_CB
+#elif defi= ned(HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB)
/*
* 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
@@ -251,10 +252,11 @@
m= emcpy(cache->master_secret, secret, sizeof(cache->master_secret));
cache->tls_prf_type =3D tls_prf_type;
}

-#elif !defined(MBE= DTLS_SSL_KEYING_MATERIAL_EXPORT)
+#else /* ifdef 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 TL= S
#endif /* HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB */

+
bool
key_state_export_keying_material(struct= tls_session *session,
co= nst char *label, size_t label_size,
@@ -1244,7 +1246,7 @@
mbedtls_ssl_conf_max_tls_version(ks_ssl->ssl_con= fig, version);
}

-#if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT= _CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
+#if defined(HAVE_MBEDTLS_SSL_CONF_E= XPORT_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_con= fig,
mbedtls_ssl_e= xport_keys_cb, session);
@@ -1259,7 +1261,7 @@
* verification. */

ASSERT(mbed_ok(mbedtls_ss= l_set_hostname(ks_ssl->ctx, NULL)));

-#if HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB= && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
+#if defined(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_exp= ort_keys_cb, session);
#endif

<= /pre>

To view, visit change 1081. To unsubscribe, or for help writing mail fi= lters, visit settings.

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