From 9ee2c2834dcae91ca7d8d0f6bac6357c42906c3f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 26 Aug 2025 11:09:59 +0200
Subject: [PATCH] net/shadowsocks: tweaks and fixes

---
 .../mvc/app/models/OPNsense/Shadowsocks/General.xml        | 7 ++-----
 .../opnsense/mvc/app/models/OPNsense/Shadowsocks/Local.xml | 7 ++-----
 .../mvc/app/views/OPNsense/Shadowsocks/general.volt        | 3 +--
 .../opnsense/mvc/app/views/OPNsense/Shadowsocks/local.volt | 3 +--
 4 files changed, 6 insertions(+), 14 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 af91c85a9..b66a08112 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
@@ -26,12 +26,9 @@
             <MaximumValue>65535</MaximumValue>
             <ValidationMessage>Please provide a valid port number between 1 and 65535.</ValidationMessage>
         </localport>
-        <password type="TextField">
-            <Default>password</Default>
-            <Required>N</Required>
-        </password>
+        <password type="TextField"/>
         <cipher type="OptionField">
-            <Default>AES-256-CFB</Default>
+            <Default>aes-256-cfb</Default>
             <Required>Y</Required>
             <OptionValues>
                 <aes-256-cfb>AES-256-CFB</aes-256-cfb>
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 1ea0e8817..00ab061c4 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
@@ -31,12 +31,9 @@
             <MaximumValue>65535</MaximumValue>
             <ValidationMessage>Please provide a valid port number between 1 and 65535.</ValidationMessage>
         </localport>
-        <password type="TextField">
-            <Default>password</Default>
-            <Required>N</Required>
-        </password>
+        <password type="TextField"/>
         <cipher type="OptionField">
-            <Default>AES-256-CFB</Default>
+            <Default>aes-256-cfb</Default>
             <Required>Y</Required>
             <OptionValues>
                 <aes-256-cfb>AES-256-CFB</aes-256-cfb>
diff --git a/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/general.volt b/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/general.volt
index b33849bf4..16a1d5e1c 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/general.volt
+++ b/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/general.volt
@@ -28,8 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #}
 <div class="content-box" style="padding-bottom: 1.5em;">
     {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
-    <div class="col-md-12">
-        <hr />
+    <div class="col-md-12 __mt">
         <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>
diff --git a/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/local.volt b/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/local.volt
index 7cbcca40e..cfa302019 100644
--- a/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/local.volt
+++ b/net/shadowsocks/src/opnsense/mvc/app/views/OPNsense/Shadowsocks/local.volt
@@ -28,8 +28,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #}
 <div class="content-box" style="padding-bottom: 1.5em;">
     {{ partial("layout_partials/base_form",['fields':localForm,'id':'frm_local_settings'])}}
-    <div class="col-md-12">
-        <hr />
+    <div class="col-md-12 __mt">
         <button class="btn btn-primary" id="saveAct" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_progress"></i></button>
     </div>
 </div>