Attention is currently required from: Arne Schwabe.
Hello Arne Schwabe,
I'd like you to do a code review.
Please visit
https://gerrit.openvpn.net/c/openvpn/+/2189?usp=email
to review the following change.
Change subject: ssl: remove obsolete preprocessor guards
......................................................................
ssl: remove obsolete preprocessor guards
- 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]>
---
M src/openvpn/ssl_mbedtls.c
M src/openvpn/ssl_openssl.c
2 files changed, 1 insertion(+), 15 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/89/2189/1
diff --git a/src/openvpn/ssl_mbedtls.c b/src/openvpn/ssl_mbedtls.c
index 43bb0ff..84e633c 100644
--- a/src/openvpn/ssl_mbedtls.c
+++ b/src/openvpn/ssl_mbedtls.c
@@ -897,15 +897,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 e190935..020d11f 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)
--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2189?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib645e0bf5c8941f4b1e14f13397794be15eab68f
Gerrit-Change-Number: 2189
Gerrit-PatchSet: 1
Gerrit-Owner: Răzvan Cojocaru <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: Arne Schwabe <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel