From e362bc1adda97cb50ac609d9843a6e4e7eb763e6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 1 Nov 2019 09:15:51 +0100
Subject: [PATCH] Use chacha20-ietf-poly1305 instead of chacha20 by default for
 shadowsocks

---
 .../luasrc/controller/openmptcprouter.lua                   | 6 +++---
 .../luasrc/view/openmptcprouter/wizard.htm                  | 4 ++--
 shadowsocks-libev/files/shadowsocks-libev.config            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 7b70da7c3..ba03ea382 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -419,8 +419,8 @@ function wizard_add()
 	elseif encryption == "aes-256-gcm" then
 		ucic:set("shadowsocks-libev","sss0","method","aes-256-gcm")
 		ucic:set("glorytun","vpn","chacha20","0")
-	elseif encryption == "chacha20" then
-		ucic:set("shadowsocks-libev","sss0","method","chacha20")
+	elseif encryption == "chacha20-ietf-poly1305" then
+		ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
 		ucic:set("glorytun","vpn","chacha20","1")
 	end
 
@@ -429,7 +429,7 @@ function wizard_add()
 	local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0"
 	if shadowsocks_key ~= "" then
 		ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key)
-		--ucic:set("shadowsocks-libev","sss0","method","chacha20")
+		--ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
 		--ucic:set("shadowsocks-libev","sss0","server_port","65101")
 		ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable)
 		ucic:save("shadowsocks-libev")
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index cc6fe3e42..112be0e6c 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -158,8 +158,8 @@ end
 			%>
 			<option value="none" <% if method == "none" then %>selected="selected"<% end %>><%:None%></option>
 			<option value="aes-256-gcm" <% if method == "aes-256-gcm" then %>selected="selected"<% end %>>AES-256-GCM</option>
-			<option value="chacha20" <% if method == "chacha20" then %>selected="selected"<% end %>>chacha20</option>
-			<option value="other" <% if method ~= "chacha20" and method ~= "aes-256-gcm" and method ~= "none" then %>selected="selected"<% end %>><%:other%></option>
+			<option value="chacha20-ietf-poly1305" <% if method == "chacha20" or method == "chacha20-ietf-poly1305" then %>selected="selected"<% end %>>chacha20</option>
+			<option value="other" <% if method ~= "chacha20" and method ~= "aes-256-gcm" and method ~= "chacha20-ietf-poly1305" and method ~= "none" then %>selected="selected"<% end %>><%:other%></option>
 		    </select>
 		    <br />
 		    <div class="cbi-value-description">
diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config
index eb6166f7c..01f3251a9 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.config
+++ b/shadowsocks-libev/files/shadowsocks-libev.config
@@ -38,7 +38,7 @@ config server 'sss0'
 	option server '192.168.1.3'
 	option server_port '65101'
 	option key ''
-	option method 'chacha20'
+	option method 'chacha20-ietf-poly1305'
 	option obfs 0
 
 config ss_tunnel 'dns'