From: "flichtenheld (Code Review)"
Date: Tue, 29 Apr 2025 11:08:51 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
rein.vanbaaren@...1435..., openvpn-devel@lists.sourceforge.net,
gert@...1296...
Message-ID: <374744a486ca2e990a536a404561b34111f80910-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="t/9Ww/X93lo="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[release/2.6]: Fix
MBEDTLS_DEPRECATED_REMOVED build errors
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: comododragon , plaisthos
Cc: openvpn-devel
--t/9Ww/X93lo=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello cron2, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/946?usp=3Demail
to look at the new patch set (#2).
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.
Cherry-pick note:
- Adapt to still support TLS 1.0 and 1.1 which were removed in
master.
Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Signed-off-by: Max Fillinger
Acked-by: Arne Schwabe
Message-Id: <20240618120127.4564-1-gert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28=
771.html
Signed-off-by: Gert Doering
(cherry picked from commit 8eb397de3656402872f9c9584c6f703b87b50762)
---
M src/openvpn/mbedtls_compat.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed, 79 insertions(+), 35 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/46/946/2
diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbedtls_compat.h
index 610215b..5705706 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,36 @@
}
#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_0 =3D 0x0301, /*!< (D)TLS 1.0 */
+ MBEDTLS_SSL_VERSION_TLS1_1 =3D 0x0302, /*!< (D)TLS 1.1 */
+ 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 7e29bd2..8fb69c3 100644
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -401,7 +401,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;
@@ -418,11 +418,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);
}
@@ -1049,47 +1053,40 @@
}
/**
- * 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)
+static 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)
case TLS_VER_1_0:
- *major =3D MBEDTLS_SSL_MAJOR_VERSION_3;
- *minor =3D MBEDTLS_SSL_MINOR_VERSION_1;
- break;
+ return MBEDTLS_SSL_VERSION_TLS1_0;
#endif
#if defined(MBEDTLS_SSL_PROTO_TLS1_1)
case TLS_VER_1_1:
- *major =3D MBEDTLS_SSL_MAJOR_VERSION_3;
- *minor =3D MBEDTLS_SSL_MINOR_VERSION_2;
- break;
+ return MBEDTLS_SSL_VERSION_TLS1_1;
#endif
#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;
}
}
@@ -1170,7 +1167,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.
@@ -1220,15 +1217,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 */
@@ -1237,20 +1233,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/+/946?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: cron2
Gerrit-Reviewer: plaisthos
Gerrit-CC: comododragon
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newpatchset
--t/9Ww/X93lo=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
flichtenheld uploaded patch set #2 to this change.
<=
p>View Ch=
ange
Fix MBEDTLS_DEPRECATED_REMOVED build errors
This commit all=
ows compiling OpenVPN with recent versions of mbed TLS
if MBEDTLS_DEPREC=
ATED_REMOVED is defined.
Cherry-pick note:
- Adapt to still suppo=
rt TLS 1.0 and 1.1 which were removed in
master.
Change-Id: If9=
6c2ebd2af16b18ed34820e8c0531547e2076d9
Signed-off-by: Max Fillinger <=
maximilian.fillinger@...2507...>
Acked-by: Arne Schwabe <arne-open=
vpn@...1227...>
Message-Id: <20240618120127.4564-1-gert@...1296...=
>
URL: https://www.mail-archive.com/openvpn-devel@...1223...=
et/msg28771.html
Signed-off-by: Gert Doering <gert@...1296...>
=
(cherry picked from commit 8eb397de3656402872f9c9584c6f703b87b50762)
---=
M src/openvpn/mbedtls_compat.h
M src/openvpn/ssl_mbedtls.c
M src/=
openvpn/ssl_mbedtls.h
3 files changed, 79 insertions(+), 35 deletions(-)=
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/46/=
946/2
diff --git a/src/openvpn/mbedtls_compat.h b/src/openvpn/mbedt=
ls_compat.h
index 610215b..5705706 100644
-=
-- a/src/openvpn/mbedtls_compat.h
+++ b/src/openvpn/mbedtls=
_compat.h
@@ -40,6 +40,7 @@
#include <m=
bedtls/cipher.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/dhm.h>
+#include <mbedtls/ecp.h>
#=
include <mbedtls/md.h>
#include <mbedtls/pem.h>=
;
#include <mbedtls/pk.h>
@@ -51,6 +=
52,12 @@
#include <psa/crypto.h>
#endif
+#if MBEDTLS_VERSION_NUMBER >=3D 0x03000000
+typedef uint16_t mbedtls_compat_group_id;=
+#else
+typedef mbedtls_ecp_group_id mbed=
tls_compat_group_id;
=
+#endif
+
<=
span> static inline void
mbedtls_compat_psa_crypto_init(vo=
id)
{
@@ -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 m=
bedtls_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 cod=
e, and it was deprecated in favor of mbedtls_ctr_drbg_update_ret()@@ -124,6 +141,36 @@
}
#if MBEDTLS_VERSION_NUMBER < 0x03020100
+typedef enum {
+ MBEDTLS_SSL_VERSION_UNKNOWN, /*!< Context =
not in use or version not yet negotiated. */
+ MBEDTLS_SSL_VERSION_TLS1_0 =3D 0x0301, /*!<=
(D)TLS 1.0 */
+ M=
BEDTLS_SSL_VERSION_TLS1_1 =3D 0x0302, /*!< (D)TLS 1.1 */
+ MBEDTLS_SSL_VERSION_TLS1_2 =3D =
0x0303, /*!< (D)TLS 1.2 */
+ MBEDTLS_SSL_VERSION_TLS1_3 =3D 0x0304, /*!< (D)TLS 1.3 */<=
/span>
+} mbedtls_ssl_protoc=
ol_version;
+<=
br>+static inline void+mbedtls_ssl_conf_min_tls_ver=
sion(mbedtls_ssl_config *conf, mbedtls_ssl_protocol_version tls_version)
+{
+ int major =3D (tls_version >> =
8) & 0xff;
+ i=
nt 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, mb=
edtls_ssl_protocol_version tls_version)
+{
+ int major =3D (tls_version >> 8) & 0xff;
+ int minor =3D tls_version & 0x=
ff;
+ mbedtls_ssl_=
conf_max_version(conf, major, minor);
+}
+=
+static inline void<=
/span>
+mbedtls_ssl_conf_gro=
ups(mbedtls_ssl_config *conf, mbedtls_compat_group_id *groups)
+{
+ mbedtls_ssl_conf_curves(conf, groups);<=
br>+}
+
static inline size_t=
mbedtls_cipher_info_get_block_size(const mbedtls_cipher_info_t *=
cipher)
{
diff --git a/src/openvpn/ssl_mbe=
dtls.c b/src/openvpn/ssl_mbedtls.c
index 7e29bd2..8fb69c3 1=
00644
--- a/src/openvpn/ssl_mbedtls.c
+++ b=
/src/openvpn/ssl_mbedtls.c
@@ -401,7 +401,7 @@
/* Get number of groups and allocate an array in=
ctx */
int groups_count =3D get_num_elements(groups, =
':');
- ALLO=
C_ARRAY_CLEAR(ctx->groups, mbedtls_ecp_group_id, groups_count + 1)
+ ALLOC_ARRAY_CLEAR(ctx=
->groups, mbedtls_compat_group_id, groups_count + 1)
=
span>
/* Parse allowed ciphers, getting IDs */
int i =3D 0;
@@ -418,11 +418,15 @@
=
}
else
{- ctx->groups[i] =
=3D ci->grp_id;
+ =
ctx->groups[i] =3D mbedtls_compat_get_group_id(ci);
i++;
}
}<=
/span>
- ctx->groups[i] =
=3D MBEDTLS_ECP_DP_NONE;
+
+ /* Recent =
mbedtls versions state that the list of groups must be terminated
+ * with 0. Older versions=
state that it must be terminated with MBEDTLS_ECP_DP_NONE
+ * which is also 0, so this work=
s either way. */
+ =
ctx->groups[i] =3D 0;
gc_free(&a=
mp;gc);
}
@@ -1049,47 +1053,40 @@ }
/**
- * Convert an OpenVPN tls-version variable to m=
bed 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 tl=
s-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_m=
ajor_minor(int tls_ver, int *major, int *minor)
+static mbedtls_ssl_protocol_version
<=
span style=3D"color: hsl(120, 100%, 40%);">+tls_version_to_ssl_version(int =
tls_ver)
{
- ASSERT(major);
- ASSERT(minor);
-=
switch (tls_ver)
{
#if defined(MBEDTLS_SSL_PROTO_TLS1)
case TLS_V=
ER_1_0:
- *m=
ajor =3D MBEDTLS_SSL_MAJOR_VERSION_3;
- *minor =3D MBEDTLS_SSL_MINOR_VERSION_1;<=
br>- break;
=
+ return MBEDTLS_SSL=
_VERSION_TLS1_0;
#endif
=
#if defined(MBEDTLS_SSL_PROTO_TLS1_1)
case TLS_VE=
R_1_1:
- *ma=
jor =3D MBEDTLS_SSL_MAJOR_VERSION_3;
- *minor =3D MBEDTLS_SSL_MINOR_VERSION_2;- break;
<=
span style=3D"color: hsl(120, 100%, 40%);">+ return MBEDTLS_SSL_=
VERSION_TLS1_1;
#endif
=
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
case TLS_VER=
_1_2:
- *maj=
or =3D MBEDTLS_SSL_MAJOR_VERSION_3;
- *minor =3D MBEDTLS_SSL_MINOR_VERSION_3;
- break;
+ return MBEDTLS_SSL_V=
ERSION_TLS1_2;
+#endi=
f
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_3)=
+ case TLS_VE=
R_1_3:
+ r=
eturn MBEDTLS_SSL_VERSION_TLS1_3;
#endif
=
default:
msg(M_FATAL=
, "%s: invalid or unsupported TLS version %d", __func__, tls_ver)=
;
- break;=
span>
+ return MB=
EDTLS_SSL_VERSION_UNKNOWN;
}
}=
@@ -1170,7 +1167,7 @@
<=
br> if (ssl_ctx->groups)
{
- mbedtls_ssl_conf_curves(ks_s=
sl->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 =
feature.
@@ -1220,15 +1217,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;
+ m=
bedtls_ssl_protocol_version version =3D MBEDTLS_SSL_VERSION_TLS1_2;<=
br>
if (configured_tls_version_min > TLS=
_VER_UNSPEC)
{
- tls_version_to_major_minor(configured_tls_ver=
sion_min, &major, &minor);
+ version =3D tls_version_to_ssl_version(configure=
d_tls_version_min);
}
=
- mbedtls_ssl_conf_min_ver=
sion(ks_ssl->ssl_config, major, minor);
+ mbedtls_ssl_conf_min_tls_version(ks_ssl->=
ssl_config, version);
}
/* Initialize maximum TLS version */
@@ -1237,20 +=
1233,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 MBE=
DTLS_SSL_VERSION_UNKNOWN;
if (co=
nfigured_tls_version_max > TLS_VER_UNSPEC)
{
- tls_version_=
to_major_minor(configured_tls_version_max, &major, &minor);<=
br>+ 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 <pkcs11-helper-1.0/pkcs11h-certificate.h&=
gt;
#endif
+#include "mbedtls_compat.h"
<=
span style=3D"color: hsl(120, 100%, 40%);">+
typedef struc=
t _buffer_entry buffer_entry;
struct _bu=
ffer_entry {
@@ -118,7 +120,7 @@
#endif
struct external_context external_key; /**< External k=
ey context */
int *allowed_ciphers; /**< List=
of allowed ciphers for this connection */
- mbedtls_ecp_group_id *groups; /**< List of =
allowed groups for this connection */
+ mbedtls_compat_group_id *groups; /**< List of =
allowed groups for this connection */
mbedtls_x509_crt=
_profile cert_profile; /**< Allowed certificate types */
};
To view, visit <=
a href=3D"http://gerrit.openvpn.net/c/openvpn/+/946?usp=3Demail">change 946=
. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0=
531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: cron2 <gert@...1296...>=
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-MessageType: newpatchset
--t/9Ww/X93lo=--