mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Use chacha20-ietf-poly1305 instead of chacha20 by default for shadowsocks

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-11-01 09:15:51 +01:00
parent 0b87cb7b76
commit e362bc1add
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -419,8 +419,8 @@ function wizard_add()
elseif encryption == "aes-256-gcm" then elseif encryption == "aes-256-gcm" then
ucic:set("shadowsocks-libev","sss0","method","aes-256-gcm") ucic:set("shadowsocks-libev","sss0","method","aes-256-gcm")
ucic:set("glorytun","vpn","chacha20","0") ucic:set("glorytun","vpn","chacha20","0")
elseif encryption == "chacha20" then elseif encryption == "chacha20-ietf-poly1305" then
ucic:set("shadowsocks-libev","sss0","method","chacha20") ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
ucic:set("glorytun","vpn","chacha20","1") ucic:set("glorytun","vpn","chacha20","1")
end end
@ -429,7 +429,7 @@ function wizard_add()
local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0" local shadowsocks_disable = luci.http.formvalue("disableshadowsocks") or "0"
if shadowsocks_key ~= "" then if shadowsocks_key ~= "" then
ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key) 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","server_port","65101")
ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable) ucic:set("shadowsocks-libev","sss0","disabled",shadowsocks_disable)
ucic:save("shadowsocks-libev") ucic:save("shadowsocks-libev")

4
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -158,8 +158,8 @@ end
%> %>
<option value="none" <% if method == "none" then %>selected="selected"<% end %>><%:None%></option> <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="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="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 ~= "none" then %>selected="selected"<% end %>><%:other%></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> </select>
<br /> <br />
<div class="cbi-value-description"> <div class="cbi-value-description">

2
shadowsocks-libev/files/shadowsocks-libev.config
View file

@ -38,7 +38,7 @@ config server 'sss0'
option server '192.168.1.3' option server '192.168.1.3'
option server_port '65101' option server_port '65101'
option key '' option key ''
option method 'chacha20' option method 'chacha20-ietf-poly1305'
option obfs 0 option obfs 0
config ss_tunnel 'dns' config ss_tunnel 'dns'