From: Razvan Cojocaru <[email protected]> - MBEDTLS_SSL_CBC_RECORD_SPLITTING and its API were removed in mbed TLS 3; the minimum is now 4.0. - INFO_CALLBACK_SSL_CONST is never defined. - TLS1_3_VERSION is already used unguarded, and the only caller of convert_tls13_list_to_openssl() isn't guarded.
Change-Id: Ib645e0bf5c8941f4b1e14f13397794be15eab68f Signed-off-by: Razvan Cojocaru <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2189 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2189 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Gert Doering <[email protected]> diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c index 19a2d48..dbc1b9d 100644 --- a/src/openvpn/ssl_mbedtls.c +++ b/src/openvpn/ssl_mbedtls.c @@ -892,15 +892,6 @@ mbedtls_ssl_conf_renegotiation(ks_ssl->ssl_config, MBEDTLS_SSL_RENEGOTIATION_DISABLED); #endif /* MBEDTLS_SSL_RENEGOTIATION */ - /* Disable record splitting (for now). OpenVPN assumes records are sent - * unfragmented, and changing that will require thorough review and - * testing. Since OpenVPN is not susceptible to BEAST, we can just - * disable record splitting as a quick fix. */ -#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) - mbedtls_ssl_conf_cbc_record_splitting(ks_ssl->ssl_config, - MBEDTLS_SSL_CBC_RECORD_SPLITTING_DISABLED); -#endif /* MBEDTLS_SSL_CBC_RECORD_SPLITTING */ - /* Initialise authentication information */ (void)mbed_ok(mbedtls_ssl_conf_own_cert(ks_ssl->ssl_config, ssl_ctx->crt_chain, ssl_ctx->priv_key)); diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 30ef383..4d4a990 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -159,11 +159,8 @@ * Print debugging information on SSL/TLS session negotiation. */ -#ifndef INFO_CALLBACK_SSL_CONST -#define INFO_CALLBACK_SSL_CONST const -#endif static void -info_callback(INFO_CALLBACK_SSL_CONST SSL *s, int where, int ret) +info_callback(const SSL *s, int where, int ret) { if (where & SSL_CB_LOOP) { @@ -425,7 +422,6 @@ } } -#ifdef TLS1_3_VERSION static void convert_tls13_list_to_openssl(char *openssl_ciphers, size_t len, const char *ciphers) { @@ -449,7 +445,6 @@ } } } -#endif void tls_ctx_restrict_ciphers_tls13(struct tls_root_ctx *ctx, const char *ciphers) _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
