From: "cron2 (Code Review)" Date: Tue, 15 Jul 2025 13:53:09 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="fs4kBx/OlcY="; 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: plaisthos Cc: flichtenheld , openvpn-devel --fs4kBx/OlcY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/10= 81?usp=3Demail ) 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 Acked-by: Frank Lichtenheld Message-Id: <20250715122957.22311-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 145.html Signed-off-by: Gert Doering --- 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, 24 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40bffd4..efb2d2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,7 +302,8 @@ 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_include_files(psa/crypto.h HAVE_MBEDTLS_PSA_CRYPTO_H) + check_symbol_exists(mbedtls_ssl_tls_prf mbedtls/ssl.h HAVE_MBEDTLS_SSL= _TLS_PRF) + check_include_files(psa/crypto.h HAVE_PSA_CRYPTO_H) endfunction() if (${MBED}) diff --git a/config.h.cmake.in b/config.h.cmake.in index 5df0ac8..1c443ab 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_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..aeb0c5f 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_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_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: 10 Gerrit-Owner: plaisthos Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --fs4kBx/OlcY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

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 sou= rce code
accordingly.

Also not compile mbed key helper with MBEDT= LS_SSL_KEYING_MATERIAL_EXPORT

The helper methods are only used when = we don't have
MBEDTLS_SSL_KEYING_MATERIAL_EXPORT and mbedtls_ssl_exp= ort_keying_material.

Remove AEAD check that tests for presence of mb= edtls_cipher_write_tag
and mbedtls_cipher_check_tag. Having an mbed TLS = version that does not
support that is highly unlikely. It might have bee= n a good check in
PolarSSL's time but is not today anymore.

T= his also adds some missing support for mbed 2.x related defines to
cmake= based build.

Change-Id: I0f325800ebeb20bd5ef3ff78e5c5fcf0f6f74efdSigned-off-by: Arne Schwabe <arne@...1227...>
Acked-by: Frank Li= chtenheld <frank@...2641...>
Message-Id: <20250715122957.22311-= 1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1224...= sts.sourceforge.net/msg32145.html
Signed-off-by: Gert Doering <gert@...220...= ..1296...>
---
M CMakeLists.txt
M config.h.cmake.in
M config= ure.ac
M src/openvpn/crypto_mbedtls.c
M src/openvpn/mbedtls_compat.h<= br>M src/openvpn/ssl_mbedtls.c
6 files changed, 24 insertions(+), 46 del= etions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 40bff= d4..efb2d2d 100644
--- a/CMakeLists.txt
+++= b/CMakeLists.txt
@@ -302,7 +302,8 @@
= check_symbol_exists(mbedtls_ctr_drbg_update_ret mbedtls/ctr_drbg.h HAVE_MBE= DTLS_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_ke= ys_cb mbedtls/ssl.h HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB)
- check_include_files(psa/crypto.h HAV= E_MBEDTLS_PSA_CRYPTO_H)
+ check_symbol_exists(mbedtls_ssl_tls_prf mbedtls/ssl.h HAVE_MBEDTLS_= SSL_TLS_PRF)
+ che= ck_include_files(psa/crypto.h HAVE_PSA_CRYPTO_H)
endfuncti= on()

if (${MBED})
diff -= -git a/config.h.cmake.in b/config.h.cmake.in
index 5df0ac8.= .1c443ab 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_MBEDT= LS_SSL_SET_EXPORT_KEYS_CB
-#cmakedefine01 HAVE_MBEDTLS_CTR_DRBG_UPDATE_RET
+#cmakedefine HAVE_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 HA= VE_MBEDTLS_SSL_TLS_PRF

/* Path to ifconf= ig tool */
#define IFCONFIG_PATH "@IFCONFIG_PATH@&quo= t;
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 re= quired])]
)

- AC_CHECK_HEADER(
- psa/crypto.h,
- [AC_DEFINE([HAVE_MBEDTLS_PSA_CRYPTO_H], [1], [yes])],
- [AC_DEFINE([HAVE_MBEDTL= S_PSA_CRYPTO_H], [0], [no])]
- )
+ AC_CHECK_= HEADERS(psa/crypto.h)

- AC_CHECK_FUNCS(
- [ \
- = mbedtls_cipher_write_tag \
- mbedtls_cipher_check_tag \
- ],
- ,<= /span>
- [AC_MSG_ERROR([mbed = TLS check for AEAD support failed])]
- )
+ A= C_CHECK_FUNCS([mbedtls_ssl_tls_prf mbedtls_ssl_conf_export_keys_ext_cb])

- AC_CH= ECK_FUNC(
- [mbedtls_s= sl_tls_prf],
- [AC_DEF= INE([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 te= st "x$ac_cv_func_mbedtls_ssl_conf_export_keys_ext_cb" !=3D xyes; = then
- AC_CHECK_FUNC(<= /span>
- [mbedtls_ssl_set_ex= port_keys_cb],
- [AC_= DEFINE([HAVE_MBEDTLS_SSL_SET_EXPORT_KEYS_CB], [1], [yes])],
- [AC_DEFINE([HAVE_MBEDTLS_SSL_SET_E= XPORT_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; then

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/s= rc/openvpn/crypto_mbedtls.c
@@ -981,7 +981,7 @@
<= span> }

/* mbedtls-2.18.0 or newer implements tls_prf, but= prf_tls1 is removed
* from recent versions, so we use ou= r own implementation if necessary. */
-#if HAVE_MBEDTLS_SSL_TLS_PRF && defined(MBEDTLS_SSL= _TLS_PRF_TLS1)
+#if d= efined(HAVE_MBEDTLS_SSL_TLS_PRF) && defined(MBEDTLS_SSL_TLS_PRF_TLS= 1)
bool
ssl_tls1_PRF(const uint8_t *seed,= int seed_len, const uint8_t *secret,
int sec= ret_len, uint8_t *output, int output_len)
@@ -990,7 +990,7 = @@
secret_len, &quo= t;", seed, seed_len, output,
= output_len));
}
-#else /* HAVE_MBEDTLS_SSL_TLS_PRF && defi= ned(MBEDTLS_SSL_TLS_PRF_TLS1) */
+#else /* defined(HAVE_MBEDTLS_SSL_TLS_PRF) && defined(= MBEDTLS_SSL_TLS_PRF_TLS1) */
/*
* Genera= te the hash required by for the \c tls1_PRF function.
*
diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbed= tls_compat.h
index 145a7ae..aeb0c5f 100644
= --- a/src/openvpn/mbedtls_compat.h
+++ b/src/openvpn/mbedtl= s_compat.h
@@ -48,7 +48,7 @@
#include <= mbedtls/version.h>
#include <mbedtls/x509_crt.h><= /span>

-#if = HAVE_MBEDTLS_PSA_CRYPTO_H
+#ifdef HAVE_PSA_CRYPTO_H
#include <psa/crypto= .h>
#endif

@@ -61,14 = +61,14 @@
static inline void
mbedtls_comp= at_psa_crypto_init(void)
{
-#if HAVE_MBEDTLS_PSA_CRYPTO_H && defined(MBED= TLS_PSA_CRYPTO_C)
+#i= f defined(HAVE_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_i= d
@@ -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_DRB= G_UPDATE_RET)
return mbedtls_ctr_drbg_update_ret(ctx, = additional, add_len);
#else
mbedtls_c= tr_drbg_update(ctx, additional, add_len);
diff --git a/src/= openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c
index ecc= cc26..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
<= span style=3D"color: hsl(120, 100%, 40%);">+/* mbedtls_ssl_export_keying_ma= terial does not need helper/callback methods */
+#elif defined(HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS= _EXT_CB)
/*
* Key export callback for ol= der versions of mbed TLS, to be used with
* mbedtls_ssl_c= onf_export_keys_ext_cb(). It is called with the master
@@ -= 205,7 +206,7 @@

return 0;
= }
-#elif HAVE_MB= EDTLS_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(). Whe= n 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_ty= pe;
}
= -#elif !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPORT)
+#else /* ifdef MBEDTLS_SSL_KEYING_MATERI= AL_EXPORT */
#error mbedtls_ssl_conf_export_keys_ext_cb, m= bedtls_ssl_set_export_keys_cb or mbedtls_ssl_export_keying_material must be= available in mbed TLS
#endif /* HAVE_MBEDTLS_SSL_CONF_EXP= ORT_KEYS_EXT_CB */

+
bool
key_state_export_k= eying_material(struct tls_session *session,
= const char *label, size_t label_size,
@@= -1244,7 +1246,7 @@
mbedtls_ssl_conf_max_tls_versi= on(ks_ssl->ssl_config, version);
}
=
-#if HAVE_MBEDTLS_SSL= _CONF_EXPORT_KEYS_EXT_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EX= PORT)
+#if defined(HA= VE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB) && !defined(MBEDTLS_SSL_KEY= ING_MATERIAL_EXPORT)
/* Initialize keying material exp= orter, old style. */
mbedtls_ssl_conf_export_keys_ext_= cb(ks_ssl->ssl_config,
= mbedtls_ssl_export_keys_cb, session);
@@ -1259,7 +1= 261,7 @@
* verification. */
ASSE= RT(mbed_ok(mbedtls_ssl_set_hostname(ks_ssl->ctx, NULL)));

-#if HAVE_MBEDTLS_S= SL_SET_EXPORT_KEYS_CB && !defined(MBEDTLS_SSL_KEYING_MATERIAL_EXPOR= T)
+#if defined(HAVE_= MBEDTLS_SSL_SET_EXPORT_KEYS_CB) && !defined(MBEDTLS_SSL_KEYING_MATE= RIAL_EXPORT)
/* Initialize keying material exporter, n= ew style. */
mbedtls_ssl_set_export_keys_cb(ks_ssl->= ;ctx, mbedtls_ssl_export_keys_cb, session);
#endif<= br>

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I0f325800ebeb20bd5ef3ff78e5c= 5fcf0f6f74efd
Gerrit-Change-Number: 1081
Gerrit-PatchSet: 10
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-MessageType: merged
--fs4kBx/OlcY=--