From 59f3c772c59c57d5a2201fbfa709ca24e85b5f33 Mon Sep 17 00:00:00 2001
From: eguun <79050535+eguun@users.noreply.github.com>
Date: Thu, 2 Oct 2025 08:42:06 +0200
Subject: [PATCH] net/shadowsocks: update web UI ciphers to match shadowsocks
 rust (#4958)

Updating cipher option set to match the one of the plugin, source:
https://github.com/shadowsocks/shadowsocks-rust?tab=readme-ov-file#supported-ciphers
Update to present options in optgroups
---
 .../models/OPNsense/Shadowsocks/General.xml   | 33 ++++++++++++-------
 .../app/models/OPNsense/Shadowsocks/Local.xml | 33 ++++++++++++-------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
index b66a08112..9636f880e 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/General.xml
@@ -28,19 +28,30 @@
         </localport>
         <password type="TextField"/>
         <cipher type="OptionField">
-            <Default>aes-256-cfb</Default>
+            <Default>aes-256-gcm</Default>
             <Required>Y</Required>
             <OptionValues>
-                <aes-256-cfb>AES-256-CFB</aes-256-cfb>
-                <aes-256-gcm>AES-256-GCM</aes-256-gcm>
-                <aes-256-ctr>AES-256-CTR</aes-256-ctr>
-                <aes-192-cfb>AES-192-CFB</aes-192-cfb>
-                <aes-192-gcm>AES-192-GCM</aes-192-gcm>
-                <aes-192-ctr>AES-192-CTR</aes-192-ctr>
-                <aes-128-cfb>AES-128-CFB</aes-128-cfb>
-                <aes-128-gcm>AES-128-GCM</aes-128-gcm>
-                <aes-128-ctr>AES-128-CTR</aes-128-ctr>
-                <chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
+				<Secure>
+					<blake3-aes-256-gcm value="2022-blake3-aes-256-gcm">2022-BLAKE3-AES-256-GCM</blake3-aes-256-gcm>
+					<aes-256-gcm>AES-256-GCM</aes-256-gcm>
+					<blake3-aes-128-gcm value="2022-blake3-aes-128-gcm">2022-BLAKE3-AES-128-GCM</blake3-aes-128-gcm>
+					<aes-128-gcm>AES-128-GCM</aes-128-gcm>
+					<blake3-chacha20-poly1305 value="2022-blake3-chacha20-poly1305">2022-BLAKE3-ChaCha20-Poly1305</blake3-chacha20-poly1305>
+					<blake3-chacha8-poly1305 value="2022-blake3-chacha8-poly1305">2022-BLAKE3-ChaCha8-Poly1305</blake3-chacha8-poly1305>
+					<chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
+				</Secure>
+				<Deprecated>
+					<aes-256-cfb>AES-256-CFB</aes-256-cfb>
+					<aes-256-ctr>AES-256-CTR</aes-256-ctr>
+					<aes-192-cfb>AES-192-CFB</aes-192-cfb>
+					<aes-192-gcm>AES-192-GCM</aes-192-gcm>
+					<aes-192-ctr>AES-192-CTR</aes-192-ctr>
+					<aes-128-cfb>AES-128-CFB</aes-128-cfb>
+					<aes-128-ctr>AES-128-CTR</aes-128-ctr>
+				</Deprecated>				
+				<Insecure>				
+					<none>NONE (Plain)</none>
+				</Insecure>
             </OptionValues>
         </cipher>
         <tcpudpmode type="OptionField">
diff --git a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/Local.xml b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/Local.xml
index 00ab061c4..14ff6b74f 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/Local.xml
+++ b/net/shadowsocks/src/opnsense/mvc/app/models/OPNsense/Shadowsocks/Local.xml
@@ -33,19 +33,30 @@
         </localport>
         <password type="TextField"/>
         <cipher type="OptionField">
-            <Default>aes-256-cfb</Default>
+            <Default>aes-256-gcm</Default>
             <Required>Y</Required>
             <OptionValues>
-                <aes-256-cfb>AES-256-CFB</aes-256-cfb>
-                <aes-256-gcm>AES-256-GCM</aes-256-gcm>
-                <aes-256-ctr>AES-256-CTR</aes-256-ctr>
-                <aes-192-cfb>AES-192-CFB</aes-192-cfb>
-                <aes-192-gcm>AES-192-GCM</aes-192-gcm>
-                <aes-192-ctr>AES-192-CTR</aes-192-ctr>
-                <aes-128-cfb>AES-128-CFB</aes-128-cfb>
-                <aes-128-gcm>AES-128-GCM</aes-128-gcm>
-                <aes-128-ctr>AES-128-CTR</aes-128-ctr>
-                <chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
+				<Secure>
+					<blake3-aes-256-gcm value="2022-blake3-aes-256-gcm">2022-BLAKE3-AES-256-GCM</blake3-aes-256-gcm>
+					<aes-256-gcm>AES-256-GCM</aes-256-gcm>
+					<blake3-aes-128-gcm value="2022-blake3-aes-128-gcm">2022-BLAKE3-AES-128-GCM</blake3-aes-128-gcm>
+					<aes-128-gcm>AES-128-GCM</aes-128-gcm>
+					<blake3-chacha20-poly1305 value="2022-blake3-chacha20-poly1305">2022-BLAKE3-ChaCha20-Poly1305</blake3-chacha20-poly1305>
+					<blake3-chacha8-poly1305 value="2022-blake3-chacha8-poly1305">2022-BLAKE3-ChaCha8-Poly1305</blake3-chacha8-poly1305>
+					<chacha20-ietf-poly1305>ChaCha20-IETF-Poly1305</chacha20-ietf-poly1305>
+				</Secure>
+				<Deprecated>
+					<aes-256-cfb>AES-256-CFB</aes-256-cfb>
+					<aes-256-ctr>AES-256-CTR</aes-256-ctr>
+					<aes-192-cfb>AES-192-CFB</aes-192-cfb>
+					<aes-192-gcm>AES-192-GCM</aes-192-gcm>
+					<aes-192-ctr>AES-192-CTR</aes-192-ctr>
+					<aes-128-cfb>AES-128-CFB</aes-128-cfb>
+					<aes-128-ctr>AES-128-CTR</aes-128-ctr>
+				</Deprecated>				
+				<Insecure>				
+					<none>NONE (Plain)</none>
+				</Insecure>
             </OptionValues>
         </cipher>
     </items>