From: "MaxF (Code Review)" Date: Fri, 14 Jun 2024 11:34:34 +0000 In-Reply-To: References: Reply-To: max@...2606..., arne-openvpn@...1227..., rein.vanbaaren@...1435..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <660cea6277b4d4c123406472a1f89e7b76496533-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="m8Eg1mZiggM="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Fix MBEDTLS_DEPRECATED_REMOVED build errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: comododragon , plaisthos , flichtenheld Cc: openvpn-devel --m8Eg1mZiggM= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: MaxF, flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/681?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: Fix MBEDTLS_DEPRECATED_REMOVED build errors ...................................................................... Fix MBEDTLS_DEPRECATED_REMOVED build errors This commit allows compiling OpenVPN with recent versions of mbed TLS if MBEDTLS_DEPRECATED_REMOVED is defined. Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9 Signed-off-by: Max Fillinger --- M src/openvpn/mbedtls_compat.h M src/openvpn/ssl_mbedtls.c M src/openvpn/ssl_mbedtls.h 3 files changed, 75 insertions(+), 28 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/681/2 diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbedtls_compat.h index d742b54..8559c2e 100644 --- a/src/openvpn/mbedtls_compat.h +++ b/src/openvpn/mbedtls_compat.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,12 @@ #include #endif +#if MBEDTLS_VERSION_NUMBER >=3D 0x03000000 +typedef uint16_t mbedtls_compat_group_id; +#else +typedef mbedtls_ecp_group_id mbedtls_compat_group_id; +#endif + static inline void mbedtls_compat_psa_crypto_init(void) { @@ -64,6 +71,16 @@ #endif /* HAVE_MBEDTLS_PSA_CRYPTO_H && defined(MBEDTLS_PSA_CRYPTO_C) */ } +static inline mbedtls_compat_group_id +mbedtls_compat_get_group_id(const mbedtls_ecp_curve_info *curve_info) +{ +#if MBEDTLS_VERSION_NUMBER >=3D 0x03000000 + return curve_info->tls_id; +#else + return curve_info->grp_id; +#endif +} + /* * In older versions of mbedtls, mbedtls_ctr_drbg_update() did not return = an * error code, and it was deprecated in favor of mbedtls_ctr_drbg_update_r= et() @@ -124,6 +141,34 @@ } #if MBEDTLS_VERSION_NUMBER < 0x03020100 +typedef enum { + MBEDTLS_SSL_VERSION_UNKNOWN, /*!< Context not in use or version not ye= t negotiated. */ + MBEDTLS_SSL_VERSION_TLS1_2 =3D 0x0303, /*!< (D)TLS 1.2 */ + MBEDTLS_SSL_VERSION_TLS1_3 =3D 0x0304, /*!< (D)TLS 1.3 */ +} mbedtls_ssl_protocol_version; + +static inline void +mbedtls_ssl_conf_min_tls_version(mbedtls_ssl_config *conf, mbedtls_ssl_pro= tocol_version tls_version) +{ + int major =3D (tls_version >> 8) & 0xff; + int minor =3D tls_version & 0xff; + mbedtls_ssl_conf_min_version(conf, major, minor); +} + +static inline void +mbedtls_ssl_conf_max_tls_version(mbedtls_ssl_config *conf, mbedtls_ssl_pro= tocol_version tls_version) +{ + int major =3D (tls_version >> 8) & 0xff; + int minor =3D tls_version & 0xff; + mbedtls_ssl_conf_max_version(conf, major, minor); +} + +static inline void +mbedtls_ssl_conf_groups(mbedtls_ssl_config *conf, mbedtls_compat_group_id = *groups) +{ + mbedtls_ssl_conf_curves(conf, groups); +} + static inline size_t mbedtls_cipher_info_get_block_size(const mbedtls_cipher_info_t *cipher) { diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index e25fb84..35911ff 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -402,7 +402,7 @@ /* Get number of groups and allocate an array in ctx */ int groups_count =3D get_num_elements(groups, ':'); - ALLOC_ARRAY_CLEAR(ctx->groups, mbedtls_ecp_group_id, groups_count + 1) + ALLOC_ARRAY_CLEAR(ctx->groups, mbedtls_compat_group_id, groups_count += 1) /* Parse allowed ciphers, getting IDs */ int i =3D 0; @@ -419,11 +419,15 @@ } else { - ctx->groups[i] =3D ci->grp_id; + ctx->groups[i] =3D mbedtls_compat_get_group_id(ci); i++; } } - ctx->groups[i] =3D MBEDTLS_ECP_DP_NONE; + + /* Recent mbedtls versions state that the list of groups must be termi= nated + * with 0. Older versions state that it must be terminated with MBEDTL= S_ECP_DP_NONE + * which is also 0, so this works either way. */ + ctx->groups[i] =3D 0; gc_free(&gc); } @@ -1046,32 +1050,30 @@ } /** - * Convert an OpenVPN tls-version variable to mbed TLS format (i.e. a majo= r and - * minor ssl version number). + * Convert an OpenVPN tls-version variable to mbed TLS format * * @param tls_ver The tls-version variable to convert. - * @param major Returns the TLS major version in mbed TLS format. - * Must be a valid pointer. - * @param minor Returns the TLS minor version in mbed TLS format. - * Must be a valid pointer. + * + * @return Translated mbedTLS SSL version from OpenVPN TLS version. */ -static void -tls_version_to_major_minor(int tls_ver, int *major, int *minor) +mbedtls_ssl_protocol_version +tls_version_to_ssl_version(int tls_ver) { - ASSERT(major); - ASSERT(minor); switch (tls_ver) { #if defined(MBEDTLS_SSL_PROTO_TLS1_2) case TLS_VER_1_2: - *major =3D MBEDTLS_SSL_MAJOR_VERSION_3; - *minor =3D MBEDTLS_SSL_MINOR_VERSION_3; - break; + return MBEDTLS_SSL_VERSION_TLS1_2; +#endif + +#if defined(MBEDTLS_SSL_PROTO_TLS1_3) + case TLS_VER_1_3: + return MBEDTLS_SSL_VERSION_TLS1_3; #endif default: msg(M_FATAL, "%s: invalid or unsupported TLS version %d", __fu= nc__, tls_ver); - break; + return MBEDTLS_SSL_VERSION_UNKNOWN; } } @@ -1152,7 +1154,7 @@ if (ssl_ctx->groups) { - mbedtls_ssl_conf_curves(ks_ssl->ssl_config, ssl_ctx->groups); + mbedtls_ssl_conf_groups(ks_ssl->ssl_config, ssl_ctx->groups); } /* Disable TLS renegotiations if the mbedtls library supports that fea= ture. @@ -1202,15 +1204,14 @@ &SSLF_TLS_VERSION_MIN_MASK; /* default to TLS 1.2 */ - int major =3D MBEDTLS_SSL_MAJOR_VERSION_3; - int minor =3D MBEDTLS_SSL_MINOR_VERSION_3; + mbedtls_ssl_protocol_version version =3D MBEDTLS_SSL_VERSION_TLS1_= 2; if (configured_tls_version_min > TLS_VER_UNSPEC) { - tls_version_to_major_minor(configured_tls_version_min, &major,= &minor); + version =3D tls_version_to_ssl_version(configured_tls_version_= min); } - mbedtls_ssl_conf_min_version(ks_ssl->ssl_config, major, minor); + mbedtls_ssl_conf_min_tls_version(ks_ssl->ssl_config, version); } /* Initialize maximum TLS version */ @@ -1219,20 +1220,19 @@ (session->opt->ssl_flags >> SSLF_TLS_VERSION_MAX_SHIFT) &SSLF_TLS_VERSION_MAX_MASK; - int major =3D 0; - int minor =3D 0; + mbedtls_ssl_protocol_version version =3D MBEDTLS_SSL_VERSION_UNKNO= WN; if (configured_tls_version_max > TLS_VER_UNSPEC) { - tls_version_to_major_minor(configured_tls_version_max, &major,= &minor); + version =3D tls_version_to_ssl_version(configured_tls_version_= max); } else { /* Default to tls_version_max(). */ - tls_version_to_major_minor(tls_version_max(), &major, &minor); + version =3D tls_version_to_ssl_version(tls_version_max()); } - mbedtls_ssl_conf_max_version(ks_ssl->ssl_config, major, minor); + mbedtls_ssl_conf_max_tls_version(ks_ssl->ssl_config, version); } #if HAVE_MBEDTLS_SSL_CONF_EXPORT_KEYS_EXT_CB diff --git a/src/openvpn/ssl_mbedtls.h b/src/openvpn/ssl_mbedtls.h index 1fd0ce8..34b4f02 100644 --- a/src/openvpn/ssl_mbedtls.h +++ b/src/openvpn/ssl_mbedtls.h @@ -39,6 +39,8 @@ #include #endif +#include "mbedtls_compat.h" + typedef struct _buffer_entry buffer_entry; struct _buffer_entry { @@ -118,7 +120,7 @@ #endif struct external_context external_key; /**< External key context */ int *allowed_ciphers; /**< List of allowed ciphers for this conn= ection */ - mbedtls_ecp_group_id *groups; /**< List of allowed groups for this= connection */ + mbedtls_compat_group_id *groups; /**< List of allowed groups for t= his connection */ mbedtls_x509_crt_profile cert_profile; /**< Allowed certificate types = */ }; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/681?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: If96c2ebd2af16b18ed34820e8c0531547e2076d9 Gerrit-Change-Number: 681 Gerrit-PatchSet: 2 Gerrit-Owner: MaxF Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: comododragon Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: MaxF Gerrit-MessageType: newpatchset --m8Eg1mZiggM= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: MaxF, flichtenheld, plaisthos.

MaxF uploaded patch set #2 to this change.

View Change=

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

Fix MBEDTLS_DEPRECATED_REMOVED build errors
This commit allows compiling OpenVPN with recent versions of mbed TLS=
if MBEDTLS_DEPRECATED_REMOVED is defined.

Change-Id: If96c2ebd2a= f16b18ed34820e8c0531547e2076d9
Signed-off-by: Max Fillinger <maximili= an.fillinger@...2507...>
---
M src/openvpn/mbedtls_compat.h
M s= rc/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed,= 75 insertions(+), 28 deletions(-)

git pull ssh://gerrit.openvpn.=
net:29418/openvpn refs/changes/81/681/2
diff --git a/src/openvpn/mb=
edtls_compat.h b/src/openvpn/mbedtls_compat.h
index d742b54= ..8559c2e 100644
--- a/src/openvpn/mbedtls_compat.h<= br>+++ b/src/openvpn/mbedtls_compat.h
@@ -40,6 +40,7 = @@
#include <mbedtls/cipher.h>
#inc= lude <mbedtls/ctr_drbg.h>
#include <mbedtls/dhm.h= >
+#include <mb= edtls/ecp.h>
#include <mbedtls/md.h>
#include <mbedtls/pem.h>
#include <mbedtls/p= k.h>
@@ -51,6 +52,12 @@
#include &l= t;psa/crypto.h>
#endif

+#if MBEDTLS_VERSION_NUMBER >=3D= 0x03000000
+typedef = uint16_t mbedtls_compat_group_id;
+#else
+= typedef mbedtls_ecp_group_id mbedtls_compat_group_id;
+#endif
+
static inline void
= mbedtls_compat_psa_crypto_init(void)
{
@@ = -64,6 +71,16 @@
#endif /* HAVE_MBEDTLS_PSA_CRYPTO_H &&= amp; defined(MBEDTLS_PSA_CRYPTO_C) */
}
<= /span>
+static inline mbedtl= s_compat_group_id
+mb= edtls_compat_get_group_id(const mbedtls_ecp_curve_info *curve_info)<= br>+{
+#if MBEDTLS_VERSION_NUMBER >=3D 0x03000000=
+ return curve_in= fo->tls_id;
+#else=
+ return curve_in= fo->grp_id;
+#endi= f
+}
+
/*
* In older versions of mbedtls, mbedtls_ctr_drbg_update() did not return= an

* error code, and it was deprecated in favor of mbedt= ls_ctr_drbg_update_ret()
@@ -124,6 +141,34 @@
}

#if MBEDTLS_VERSION_NUMBER < 0x= 03020100
+typedef enu= m {
+ MBEDTLS_SSL_= VERSION_UNKNOWN, /*!< Context not in use or version not yet negotiated. = */
+ MBEDTLS_SSL_V= ERSION_TLS1_2 =3D 0x0303, /*!< (D)TLS 1.2 */
+ MBEDTLS_SSL_VERSION_TLS1_3 =3D 0x0304, /*!&= lt; (D)TLS 1.3 */
+} = mbedtls_ssl_protocol_version;
+
+static in= line void
+mbedtls_ss= l_conf_min_tls_version(mbedtls_ssl_config *conf, mbedtls_ssl_protocol_versi= on tls_version)
+{

+ int major =3D (tls= _version >> 8) & 0xff;
+ int minor =3D tls_version & 0xff;
+ mbedtls_ssl_conf_min_version(conf, m= ajor, minor);
+}
+
+static inline void
+mbedtls_ssl_conf_max_tls_version(mbedtls_= ssl_config *conf, mbedtls_ssl_protocol_version tls_version)
+{

+ int major =3D (tls_version >> 8) & 0xff= ;
+ int minor =3D = tls_version & 0xff;
+ mbedtls_ssl_conf_max_version(conf, major, minor);
+}
+
= +static inline void
+= mbedtls_ssl_conf_groups(mbedtls_ssl_config *conf, mbedtls_compat_group_id *= groups)
+{
= + mbedtls_ssl_conf_curves(co= nf, groups);
+}
+
static = inline size_t
mbedtls_cipher_info_get_block_size(const mbe= dtls_cipher_info_t *cipher)
{
diff --git a= /src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c
inde= x e25fb84..35911ff 100644
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -402,7 +4= 02,7 @@

/* Get number of groups and = allocate an array in ctx */
int groups_count =3D get_n= um_elements(groups, ':');
- ALLOC_ARRAY_CLEAR(ctx->groups, mbedtls_ecp_group_id, gro= ups_count + 1)
+ A= LLOC_ARRAY_CLEAR(ctx->groups, mbedtls_compat_group_id, groups_count + 1)=

/* Parse allowed ciphers, getting I= Ds */
int i =3D 0;
@@ -419,11 +419,15 = @@
}
else
{

- = ctx->groups[i] =3D ci->grp_id;
+ ctx->groups[i] =3D mbedtls_compat_get_gro= up_id(ci);
i++;
}
}
- = ctx->groups[i] =3D MBEDTLS_ECP_DP_NONE;
+
+ /* Recent mbedtls versions state that the list of groups must be = terminated
+ * wi= th 0. Older versions state that it must be terminated with MBEDTLS_ECP_DP_N= ONE
+ * which is = also 0, so this works either way. */
+ ctx->groups[i] =3D 0;

<= span> gc_free(&gc);

}
@@ -1046,32 = +1050,30 @@
}

/**
- * Convert an OpenVPN tls-v= ersion variable to mbed TLS format (i.e. a major and
- * minor ssl version number).
+ * Convert an OpenVPN tls-version= variable to mbed TLS format

*
* @param= tls_ver The tls-version variable to convert.
- * @param major Returns the TLS maj= or version in mbed TLS format.
- * Must be a valid pointer.
- * @param minor Returns the TLS= minor version in mbed TLS format.
- * Must be a valid pointer.
+ *

+ * @return Translated mbedTLS SSL version from Ope= nVPN TLS version.
*/
-static void
-tls_version_to_major_minor(int tls_ver, int *major, int *minor)
+mbedtls_ssl_protocol_ver= sion
+tls_version_to_= ssl_version(int tls_ver)
{
- ASSERT(major);
- ASSERT(minor);

= switch (tls_ver)
{
#if defined(MBED= TLS_SSL_PROTO_TLS1_2)
case TLS_VER_1_2:
= - *major =3D MBEDTLS_S= SL_MAJOR_VERSION_3;
- = *minor =3D MBEDTLS_SSL_MINOR_VERSION_3;
- break;
+ return MBEDTLS_SSL_VERSION_TLS1_2;
+#endif
+

+#if defined(MBEDTLS_SSL_PROTO_TLS1_3)
+ case TLS_VER_1_3:
+ return MBEDTLS_SS= L_VERSION_TLS1_3;
#endif
default:=
msg(M_FATAL, "%s: invalid or unsupported= TLS version %d", __func__, tls_ver);
- break;
+ return MBEDTLS_SSL_VERSION_UNKNOWN;<= br> }
}

@@ -11= 52,7 +1154,7 @@

if (ssl_ctx->grou= ps)
{
- mbedtls_ssl_conf_curves(ks_ssl->ssl_config, ssl_ctx->gro= ups);
+ mbedtl= s_ssl_conf_groups(ks_ssl->ssl_config, ssl_ctx->groups);
}

/* Disable TLS renegotiati= ons if the mbedtls library supports that feature.
@@ -1202,= 15 +1204,14 @@
&SSLF_TLS_VERSION_MIN_MASK;=

/* default to TLS 1.2 */=
- int major =3D MBEDTL= S_SSL_MAJOR_VERSION_3;
= - int minor =3D MBEDTLS_SSL_MINOR_VERSION_3;
+ mbedtls_ssl_protocol_version vers= ion =3D MBEDTLS_SSL_VERSION_TLS1_2;

= if (configured_tls_version_min > TLS_VER_UNSPEC)
= {
- tl= s_version_to_major_minor(configured_tls_version_min, &major, &minor= );
+ versi= on =3D tls_version_to_ssl_version(configured_tls_version_min);
}

- mbedtls_ssl_conf_min_version(ks_ssl->ssl_config, majo= r, minor);
+ m= bedtls_ssl_conf_min_tls_version(ks_ssl->ssl_config, version);
= }

/* Initialize maximum T= LS version */
@@ -1219,20 +1220,19 @@
= (session->opt->ssl_flags >> SSLF_TLS_VERSION_MAX_SHIFT)=
&SSLF_TLS_VERSION_MAX_MASK;

- int major= =3D 0;
- int mi= nor =3D 0;
+ m= bedtls_ssl_protocol_version version =3D MBEDTLS_SSL_VERSION_UNKNOWN;=

if (configured_tls_version_max > TL= S_VER_UNSPEC)
{
- tls_version_to_major_minor(configured_tls_ve= rsion_max, &major, &minor);
+ version =3D tls_version_to_ssl_version(configur= ed_tls_version_max);
}
el= se
{
/* Default to tl= s_version_max(). */
- = tls_version_to_major_minor(tls_version_max(), &major, &mi= nor);
+ ve= rsion =3D tls_version_to_ssl_version(tls_version_max());
= }

- mbedtls_ssl_conf_max_version(ks_ssl->ssl_config, major, min= or);
+ mbedtls= _ssl_conf_max_tls_version(ks_ssl->ssl_config, version);
= }

#if HAVE_MBEDTLS_SSL_CONF_EXPORT_= KEYS_EXT_CB
diff --git a/src/openvpn/ssl_mbedtls.h b/src/op= envpn/ssl_mbedtls.h
index 1fd0ce8..34b4f02 100644--- a/src/openvpn/ssl_mbedtls.h
+++ b/src/openvpn/ss= l_mbedtls.h
@@ -39,6 +39,8 @@
#include <= ;pkcs11-helper-1.0/pkcs11h-certificate.h>
#endif=

+#include= "mbedtls_compat.h"
+
typedef struct _buffer_entry buffer_entry;

struct _buffer_entry {
@@ -1= 18,7 +120,7 @@
#endif
struct external= _context external_key; /**< External key context */
= int *allowed_ciphers; /**< List of allowed ciphers for this conne= ction */
- mbedtls_e= cp_group_id *groups; /**< List of allowed groups for this connection= */
+ mbedtls_comp= at_group_id *groups; /**< List of allowed groups for this connection= */
mbedtls_x509_crt_profile cert_profile; /**< All= owed certificate types */
};

<= span>

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

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0= 531547e2076d9
Gerrit-Change-Number: 681
Gerrit-PatchSet: 2
Gerrit-Owner: MaxF <max@...2606...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: comododragon <rein.vanbaaren@...493...= 1435...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: MaxF <max@...2606...> =
Gerrit-MessageType: newpatchset
--m8Eg1mZiggM=--