Change in openvpn[release/2.6]: Fix MBEDTLS_DEPRECATED_REMOVED build errors
A message that is not in the archive (sent off-list or not yet received): gerrit.1745857478000.If96c2ebd2af16b18ed34820e8c0531547e2076d9@...2715...
Attention is currently required from: cron2, plaisthos.
flichtenheld has uploaded this change for review. ( http://gerrit.openvpn.net/c/openvpn/+/946?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
---
M src/openvpn/mbedtls_compat.h
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_mbedtls.h
3 files changed, 75 insertions(+), 29 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/46/946/1
src/openvpn/mbedtls_compat.h +45 -0
@@ -40,6 +40,7 @@#include <mbedtls/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 >=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 >=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_ret()
@@ -124,6 +141,34 @@ }#if MBEDTLS_VERSION_NUMBER <0x03020100 +typedef enum { +MBEDTLS_SSL_VERSION_UNKNOWN ,/*!< Context not in use or version not yet negotiated. */ +MBEDTLS_SSL_VERSION_TLS1_2 =0x0303 ,/*!< (D)TLS 1.2 */ +MBEDTLS_SSL_VERSION_TLS1_3 =0x0304 ,/*!< (D)TLS 1.3 */ +}mbedtls_ssl_protocol_version ; + +static inline void +mbedtls_ssl_conf_min_tls_version (mbedtls_ssl_config *conf,mbedtls_ssl_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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) {
src/openvpn/ssl_mbedtls.c +27 -28
122 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +3 -1
@@ -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 {
@@ -118,7 +120,7 @@#endif struct external_context external_key;/**< External key 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 http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/946?usp=email )
Change subject: Fix MBEDTLS_DEPRECATED_REMOVED build errors
......................................................................
Patch Set 1: Code-Review-2
(1 comment)
Patchset:
PS1:
This looks like a straightforward cherrypick, but then fails on some builders with
``` essl_mbedtls.c: In function ???tls_version_to_ssl_version???: essl_mbedtls.c:1069:14: error: ???major??? undeclared (first use in this +function) e 1069 | *major = MBEDTLS_SSL_MAJOR_VERSION_3; e | ^~~~~ ```
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Mon, 28 Apr 2025 19:20:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
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=email
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
---
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
src/openvpn/mbedtls_compat.h +47 -0
@@ -40,6 +40,7 @@#include <mbedtls/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 >=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 >=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_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 =0x0301 ,/*!< (D)TLS 1.0 */ +MBEDTLS_SSL_VERSION_TLS1_1 =0x0302 ,/*!< (D)TLS 1.1 */ +MBEDTLS_SSL_VERSION_TLS1_2 =0x0303 ,/*!< (D)TLS 1.2 */ +MBEDTLS_SSL_VERSION_TLS1_3 =0x0304 ,/*!< (D)TLS 1.3 */ +}mbedtls_ssl_protocol_version ; + +static inline void +mbedtls_ssl_conf_min_tls_version (mbedtls_ssl_config *conf,mbedtls_ssl_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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) {
src/openvpn/ssl_mbedtls.c +29 -34
136 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +3 -1
@@ -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 {
@@ -118,7 +120,7 @@#endif struct external_context external_key;/**< External key 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 http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/946?usp=email )
Change subject: Fix MBEDTLS_DEPRECATED_REMOVED build errors
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 29 Apr 2025 15:48:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v2 1/1 Fix MBEDTLS_DEPRECATED_REMOVED build errors
In reply to a message not in the archiveFrom: rein.vanbaaren <[email protected]...>
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/946
This mail reflects revision 2 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/mbedtls_compat.h +47 -0
@@ -40,6 +40,7 @@#include <mbedtls/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 >=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 >=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_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 =0x0301 ,/*!< (D)TLS 1.0 */ +MBEDTLS_SSL_VERSION_TLS1_1 =0x0302 ,/*!< (D)TLS 1.1 */ +MBEDTLS_SSL_VERSION_TLS1_2 =0x0303 ,/*!< (D)TLS 1.2 */ +MBEDTLS_SSL_VERSION_TLS1_3 =0x0304 ,/*!< (D)TLS 1.3 */ +}mbedtls_ssl_protocol_version ; + +static inline void +mbedtls_ssl_conf_min_tls_version (mbedtls_ssl_config *conf,mbedtls_ssl_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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) {
src/openvpn/ssl_mbedtls.c +29 -34
136 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +3 -1
@@ -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 {
@@ -118,7 +120,7 @@#endif struct external_context external_key;/**< External key 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 */ };
[Openvpn-devel] [PATCH applied] Re: Fix MBEDTLS_DEPRECATED_REMOVED build errors
Thanks for the backport. This is important long-term compat material.
I have not tested this beyond "buildbots build against various mbedTLS versions, and with the latest version, this all succeeds and t_client tests pass". Staring at the diff confirms it's the backport of commit 8eb397de36564 + code sections for older mbedTLS versions.
Your patch has been applied to the release/2.6 branch.
commit 0169b4ad2bb35d2cc5f0c35db4775f182646127b
Author: rein.vanbaaren Date: Tue Apr 29 17:49:18 2025 +0200
Fix MBEDTLS_DEPRECATED_REMOVED build errors
Signed-off-by: Max Fillinger <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#3) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/946?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
---
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/3
src/openvpn/mbedtls_compat.h +47 -0
@@ -40,6 +40,7 @@#include <mbedtls/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 >=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 >=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_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 =0x0301 ,/*!< (D)TLS 1.0 */ +MBEDTLS_SSL_VERSION_TLS1_1 =0x0302 ,/*!< (D)TLS 1.1 */ +MBEDTLS_SSL_VERSION_TLS1_2 =0x0303 ,/*!< (D)TLS 1.2 */ +MBEDTLS_SSL_VERSION_TLS1_3 =0x0304 ,/*!< (D)TLS 1.3 */ +}mbedtls_ssl_protocol_version ; + +static inline void +mbedtls_ssl_conf_min_tls_version (mbedtls_ssl_config *conf,mbedtls_ssl_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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) {
src/openvpn/ssl_mbedtls.c +29 -34
136 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +3 -1
@@ -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 {
@@ -118,7 +120,7 @@#endif struct external_context external_key;/**< External key 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 http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/946?usp=email )
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.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28771.html
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...
---
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(-)
src/openvpn/mbedtls_compat.h +47 -0
@@ -40,6 +40,7 @@#include <mbedtls/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 >=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 >=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_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 =0x0301 ,/*!< (D)TLS 1.0 */ +MBEDTLS_SSL_VERSION_TLS1_1 =0x0302 ,/*!< (D)TLS 1.1 */ +MBEDTLS_SSL_VERSION_TLS1_2 =0x0303 ,/*!< (D)TLS 1.2 */ +MBEDTLS_SSL_VERSION_TLS1_3 =0x0304 ,/*!< (D)TLS 1.3 */ +}mbedtls_ssl_protocol_version ; + +static inline void +mbedtls_ssl_conf_min_tls_version (mbedtls_ssl_config *conf,mbedtls_ssl_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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_protocol_version tls_version) +{ +int major = (tls_version >>8 ) &0xff ; +int minor = 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) {
src/openvpn/ssl_mbedtls.c +29 -34
136 lines not on this page · raw message
src/openvpn/ssl_mbedtls.h +3 -1
@@ -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 {
@@ -118,7 +120,7 @@#endif struct external_context external_key;/**< External key 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 http://gerrit.openvpn.net/c/openvpn/+/946?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: If96c2ebd2af16b18ed34820e8c0531547e2076d9
Gerrit-Change-Number: 946
Gerrit-PatchSet: 3
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: comododragon <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged