From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4cQLcB2LKwz2yVK for ; Mon, 15 Sep 2025 10:19:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "R13" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4cQLcB22Qcz2xQ9 for ; Mon, 15 Sep 2025 10:19:22 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [IPv6:2001:678:b28::161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4cQLc95xxZz38g for ; Mon, 15 Sep 2025 10:19:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1757931561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=jTbSyErqz0hUJM+dgiX9xTB4i1bN5TtJPr5961JSjSk=; b=dwAWCweO92qpYZaTEfxqy60Mv0BrNXGa5CsL4pRqox+XdRLnTRkQq2hAJWvC5YAmM34YnU isHL/hB5B3Wc4HBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1757931561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=jTbSyErqz0hUJM+dgiX9xTB4i1bN5TtJPr5961JSjSk=; b=Xh6WDMwEqmSF5uekfKc/q5lNgWQZX6PnMkOi0uZUj26KdYjAp0i9CwhOLwrUCj6p0Hw5dR 4renFDYuOr44ZhC4mzQwJvH5DfKSm1QcI/36ewS9mrXUrZK5NTomKWuBv1mFSHUh1mMeiH kQTB86qG+TP2/D8EC58TUBWi+9vLLMYk6tsMU2mZ/yKN5cFPOZIa9QAAL96JPgMkxp2zDC Jd4+72Oz8M0qUOrPHVBx87LQqbndz0k9sMwzbvQiWgGRF+lN/QvHtISAVJEoDn4QecrTfb KFRbRXEAuoY8SESHZSxuHbkkQJrluuDcExXZHO12vFfztEDYPTWPw80VlOZtYA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4cQLc916mqz2xZ2; Mon, 15 Sep 2025 10:19:21 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 0088442c56e8a623c25d1a93940eabd29e4d430b X-Git-Newrev: d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe Message-Id: <4cQLc916mqz2xZ2@people01.haj.ipfire.org> Date: Mon, 15 Sep 2025 10:19:21 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe (commit) from 0088442c56e8a623c25d1a93940eabd29e4d430b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d6ec7e0bf08a00c734c9e7b5f7c517ef82029afe Author: Michael Tremer Date: Mon Sep 15 12:17:01 2025 +0200 ovpnmain.cgi: Never write ncp-disable This was some compatibility code which was supposed to help us with the transition towards NCP. Since we are now on OpenVPN 2.6, this version no longer supports the "ncp-disable" switch and we cannot write it to the configuration any more. There should always be a default value for data ciphers. Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 2dc4ae18d..fef135aa2 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -306,9 +306,7 @@ sub writeserverconf { print CONF "status $RW_STATUS 30\n"; # Cryptography - if ($vpnsettings{'DATACIPHERS'} eq '') { - print CONF "ncp-disable\n"; - } else { + if ($vpnsettings{'DATACIPHERS'} ne '') { print CONF "data-ciphers " . $vpnsettings{'DATACIPHERS'} =~ s/\|/:/gr . "\n"; } hooks/post-receive -- IPFire 2.x development tree