From patchwork Tue Nov 17 17:55:58 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gert Doering X-Patchwork-Id: 5731 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:cb07:b0:37a:c59:1bbd with SMTP id nc7csp4962549dyb; Tue, 17 Nov 2026 09:56:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErHNEtga0xopp9b9LwCnRoVxfAb6I/qQDU9hU+lu5mIyOJegFXoWMA5ZE1t4lUWMnrOxFBVViXZs6Vg=@openvpn.net X-Received: by 2002:a05:6870:701e:b0:4a6:9884:df32 with SMTP id 586e51a60fabf-4afdf4088e8mr11674500fac.30.1794938201883; Tue, 17 Nov 2026 09:56:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794938201; cv=none; d=google.com; s=arc-20260327; b=nT7QDW+iptBRk72thAOpBY2po54ZakiD8FwXQKJ3xUbfHxhn/4+pdNgKnlra8ia15D AeF+uCH2BQ5BGLcDJcfM6OH5MHZ/4fELhDo34syNfNPWmLahHakhPJVGAEpRr2fuqKne 9jhL3LI8mEEJxJwvkHxYnlQoMRGvb/PClnoYjyRDgzqAkyriualbmVz5tR7B+mdbECKZ MgKHo7DCsCPbAS0UZbnAiV90YAVU0Wvq6zy9Jr+yb+htGy67MADQ5GY0668AE7e2mSc3 oQjcP6UU7C/Pmtp/2NQi9TlaZk8/Afri0Aypxru9k8nzlE0HNMHamZtoz2KZbIR7k8N7 rU3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature; bh=IWBRRSX2TC/jPluXmOKSyfwfiOj5HSk6Sv8dBnNKXDs=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=bN34eukngUxud1h6cwHMaRbYinVWNWDXq9nCiMYW+ec4zdqeS7MVggs1jfRV27lKT+ ao3wpq+aM7e13DLbepGBM5YXoMyFlKcZ0vzRgoFIzxLAx73tqDC2QQxGAQauRX7+u1DO chB9MmC36sNO8YAnfct1Hj811vN4/Eersb0IS/LSpl7L/qzPluzmzS0zNEGcj6rKuhXk vUrElwx2trcRsl6jonosfl8f+B1pQPE4iJwmmk/WllvLb2v/G3HWN0iO2DN+xZYbfmrI o8eQmA3vzst92j09e9TIOdXeLujDSoFkHx8r3NQw1Z6/OpK4gLpR1R/pVhFZbUEkWw/t fCTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=HfBMAUPs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=CBeub3WE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="mLo/leUz"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 586e51a60fabf-4b71071bf02si427743fac.382.2026.11.17.09.56.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Nov 2026 09:56:41 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=HfBMAUPs; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=CBeub3WE; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b="mLo/leUz"; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=muc.de DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=IWBRRSX2TC/jPluXmOKSyfwfiOj5HSk6Sv8dBnNKXDs=; b=HfBMAUPspOFF4/ U8dIXBX/RDQnVqwQFsPukzYHNFYrBAhun0ar5LFW8ELla05Us0NMXw/LEeh1EjLgtD1uUmm1Ko0+s ZO5CnQG9nVu4x7lzgTxFKAHbKPnErvvQG8JEGN6KhkGz1UddGxObEykpaQSHyqERe5EL3/6wdtOBA k38=; Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.100.1) (envelope-from ) id 1xTNQ8-000000006yW-2JZP; Tue, 17 Nov 2026 17:56:40 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.100.1) (envelope-from ) id 1xTNQ6-000000006vh-407F for openvpn-devel@lists.sourceforge.net; Tue, 17 Nov 2026 17:56:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Unsubscribe-Post:List-Subscribe:List-Post:List-Owner:List-Archive; bh=tXx6E4gMMzZqCi1R4tzDrvp6nVu9arxhk+yRdOMzg4U=; b=CBeub3WEknEI/cYf5td28rbsvA QUlEoxJ6ACU5ZNI1wxPc8OQsxwEVQJcfF+tMTHpXVdmBWPxjOany6TCtn8wrfhj2rkZkjRO1Ymfzk DBzSdRJu961o8lBIoxcm7A9+Z76pKPCBdxDYyzLZGK6Pl+0TNla2qDGn840lvwFfD3hc=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Unsubscribe-Post: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tXx6E4gMMzZqCi1R4tzDrvp6nVu9arxhk+yRdOMzg4U=; b=mLo/leUzq2K9eNFn9OkxtzCAA7 j7jbxpl92jN6LOv0aMMJb1apKt48MHCSlUcx6JZFnh4XUgRuwXCOWKqJTXqKWefdToyHF2B7P0Rop HWTpwcnQQp24aWfQVFfgF7Ndv0pCKibwR5QHmQ96LhC/0nhHnHGpdW66X7ogUn5vAh/k=; Received: from [193.149.48.129] (helo=blue.greenie.muc.de) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.100.1) id 1xTNPg-000000000ej-3ulj for openvpn-devel@lists.sourceforge.net; Tue, 17 Nov 2026 17:56:14 +0000 Received: from blue.greenie.muc.de (localhost [127.0.0.1]) by blue.greenie.muc.de (8.18.1/8.18.1) with ESMTP id 6AHHu6nO014972 for ; Tue, 17 Nov 2026 18:56:06 +0100 Received: (from gert@localhost) by blue.greenie.muc.de (8.18.2/8.18.1/Submit) id 6AHHu6Vd014971 for openvpn-devel@lists.sourceforge.net; Tue, 17 Nov 2026 18:56:06 +0100 From: Gert Doering To: openvpn-devel@lists.sourceforge.net Date: Tue, 17 Nov 2026 18:55:58 +0100 Message-ID: <20261117175605.14945-1-gert@greenie.muc.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Razvan Cojocaru - 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 [...] Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Headers-End: 1xTNPg-000000000ej-3ulj Subject: [Openvpn-devel] [PATCH v2] ssl: remove obsolete preprocessor guards X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1882129120013876076 X-GMAIL-MSGID: 1882129120013876076 From: Razvan Cojocaru - 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 Acked-by: Gert Doering 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 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)