Update CHANGES and bump version

Add plugin CLI arguments support

.github/issue_template.md

@@ -1,19 +1,20 @@
-Please read Wiki carefully, especially https://github.com/shadowsocks/shadowsocks-windows/wiki/Troubleshooting.
-Please answer these questions before submitting your issue. Thanks!
+Please read Wiki carefully, especially / 提问前请先阅读wiki https://github.com/shadowsocks/shadowsocks-windows/wiki/Troubleshooting.
+Or search from issue board / 或在issue board中搜索 https://github.com/shadowsocks/shadowsocks-windows/issues?utf8=%E2%9C%93&q=is%3Aissue
+Please answer these questions before submitting your issue. Thanks! / 请按照以下格式描述你的问题
 
-### Version(release version or AppVeyor link)
+### Version(release version or AppVeyor link) / 版本（正式版或基于AppVeyor的链接）
 
 
-### Environment(Operating system, .NET Framework, etc)
+### Environment(Operating system, .NET Framework, etc) / 操作环境（操作系统，.NET Framework等）
 
 
-### Steps you have tried
+### Steps you have tried / 操作步骤
 
 
-### What did you expect to see?
+### What did you expect to see? / 期望的结果
 
 
-### What did you see instead?
+### What did you see instead? / 实际结果
 
 
-### Config and error log in detail (with all sensitive info masked)
+### Config and error log in detail (with all sensitive info masked) / 配置文件和日志文件（请隐去敏感信息）

CHANGES

@@ -1,3 +1,22 @@
+4.0.10 2018-05-10
+- Add square bracket for SIP002 IPv6 (RFC3986)
+- Add plugin CLI arguments support
+- Bug fix: Server address should not be encoded (#1758)
+- Bug fix: Wrong splash on multi display (#1729)
+- Fix PerPixelAlphaForm's issue in disigner
+- Other minor bug fixes and improvements
+
+4.0.9 2018-03-14
+- Fix port occupied issue
+- Add xchacha20-ietf-poly1305
+- Update cryptographic libraries
+- Bug fixes and improvements
+
+4.0.8 2018-02-16
+- Add OpenSSL 1.1.0g support #1671
+- Update nuget packages
+- Bug fixes and improvements
+
 4.0.7 2017-12-09
 - Fix QR code and ss:// protocol import issue
 - Add an option to show password

OPENSSL-GUIDE

@@ -0,0 +1,15 @@
+OpenSSL library guide for VS2017
+
+# Read NOTES.WIN and NOTES.PERL
+
+# use Visual Studio native tools command prompt
+# use activeperl, install NASM assembler
+ppm install dmake
+
+# Win32 x86
+set PATH=D:\NASM-32;%PATH%
+perl Configure VC-WIN32 --release --prefix=C:\Users\home\Downloads\openssl-1.1.0g\x86-build --openssldir=C:\Users\home\Downloads\openssl-1.1.0g\x86-install
+nmake
+nmake test
+# to rebuild
+nmake distclean

README.md

@@ -17,11 +17,11 @@ Shadowsocks for Windows
 
 #### Download
 
-Download the [latest release].
+Download the latest release from [release page].
 
 #### Requirements
 
-Microsoft [.NET Framework 4.6.2] or higher. 
+Microsoft [.NET Framework 4.6.2] or higher, Microsoft [Visual C++ 2015 Redistributable] (x86) .
 
 #### Basic
 
@@ -63,7 +63,7 @@ copy Shadowsocks to a new directory and choose a different local port.
 
 If you would like to connect to server via a plugin, please set the plugin's
 path (relative or absolute) on Edit Servers form.
-Note: Forward Proxy will not be used while a plugin is enabled.
+_Note_: Forward Proxy will not be used while a plugin is enabled.
 
 #### Global hotkeys
 
@@ -100,21 +100,42 @@ if you want to deactivate all, please clear all textboxes.
 
 Please visit [Servers] for more information.
 
-#### Develop
+#### Development
 
-[Visual Studio 2015] & [.NET Framework 4.6.2 Developer Pack] are required.
+1. [Visual Studio 2015] & [.NET Framework 4.6.2 Developer Pack] are required.
+2. It is recommended to share your idea on the Issue Board before you start to work,
+especially for feature development.
 
 #### License
 
-GPLv3
+[GPLv3]
+
+#### Open Source Components / Libraries
+
+```
+Caseless.Fody (MIT)    https://github.com/Fody/Caseless
+Costura.Fody (MIT)     https://github.com/Fody/Costura
+Fody (MIT)             https://github.com/Fody/Fody
+GlobalHotKey (GPLv3)   https://github.com/kirmir/GlobalHotKey
+Newtonsoft.Json (MIT)  https://www.newtonsoft.com/json
+StringEx.CS ()         https://github.com/LazyMode/StringEx
+ZXing.Net (Apache 2.0) https://github.com/micjahn/ZXing.Net
+
+libsscrypto (GPLv2)    https://github.com/shadowsocks/libsscrypto
+Privoxy (GPLv2)        https://www.privoxy.org
+Sysproxy ()            https://github.com/Noisyfox/sysproxy
+```
 
 
-[Appveyor]:       https://ci.appveyor.com/project/celeron533/shadowsocks-windows
-[Build Status]:   https://ci.appveyor.com/api/projects/status/tfw57q6eecippsl5/branch/master?svg=true
-[latest release]: https://github.com/shadowsocks/shadowsocks-csharp/releases
-[GFWList]:        https://github.com/gfwlist/gfwlist
-[Servers]:        https://github.com/shadowsocks/shadowsocks/wiki/Ports-and-Clients#linux--server-side
-[中文说明]:       https://github.com/shadowsocks/shadowsocks-windows/wiki/Shadowsocks-Windows-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
+
+[Appveyor]:     https://ci.appveyor.com/project/celeron533/shadowsocks-windows
+[Build Status]: https://ci.appveyor.com/api/projects/status/tfw57q6eecippsl5/branch/master?svg=true
+[release page]: https://github.com/shadowsocks/shadowsocks-csharp/releases
+[GFWList]:      https://github.com/gfwlist/gfwlist
+[Servers]:      https://github.com/shadowsocks/shadowsocks/wiki/Ports-and-Clients#linux--server-side
+[中文说明]:     https://github.com/shadowsocks/shadowsocks-windows/wiki/Shadowsocks-Windows-%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E
+[Visual Studio 2015]:   https://www.visualstudio.com/downloads/
 [.NET Framework 4.6.2]: https://www.microsoft.com/en-US/download/details.aspx?id=53344
-[Visual Studio 2015]: https://www.visualstudio.com/downloads/
 [.NET Framework 4.6.2 Developer Pack]: https://www.microsoft.com/download/details.aspx?id=53321
+[Visual C++ 2015 Redistributable]:     https://www.microsoft.com/en-us/download/details.aspx?id=53840
+[GPLv3]:        https://github.com/shadowsocks/shadowsocks-windows/blob/master/LICENSE.txt

shadowsocks-csharp/Controller/Service/GfwListUpdater.cs

@@ -36,52 +36,52 @@ namespace Shadowsocks.Controller
             try
             {
                 File.WriteAllText(Utils.GetTempPath("gfwlist.txt"), e.Result, Encoding.UTF8);
-                List<string> lines = ParseResult(e.Result);
-                if (File.Exists(PACServer.USER_RULE_FILE))
-                {
-                    string local = FileManager.NonExclusiveReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
-                    using (var sr = new StringReader(local))
-                    {
-                        foreach (var rule in sr.NonWhiteSpaceLines())
-                        {
-                            if (rule.BeginWithAny(IgnoredLineBegins))
-                                continue;
-                            lines.Add(rule);
-                        }
-                    }
-                }
-                string abpContent;
-                if (File.Exists(PACServer.USER_ABP_FILE))
-                {
-                    abpContent = FileManager.NonExclusiveReadAllText(PACServer.USER_ABP_FILE, Encoding.UTF8);
-                }
-                else
-                {
-                    abpContent = Utils.UnGzip(Resources.abp_js);
-                }
-                abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
-                if (File.Exists(PACServer.PAC_FILE))
-                {
-                    string original = FileManager.NonExclusiveReadAllText(PACServer.PAC_FILE, Encoding.UTF8);
-                    if (original == abpContent)
-                    {
-                        UpdateCompleted(this, new ResultEventArgs(false));
-                        return;
-                    }
-                }
-                File.WriteAllText(PACServer.PAC_FILE, abpContent, Encoding.UTF8);
-                if (UpdateCompleted != null)
-                {
-                    UpdateCompleted(this, new ResultEventArgs(true));
-                }
+                bool pacFileChanged = MergeAndWritePACFile(e.Result);
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(pacFileChanged));
             }
             catch (Exception ex)
             {
-                if (Error != null)
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+        }
+
+        public static bool MergeAndWritePACFile(string gfwListResult)
+        {
+            List<string> lines = new List<string>();
+            if (File.Exists(PACServer.USER_RULE_FILE))
+            {
+                string local = FileManager.NonExclusiveReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
+                using (var sr = new StringReader(local))
                 {
-                    Error(this, new ErrorEventArgs(ex));
+                    foreach (var rule in sr.NonWhiteSpaceLines())
+                    {
+                        if (rule.BeginWithAny(IgnoredLineBegins))
+                            continue;
+                        lines.Add(rule);
+                    }
                 }
             }
+            lines.AddRange(ParseResult(gfwListResult));
+            string abpContent;
+            if (File.Exists(PACServer.USER_ABP_FILE))
+            {
+                abpContent = FileManager.NonExclusiveReadAllText(PACServer.USER_ABP_FILE, Encoding.UTF8);
+            }
+            else
+            {
+                abpContent = Utils.UnGzip(Resources.abp_js);
+            }
+            abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
+            if (File.Exists(PACServer.PAC_FILE))
+            {
+                string original = FileManager.NonExclusiveReadAllText(PACServer.PAC_FILE, Encoding.UTF8);
+                if (original == abpContent)
+                {
+                    return false;
+                }
+            }
+            File.WriteAllText(PACServer.PAC_FILE, abpContent, Encoding.UTF8);
+            return true;
         }
 
         public void UpdatePACFromGFWList(Configuration config)

shadowsocks-csharp/Controller/Service/Listener.cs

@@ -85,6 +85,7 @@ namespace Shadowsocks.Controller
 
                 // Start an asynchronous socket to listen for connections.
                 Logging.Info("Shadowsocks started");
+                Logging.Info(Encryption.EncryptorFactory.DumpRegisteredEncryptor());
                 _tcpSocket.BeginAccept(new AsyncCallback(AcceptCallback), _tcpSocket);
                 UDPState udpState = new UDPState();
                 udpState.socket = _udpSocket;
@@ -202,6 +203,7 @@ namespace Shadowsocks.Controller
             try
             {
                 int bytesRead = conn.EndReceive(ar);
+                if (bytesRead <= 0) goto Shutdown;
                 foreach (IService service in _services)
                 {
                     if (service.Handle(buf, bytesRead, conn, null))
@@ -209,6 +211,7 @@ namespace Shadowsocks.Controller
                         return;
                     }
                 }
+                Shutdown:
                 // no service found for this
                 if (conn.ProtocolType == ProtocolType.Tcp)
                 {

shadowsocks-csharp/Controller/Service/PACServer.cs

@@ -9,6 +9,7 @@ using Shadowsocks.Encryption;
 using Shadowsocks.Model;
 using Shadowsocks.Properties;
 using Shadowsocks.Util;
+using System.Threading.Tasks;
 
 namespace Shadowsocks.Controller
 {
@@ -241,42 +242,34 @@ Connection: Close
         #region FileSystemWatcher.OnChanged()
         // FileSystemWatcher Changed event is raised twice
         // http://stackoverflow.com/questions/1764809/filesystemwatcher-changed-event-is-raised-twice
-        private static Hashtable fileChangedTime = new Hashtable();
-
+        // Add a short delay to avoid raise event twice in a short period
         private void PACFileWatcher_Changed(object sender, FileSystemEventArgs e)
         {
-            string path = e.FullPath.ToString();
-            string currentLastWriteTime = File.GetLastWriteTime(e.FullPath).ToString(CultureInfo.InvariantCulture);
-
-            // if there is no path info stored yet or stored path has different time of write then the one now is inspected
-            if (!fileChangedTime.ContainsKey(path) || fileChangedTime[path].ToString() != currentLastWriteTime)
+            if (PACFileChanged != null)
             {
-                if (PACFileChanged != null)
+                Logging.Info($"Detected: PAC file '{e.Name}' was {e.ChangeType.ToString().ToLower()}.");
+                Task.Factory.StartNew(() =>
                 {
-                    Logging.Info($"Detected: PAC file '{e.Name}' was {e.ChangeType.ToString().ToLower()}.");
+                    ((FileSystemWatcher)sender).EnableRaisingEvents = false;
+                    System.Threading.Thread.Sleep(10);
                     PACFileChanged(this, new EventArgs());
-                }
-
-                // lastly we update the last write time in the hashtable
-                fileChangedTime[path] = currentLastWriteTime;
+                    ((FileSystemWatcher)sender).EnableRaisingEvents = true;
+                });
             }
         }
 
         private void UserRuleFileWatcher_Changed(object sender, FileSystemEventArgs e)
         {
-            string path = e.FullPath.ToString();
-            string currentLastWriteTime = File.GetLastWriteTime(e.FullPath).ToString(CultureInfo.InvariantCulture);
-
-            // if there is no path info stored yet or stored path has different time of write then the one now is inspected
-            if (!fileChangedTime.ContainsKey(path) || fileChangedTime[path].ToString() != currentLastWriteTime)
+            if (UserRuleFileChanged != null)
             {
-                if (UserRuleFileChanged != null)
+                Logging.Info($"Detected: User Rule file '{e.Name}' was {e.ChangeType.ToString().ToLower()}.");
+                Task.Factory.StartNew(()=>
                 {
-                    Logging.Info($"Detected: User Rule file '{e.Name}' was {e.ChangeType.ToString().ToLower()}.");
+                    ((FileSystemWatcher)sender).EnableRaisingEvents = false;
+                    System.Threading.Thread.Sleep(10);
                     UserRuleFileChanged(this, new EventArgs());
-                }
-                // lastly we update the last write time in the hashtable
-                fileChangedTime[path] = currentLastWriteTime;
+                    ((FileSystemWatcher)sender).EnableRaisingEvents = true;
+                });
             }
         }
         #endregion

shadowsocks-csharp/Controller/Service/Sip003Plugin.cs

@@ -33,17 +33,17 @@ namespace Shadowsocks.Controller.Service
                 return null;
             }
 
-            return new Sip003Plugin(server.plugin, server.plugin_opts, server.server, server.server_port);
+            return new Sip003Plugin(server.plugin, server.plugin_opts, server.plugin_args, server.server, server.server_port);
         }
 
-        private Sip003Plugin(string plugin, string pluginOpts, string serverAddress, int serverPort)
+        private Sip003Plugin(string plugin, string pluginOpts, string pluginArgs, string serverAddress, int serverPort)
         {
             if (plugin == null) throw new ArgumentNullException(nameof(plugin));
             if (string.IsNullOrWhiteSpace(serverAddress))
             {
                 throw new ArgumentException("Value cannot be null or whitespace.", nameof(serverAddress));
             }
-            if ((ushort)serverPort != serverPort)
+            if (serverPort <= 0 || serverPort > 65535)
             {
                 throw new ArgumentOutOfRangeException("serverPort");
             }
@@ -55,6 +55,7 @@ namespace Shadowsocks.Controller.Service
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = plugin,
+                    Arguments = pluginArgs,
                     UseShellExecute = false,
                     CreateNoWindow = true,
                     ErrorDialog = false,

shadowsocks-csharp/Controller/Service/UpdateChecker.cs

@@ -24,7 +24,7 @@ namespace Shadowsocks.Controller
         public string LatestVersionLocalName;
         public event EventHandler CheckUpdateCompleted;
 
-        public const string Version = "4.0.7";
+        public const string Version = "4.0.10";
 
         private class CheckUpdateTimer : System.Timers.Timer
         {

shadowsocks-csharp/Controller/ShadowsocksController.cs

@@ -240,19 +240,9 @@ namespace Shadowsocks.Controller
             }
         }
 
-        public void DisableProxy()
+        public void SaveProxy(ProxyConfig proxyConfig)
         {
-            _config.proxy.useProxy = false;
-            SaveConfig(_config);
-        }
-
-        public void EnableProxy(int type, string proxy, int port, int timeout)
-        {
-            _config.proxy.useProxy = true;
-            _config.proxy.proxyType = type;
-            _config.proxy.proxyServer = proxy;
-            _config.proxy.proxyPort = port;
-            _config.proxy.proxyTimeout = timeout;
+            _config.proxy = proxyConfig;
             SaveConfig(_config);
         }
 
@@ -363,7 +353,7 @@ namespace Shadowsocks.Controller
                 url = string.Format(
                     "{0}@{1}:{2}/?plugin={3}",
                     websafeBase64,
-                    HttpUtility.UrlEncode(server.server, Encoding.UTF8),
+                    server.FormatHostName(server.server),
                     server.server_port,
                     HttpUtility.UrlEncode(pluginPart, Encoding.UTF8));
             }
@@ -490,8 +480,6 @@ namespace Shadowsocks.Controller
 
         protected void Reload()
         {
-            StopPlugins();
-
             Encryption.RNG.Reload();
             // some logic in configuration updated the config when saving, we need to read it again
             _config = Configuration.Load();
@@ -521,6 +509,9 @@ namespace Shadowsocks.Controller
             {
                 _listener.Stop();
             }
+
+            StopPlugins();
+
             // don't put PrivoxyRunner.Start() before pacServer.Stop()
             // or bind will fail when switching bind address from 0.0.0.0 to 127.0.0.1
             // though UseShellExecute is set to true now
@@ -534,7 +525,7 @@ namespace Shadowsocks.Controller
                     strategy.ReloadServers();
                 }
 
-                StartPlugins();
+                StartPlugin();
                 privoxyRunner.Start(_config);
 
                 TCPRelay tcpRelay = new TCPRelay(this, _config);
@@ -572,13 +563,10 @@ namespace Shadowsocks.Controller
             Utils.ReleaseMemory(true);
         }
 
-        private void StartPlugins()
+        private void StartPlugin()
         {
-            foreach (var server in _config.configs)
-            {
-                // Early start plugin processes
-                GetPluginLocalEndPointIfConfigured(server);
-            }
+            var server = _config.GetCurrentServer();
+            GetPluginLocalEndPointIfConfigured(server);
         }
 
         protected void SaveConfig(Configuration newConfig)
@@ -612,46 +600,14 @@ namespace Shadowsocks.Controller
         private static readonly IEnumerable<char> IgnoredLineBegins = new[] { '!', '[' };
         private void pacServer_UserRuleFileChanged(object sender, EventArgs e)
         {
-            // TODO: this is a dirty hack. (from code GListUpdater.http_DownloadStringCompleted())
             if (!File.Exists(Utils.GetTempPath("gfwlist.txt")))
             {
                 UpdatePACFromGFWList();
-                return;
-            }
-            List<string> lines = new List<string>();
-            if (File.Exists(PACServer.USER_RULE_FILE))
-            {
-                string local = FileManager.NonExclusiveReadAllText(PACServer.USER_RULE_FILE, Encoding.UTF8);
-                using (var sr = new StringReader(local))
-                {
-                    foreach (var rule in sr.NonWhiteSpaceLines())
-                    {
-                        if (rule.BeginWithAny(IgnoredLineBegins))
-                            continue;
-                        lines.Add(rule);
-                    }
-                }
-            }
-            lines.AddRange(GFWListUpdater.ParseResult(FileManager.NonExclusiveReadAllText(Utils.GetTempPath("gfwlist.txt"))));
-            string abpContent;
-            if (File.Exists(PACServer.USER_ABP_FILE))
-            {
-                abpContent = FileManager.NonExclusiveReadAllText(PACServer.USER_ABP_FILE, Encoding.UTF8);
             }
             else
             {
-                abpContent = Utils.UnGzip(Resources.abp_js);
+                GFWListUpdater.MergeAndWritePACFile(FileManager.NonExclusiveReadAllText(Utils.GetTempPath("gfwlist.txt")));
             }
-            abpContent = abpContent.Replace("__RULES__", JsonConvert.SerializeObject(lines, Formatting.Indented));
-            if (File.Exists(PACServer.PAC_FILE))
-            {
-                string original = FileManager.NonExclusiveReadAllText(PACServer.PAC_FILE, Encoding.UTF8);
-                if (original == abpContent)
-                {
-                    return;
-                }
-            }
-            File.WriteAllText(PACServer.PAC_FILE, abpContent, Encoding.UTF8);
         }
 
         public void CopyPacUrl()

shadowsocks-csharp/Data/ja.txt

@@ -13,7 +13,7 @@ Edit Servers...=サーバーの編集...
 Statistics Config...=統計情報の設定...
 Start on Boot=システムと同時に起動
 Forward Proxy...=フォワードプロキシの設定...
-Allow Clients from LAN=LAN からのアクセスを許可
+Allow other Devices to connect=他のデバイスからの接続を許可する
 Local PAC=ローカル PAC
 Online PAC=オンライン PAC
 Edit Local PAC File...=ローカル PAC ファイルの編集...
@@ -51,8 +51,9 @@ Server Port=サーバーポート
 Password=パスワード
 Show Password=パスワードを表示する
 Encryption=暗号化
-Plugin=プラグイン
+Plugin Program=プラグインプログラム
 Plugin Options=プラグインのオプション
+Plugin Arguments=プラグインの引数
 Proxy Port=プロキシポート
 Remarks=付記
 Timeout(Sec)=タイムアウト (秒)

shadowsocks-csharp/Data/zh_CN.txt

@@ -13,7 +13,7 @@ Edit Servers...=编辑服务器...
 Statistics Config...=统计配置...
 Start on Boot=开机启动
 Forward Proxy...=正向代理设置...
-Allow Clients from LAN=允许来自局域网的连接
+Allow other Devices to connect=允许其他设备连入
 Local PAC=使用本地 PAC
 Online PAC=使用在线 PAC
 Edit Local PAC File...=编辑本地 PAC 文件...
@@ -51,8 +51,9 @@ Server Port=服务器端口
 Password=密码
 Show Password=显示密码
 Encryption=加密
-Plugin=插件
+Plugin Program=插件程序
 Plugin Options=插件选项
+Plugin Arguments=插件参数
 Proxy Port=代理端口
 Remarks=备注
 Timeout(Sec)=超时(秒)

shadowsocks-csharp/Data/zh_TW.txt

@@ -13,7 +13,7 @@ Edit Servers...=編輯伺服器...
 Statistics Config...=統計設定檔...
 Start on Boot=開機啟動
 Forward Proxy...=正向 Proxy 設定...
-Allow Clients from LAN=允許來自區域網路的連線
+Allow other Devices to connect=允許其他裝置連入
 Local PAC=使用本機 PAC
 Online PAC=使用線上 PAC
 Edit Local PAC File...=編輯本機 PAC 檔案...
@@ -51,8 +51,9 @@ Server Port=伺服器連接埠
 Password=密碼
 Show Password=顯示密碼
 Encryption=加密
-Plugin=插件
-Plugin Options=插件選項
+Plugin Program=外掛程式
+Plugin Options=外掛程式選項
+Plugin Arguments=外掛程式參數
 Proxy Port=Proxy 連接埠
 Remarks=註解
 Timeout(Sec)=逾時 (秒)
@@ -69,7 +70,7 @@ Use Proxy=使用 Proxy
 Proxy Type=Proxy 類型
 Proxy Addr=Proxy 位址
 Proxy Port=Proxy 連接埠
-If server has a plugin, proxy will not be used=若伺服器含有插件，Proxy 將不被使用
+If server has a plugin, proxy will not be used=若伺服器含有外掛程式，Proxy 將不被使用
 
 # Log Form
 

shadowsocks-csharp/Encryption/AEAD/AEADEncryptor.cs

@@ -127,9 +127,9 @@ namespace Shadowsocks.Encryption.AEAD
 
         public static void randBytes(byte[] buf, int length) { RNG.GetBytes(buf, length); }
 
-        public abstract int cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen);
+        public abstract void cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen);
 
-        public abstract int cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen);
+        public abstract void cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen);
 
         #region TCP
 

shadowsocks-csharp/Encryption/AEAD/AEADMbedTLSEncryptor.cs

@@ -19,7 +19,7 @@ namespace Shadowsocks.Encryption.AEAD
         {
         }
 
-        private static Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
+        private static readonly Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
         {
             {"aes-128-gcm", new EncryptorInfo("AES-128-GCM", 16, 16, 12, 16, CIPHER_AES)},
             {"aes-192-gcm", new EncryptorInfo("AES-192-GCM", 24, 24, 12, 16, CIPHER_AES)},
@@ -48,6 +48,7 @@ namespace Shadowsocks.Encryption.AEAD
             {
                 _decryptCtx = ctx;
             }
+
             MbedTLS.cipher_init(ctx);
             if (MbedTLS.cipher_setup(ctx, MbedTLS.cipher_info_from_string(_innerLibName)) != 0)
                 throw new System.Exception("Cannot initialize mbed TLS cipher context");
@@ -67,7 +68,7 @@ namespace Shadowsocks.Encryption.AEAD
             if (ret != 0) throw new System.Exception("failed to finish preparation");
         }
 
-        public override int cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen)
+        public override void cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen)
         {
             // buf: all plaintext
             // outbuf: ciphertext + tag
@@ -87,18 +88,18 @@ namespace Shadowsocks.Encryption.AEAD
                         /* cipher */
                         ciphertext, ref olen,
                         tagbuf, (uint) tagLen);
-                    if (ret != 0) throw new CryptoErrorException();
+                    if (ret != 0) throw new CryptoErrorException(String.Format("ret is {0}", ret));
                     Debug.Assert(olen == plen);
                     // attach tag to ciphertext
                     Array.Copy(tagbuf, 0, ciphertext, (int) plen, tagLen);
                     clen = olen + (uint) tagLen;
-                    return ret;
+                    break;
                 default:
                     throw new System.Exception("not implemented");
             }
         }
 
-        public override int cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen)
+        public override void cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen)
         {
             // buf: ciphertext + tag
             // outbuf: plaintext
@@ -116,10 +117,10 @@ namespace Shadowsocks.Encryption.AEAD
                         ciphertext, (uint) (clen - tagLen),
                         plaintext, ref olen,
                         tagbuf, (uint) tagLen);
-                    if (ret != 0) throw new CryptoErrorException();
+                    if (ret != 0) throw new CryptoErrorException(String.Format("ret is {0}", ret));
                     Debug.Assert(olen == clen - tagLen);
                     plen = olen;
-                    return ret;
+                    break;
                 default:
                     throw new System.Exception("not implemented");
             }
@@ -163,6 +164,7 @@ namespace Shadowsocks.Encryption.AEAD
                 Marshal.FreeHGlobal(_encryptCtx);
                 _encryptCtx = IntPtr.Zero;
             }
+
             if (_decryptCtx != IntPtr.Zero)
             {
                 MbedTLS.cipher_free(_decryptCtx);

shadowsocks-csharp/Encryption/AEAD/AEADOpenSSLEncryptor.cs

@@ -0,0 +1,192 @@
+using System;
+using System.Collections.Generic;
+using Shadowsocks.Encryption.Exception;
+
+namespace Shadowsocks.Encryption.AEAD
+{
+    public class AEADOpenSSLEncryptor
+        : AEADEncryptor, IDisposable
+    {
+        const int CIPHER_AES = 1;
+        const int CIPHER_CHACHA20IETFPOLY1305 = 2;
+
+        private byte[] _opensslEncSubkey;
+        private byte[] _opensslDecSubkey;
+
+        private IntPtr _encryptCtx = IntPtr.Zero;
+        private IntPtr _decryptCtx = IntPtr.Zero;
+
+        private IntPtr _cipherInfoPtr = IntPtr.Zero;
+
+        public AEADOpenSSLEncryptor(string method, string password)
+            : base(method, password)
+        {
+            _opensslEncSubkey = new byte[keyLen];
+            _opensslDecSubkey = new byte[keyLen];
+        }
+
+        private static readonly Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
+        {
+            {"aes-128-gcm", new EncryptorInfo("aes-128-gcm", 16, 16, 12, 16, CIPHER_AES)},
+            {"aes-192-gcm", new EncryptorInfo("aes-192-gcm", 24, 24, 12, 16, CIPHER_AES)},
+            {"aes-256-gcm", new EncryptorInfo("aes-256-gcm", 32, 32, 12, 16, CIPHER_AES)},
+            {"chacha20-ietf-poly1305", new EncryptorInfo("chacha20-poly1305", 32, 32, 12, 16, CIPHER_CHACHA20IETFPOLY1305)}
+        };
+
+        public static List<string> SupportedCiphers()
+        {
+            return new List<string>(_ciphers.Keys);
+        }
+
+        protected override Dictionary<string, EncryptorInfo> getCiphers()
+        {
+            return _ciphers;
+        }
+
+        public override void InitCipher(byte[] salt, bool isEncrypt, bool isUdp)
+        {
+            base.InitCipher(salt, isEncrypt, isUdp);
+            _cipherInfoPtr = OpenSSL.GetCipherInfo(_innerLibName);
+            if (_cipherInfoPtr == IntPtr.Zero) throw new System.Exception("openssl: cipher not found");
+            IntPtr ctx = OpenSSL.EVP_CIPHER_CTX_new();
+            if (ctx == IntPtr.Zero) throw new System.Exception("openssl: fail to create ctx");
+
+            if (isEncrypt)
+            {
+                _encryptCtx = ctx;
+            }
+            else
+            {
+                _decryptCtx = ctx;
+            }
+
+            DeriveSessionKey(isEncrypt ? _encryptSalt : _decryptSalt, _Masterkey,
+                isEncrypt ? _opensslEncSubkey : _opensslDecSubkey);
+
+            var ret = OpenSSL.EVP_CipherInit_ex(ctx, _cipherInfoPtr, IntPtr.Zero, null, null,
+                isEncrypt ? OpenSSL.OPENSSL_ENCRYPT : OpenSSL.OPENSSL_DECRYPT);
+            if (ret != 1) throw new System.Exception("openssl: fail to init ctx");
+
+            ret = OpenSSL.EVP_CIPHER_CTX_set_key_length(ctx, keyLen);
+            if (ret != 1) throw new System.Exception("openssl: fail to set key length");
+
+            ret = OpenSSL.EVP_CIPHER_CTX_ctrl(ctx, OpenSSL.EVP_CTRL_AEAD_SET_IVLEN,
+                nonceLen, IntPtr.Zero);
+            if (ret != 1) throw new System.Exception("openssl: fail to set AEAD nonce length");
+
+            ret = OpenSSL.EVP_CipherInit_ex(ctx, IntPtr.Zero, IntPtr.Zero,
+                isEncrypt ? _opensslEncSubkey : _opensslDecSubkey,
+                null,
+                isEncrypt ? OpenSSL.OPENSSL_ENCRYPT : OpenSSL.OPENSSL_DECRYPT);
+            if (ret != 1) throw new System.Exception("openssl: cannot set key");
+            OpenSSL.EVP_CIPHER_CTX_set_padding(ctx, 0);
+        }
+
+        public override void cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen)
+        {
+            OpenSSL.SetCtxNonce(_encryptCtx, _encNonce, true);
+            // buf: all plaintext
+            // outbuf: ciphertext + tag
+            int ret;
+            int tmpLen = 0;
+            clen = 0;
+            var tagBuf = new byte[tagLen];
+
+            ret = OpenSSL.EVP_CipherUpdate(_encryptCtx, ciphertext, out tmpLen,
+                plaintext, (int) plen);
+            if (ret != 1) throw new CryptoErrorException("openssl: fail to encrypt AEAD");
+            clen += (uint) tmpLen;
+            // For AEAD cipher, it should not output anything
+            ret = OpenSSL.EVP_CipherFinal_ex(_encryptCtx, ciphertext, ref tmpLen);
+            if (ret != 1) throw new CryptoErrorException("openssl: fail to finalize AEAD");
+            if (tmpLen > 0)
+            {
+                throw new System.Exception("openssl: fail to finish AEAD");
+            }
+
+            OpenSSL.AEADGetTag(_encryptCtx, tagBuf, tagLen);
+            Array.Copy(tagBuf, 0, ciphertext, clen, tagLen);
+            clen += (uint) tagLen;
+        }
+
+        public override void cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen)
+        {
+            OpenSSL.SetCtxNonce(_decryptCtx, _decNonce, false);
+            // buf: ciphertext + tag
+            // outbuf: plaintext
+            int ret;
+            int tmpLen = 0;
+            plen = 0;
+
+            // split tag
+            byte[] tagbuf = new byte[tagLen];
+            Array.Copy(ciphertext, (int) (clen - tagLen), tagbuf, 0, tagLen);
+            OpenSSL.AEADSetTag(_decryptCtx, tagbuf, tagLen);
+
+            ret = OpenSSL.EVP_CipherUpdate(_decryptCtx,
+                plaintext, out tmpLen, ciphertext, (int) (clen - tagLen));
+            if (ret != 1) throw new CryptoErrorException("openssl: fail to decrypt AEAD");
+            plen += (uint) tmpLen;
+
+            // For AEAD cipher, it should not output anything
+            ret = OpenSSL.EVP_CipherFinal_ex(_decryptCtx, plaintext, ref tmpLen);
+            if (ret <= 0)
+            {
+                // If this is not successful authenticated
+                throw new CryptoErrorException(String.Format("ret is {0}", ret));
+            }
+
+            if (tmpLen > 0)
+            {
+                throw new System.Exception("openssl: fail to finish AEAD");
+            }
+        }
+
+        #region IDisposable
+
+        private bool _disposed;
+
+        // instance based lock
+        private readonly object _lock = new object();
+
+        public override void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~AEADOpenSSLEncryptor()
+        {
+            Dispose(false);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_lock)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
+
+            if (disposing)
+            {
+                // free managed objects
+            }
+
+            // free unmanaged objects
+            if (_encryptCtx != IntPtr.Zero)
+            {
+                OpenSSL.EVP_CIPHER_CTX_free(_encryptCtx);
+                _encryptCtx = IntPtr.Zero;
+            }
+
+            if (_decryptCtx != IntPtr.Zero)
+            {
+                OpenSSL.EVP_CIPHER_CTX_free(_decryptCtx);
+                _decryptCtx = IntPtr.Zero;
+            }
+        }
+
+        #endregion
+    }
+}

shadowsocks-csharp/Encryption/AEAD/AEADSodiumEncryptor.cs

@@ -10,7 +10,8 @@ namespace Shadowsocks.Encryption.AEAD
         : AEADEncryptor, IDisposable
     {
         private const int CIPHER_CHACHA20IETFPOLY1305 = 1;
-        private const int CIPHER_AES256GCM = 2;
+        private const int CIPHER_XCHACHA20IETFPOLY1305 = 2;
+        private const int CIPHER_AES256GCM = 3;
 
         private byte[] _sodiumEncSubkey;
         private byte[] _sodiumDecSubkey;
@@ -22,9 +23,10 @@ namespace Shadowsocks.Encryption.AEAD
             _sodiumDecSubkey = new byte[keyLen];
         }
 
-        private static Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
+        private static readonly Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
         {
             {"chacha20-ietf-poly1305", new EncryptorInfo(32, 32, 12, 16, CIPHER_CHACHA20IETFPOLY1305)},
+            {"xchacha20-ietf-poly1305", new EncryptorInfo(32, 32, 24, 16, CIPHER_XCHACHA20IETFPOLY1305)},
             {"aes-256-gcm", new EncryptorInfo(32, 32, 12, 16, CIPHER_AES256GCM)},
         };
 
@@ -46,7 +48,7 @@ namespace Shadowsocks.Encryption.AEAD
         }
 
 
-        public override int cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen)
+        public override void cipherEncrypt(byte[] plaintext, uint plen, byte[] ciphertext, ref uint clen)
         {
             Debug.Assert(_sodiumEncSubkey != null);
             // buf: all plaintext
@@ -65,6 +67,13 @@ namespace Shadowsocks.Encryption.AEAD
                         null, _encNonce,
                         _sodiumEncSubkey);
                     break;
+                case CIPHER_XCHACHA20IETFPOLY1305:
+                    ret = Sodium.crypto_aead_xchacha20poly1305_ietf_encrypt(ciphertext, ref encClen,
+                        plaintext, (ulong)plen,
+                        null, 0,
+                        null, _encNonce,
+                        _sodiumEncSubkey);
+                    break;
                 case CIPHER_AES256GCM:
                     ret = Sodium.crypto_aead_aes256gcm_encrypt(ciphertext, ref encClen,
                         plaintext, (ulong)plen,
@@ -75,13 +84,12 @@ namespace Shadowsocks.Encryption.AEAD
                 default:
                     throw new System.Exception("not implemented");
             }
-            if (ret != 0) throw new CryptoErrorException();
+            if (ret != 0) throw new CryptoErrorException(String.Format("ret is {0}", ret));
             Logging.Dump("after cipherEncrypt: cipher", ciphertext, (int) encClen);
             clen = (uint) encClen;
-            return ret;
         }
 
-        public override int cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen)
+        public override void cipherDecrypt(byte[] ciphertext, uint clen, byte[] plaintext, ref uint plen)
         {
             Debug.Assert(_sodiumDecSubkey != null);
             // buf: ciphertext + tag
@@ -100,6 +108,13 @@ namespace Shadowsocks.Encryption.AEAD
                         null, 0,
                         _decNonce, _sodiumDecSubkey);
                     break;
+                case CIPHER_XCHACHA20IETFPOLY1305:
+                    ret = Sodium.crypto_aead_xchacha20poly1305_ietf_decrypt(plaintext, ref decPlen,
+                        null,
+                        ciphertext, (ulong)clen,
+                        null, 0,
+                        _decNonce, _sodiumDecSubkey);
+                    break;
                 case CIPHER_AES256GCM:
                     ret = Sodium.crypto_aead_aes256gcm_decrypt(plaintext, ref decPlen,
                         null,
@@ -111,10 +126,9 @@ namespace Shadowsocks.Encryption.AEAD
                     throw new System.Exception("not implemented");
             }
 
-            if (ret != 0) throw new CryptoErrorException();
+            if (ret != 0) throw new CryptoErrorException(String.Format("ret is {0}", ret));
             Logging.Dump("after cipherDecrypt: plain", plaintext, (int) decPlen);
             plen = (uint) decPlen;
-            return ret;
         }
 
         public override void Dispose()

shadowsocks-csharp/Encryption/EncryptorFactory.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Text;
 using Shadowsocks.Encryption.AEAD;
 using Shadowsocks.Encryption.Stream;
 
@@ -26,21 +27,42 @@ namespace Shadowsocks.Encryption
                 AEADSodiumEncryptorSupportedCiphers.Remove("aes-256-gcm");
             }
 
-            foreach (string method in StreamMbedTLSEncryptor.SupportedCiphers())
+            // XXX: sequence matters, OpenSSL > Sodium > MbedTLS
+            foreach (string method in StreamOpenSSLEncryptor.SupportedCiphers())
             {
-                _registeredEncryptors.Add(method, typeof(StreamMbedTLSEncryptor));
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(StreamOpenSSLEncryptor));
             }
+
             foreach (string method in StreamSodiumEncryptor.SupportedCiphers())
             {
-                _registeredEncryptors.Add(method, typeof(StreamSodiumEncryptor));
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(StreamSodiumEncryptor));
             }
-            foreach (string method in AEADMbedTLSEncryptorSupportedCiphers)
+
+            foreach (string method in StreamMbedTLSEncryptor.SupportedCiphers())
             {
-                _registeredEncryptors.Add(method, typeof(AEADMbedTLSEncryptor));
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(StreamMbedTLSEncryptor));
             }
+
+
+            foreach (string method in AEADOpenSSLEncryptor.SupportedCiphers())
+            {
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(AEADOpenSSLEncryptor));
+            }
+
             foreach (string method in AEADSodiumEncryptorSupportedCiphers)
             {
-                _registeredEncryptors.Add(method, typeof(AEADSodiumEncryptor));
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(AEADSodiumEncryptor));
+            }
+
+            foreach (string method in AEADMbedTLSEncryptorSupportedCiphers)
+            {
+                if (!_registeredEncryptors.ContainsKey(method))
+                    _registeredEncryptors.Add(method, typeof(AEADMbedTLSEncryptor));
             }
         }
 
@@ -50,12 +72,29 @@ namespace Shadowsocks.Encryption
             {
                 method = "aes-256-cfb";
             }
+
             method = method.ToLowerInvariant();
             Type t = _registeredEncryptors[method];
+
             ConstructorInfo c = t.GetConstructor(ConstructorTypes);
             if (c == null) throw new System.Exception("Invalid ctor");
             IEncryptor result = (IEncryptor) c.Invoke(new object[] {method, password});
             return result;
         }
+
+        public static string DumpRegisteredEncryptor()
+        {
+            var sb = new StringBuilder();
+            sb.Append(Environment.NewLine);
+            sb.AppendLine("=========================");
+            sb.AppendLine("Registered Encryptor Info");
+            foreach (var encryptor in _registeredEncryptors)
+            {
+                sb.AppendLine(String.Format("{0}=>{1}", encryptor.Key, encryptor.Value.Name));
+            }
+
+            sb.AppendLine("=========================");
+            return sb.ToString();
+        }
     }
 }

shadowsocks-csharp/Encryption/MbedTLS.cs

@@ -34,7 +34,8 @@ namespace Shadowsocks.Encryption
         public static byte[] MD5(byte[] input)
         {
             byte[] output = new byte[16];
-            md5(input, (uint) input.Length, output);
+            if (md5_ret(input, (uint) input.Length, output) != 0)
+                throw new System.Exception("mbedtls: MD5 failure");
             return output;
         }
 
@@ -42,7 +43,7 @@ namespace Shadowsocks.Encryption
         private static extern IntPtr LoadLibrary(string path);
 
         [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void md5(byte[] input, uint ilen, byte[] output);
+        public static extern int md5_ret(byte[] input, uint ilen, byte[] output);
 
         /// <summary>
         /// Get cipher ctx size for unmanaged memory allocation

shadowsocks-csharp/Encryption/OpenSSL.cs

@@ -0,0 +1,161 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+using Shadowsocks.Controller;
+using Shadowsocks.Encryption.Exception;
+using Shadowsocks.Properties;
+using Shadowsocks.Util;
+
+namespace Shadowsocks.Encryption
+{
+    // XXX: only for OpenSSL 1.1.0 and higher
+    public static class OpenSSL
+    {
+        private const string DLLNAME = "libsscrypto.dll";
+
+        public const int OPENSSL_ENCRYPT = 1;
+        public const int OPENSSL_DECRYPT = 0;
+
+        public const int EVP_CTRL_AEAD_SET_IVLEN = 0x9;
+        public const int EVP_CTRL_AEAD_GET_TAG = 0x10;
+        public const int EVP_CTRL_AEAD_SET_TAG = 0x11;
+
+        static OpenSSL()
+        {
+            string dllPath = Utils.GetTempPath(DLLNAME);
+            try
+            {
+                FileManager.UncompressFile(dllPath, Resources.libsscrypto_dll);
+            }
+            catch (IOException)
+            {
+            }
+            catch (System.Exception e)
+            {
+                Logging.LogUsefulException(e);
+            }
+            LoadLibrary(dllPath);
+        }
+
+        public static IntPtr GetCipherInfo(string cipherName)
+        {
+            var name = Encoding.ASCII.GetBytes(cipherName);
+            Array.Resize(ref name, name.Length + 1);
+            return EVP_get_cipherbyname(name);
+        }
+
+        /// <summary>
+        /// Need init cipher context after EVP_CipherFinal_ex to reuse context
+        /// </summary>
+        /// <param name="ctx"></param>
+        /// <param name="cipherType"></param>
+        /// <param name="nonce"></param>
+        public static void SetCtxNonce(IntPtr ctx, byte[] nonce, bool isEncrypt)
+        {
+            var ret = EVP_CipherInit_ex(ctx, IntPtr.Zero,
+                IntPtr.Zero, null,
+                nonce,
+                isEncrypt ? OPENSSL_ENCRYPT : OPENSSL_DECRYPT);
+            if (ret != 1) throw new System.Exception("openssl: fail to set AEAD nonce");
+        }
+
+        public static void AEADGetTag(IntPtr ctx, byte[] tagbuf, int taglen)
+        {
+            IntPtr tagBufIntPtr = IntPtr.Zero;
+            try
+            {
+                tagBufIntPtr = Marshal.AllocHGlobal(taglen);
+                var ret = EVP_CIPHER_CTX_ctrl(ctx,
+                    EVP_CTRL_AEAD_GET_TAG, taglen, tagBufIntPtr);
+                if (ret != 1) throw new CryptoErrorException("openssl: fail to get AEAD tag");
+                // take tag from unmanaged memory
+                Marshal.Copy(tagBufIntPtr, tagbuf, 0, taglen);
+            }
+            finally
+            {
+                if (tagBufIntPtr != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(tagBufIntPtr);
+                }
+            }
+        }
+
+        public static void AEADSetTag(IntPtr ctx, byte[] tagbuf, int taglen)
+        {
+            IntPtr tagBufIntPtr = IntPtr.Zero;
+            try
+            {
+                // allocate unmanaged memory for tag
+                tagBufIntPtr = Marshal.AllocHGlobal(taglen);
+
+                // copy tag to unmanaged memory
+                Marshal.Copy(tagbuf, 0, tagBufIntPtr, taglen);
+
+                var ret = EVP_CIPHER_CTX_ctrl(ctx,
+                    EVP_CTRL_AEAD_SET_TAG, taglen, tagBufIntPtr);
+
+                if (ret != 1) throw new CryptoErrorException("openssl: fail to set AEAD tag");
+
+            }
+            finally
+            {
+                if (tagBufIntPtr != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(tagBufIntPtr);
+                }
+            }
+        }
+
+        [DllImport("Kernel32.dll")]
+        private static extern IntPtr LoadLibrary(string path);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr EVP_CIPHER_CTX_new();
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void EVP_CIPHER_CTX_free(IntPtr ctx);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CIPHER_CTX_reset(IntPtr ctx);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CipherInit_ex(IntPtr ctx, IntPtr type,
+            IntPtr impl, byte[] key, byte[] iv, int enc);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CipherUpdate(IntPtr ctx, byte[] outb,
+            out int outl, byte[] inb, int inl);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CipherFinal_ex(IntPtr ctx, byte[] outm, ref int outl);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CIPHER_CTX_set_padding(IntPtr x, int padding);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CIPHER_CTX_set_key_length(IntPtr x, int keylen);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int EVP_CIPHER_CTX_ctrl(IntPtr ctx, int type, int arg, IntPtr ptr);
+
+        /// <summary>
+        /// simulate NUL-terminated string
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr EVP_get_cipherbyname(byte[] name);
+    }
+}

shadowsocks-csharp/Encryption/Sodium.cs

@@ -73,6 +73,14 @@ namespace Shadowsocks.Encryption
         public static extern int crypto_aead_chacha20poly1305_ietf_decrypt(byte[] m, ref ulong mlen_p,
             byte[] nsec, byte[] c, ulong clen, byte[] ad, ulong adlen, byte[] npub, byte[] k);
 
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int crypto_aead_xchacha20poly1305_ietf_encrypt(byte[] c, ref ulong clen_p, byte[] m, ulong mlen,
+            byte[] ad, ulong adlen, byte[] nsec, byte[] npub, byte[] k);
+
+        [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
+        public static extern int crypto_aead_xchacha20poly1305_ietf_decrypt(byte[] m, ref ulong mlen_p, byte[] nsec, byte[] c,
+            ulong clen, byte[] ad, ulong adlen, byte[] npub, byte[] k);
+
         [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)]
         public static extern int crypto_aead_aes256gcm_encrypt(byte[] c, ref ulong clen_p, byte[] m, ulong mlen,
             byte[] ad, ulong adlen, byte[] nsec, byte[] npub, byte[] k);

shadowsocks-csharp/Encryption/Stream/StreamOpenSSLEncryptor.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Shadowsocks.Encryption.Exception;
+
+
+namespace Shadowsocks.Encryption.Stream
+{
+    public class StreamOpenSSLEncryptor
+        : StreamEncryptor, IDisposable
+    {
+        const int CIPHER_RC4 = 1;
+        const int CIPHER_AES = 2;
+        const int CIPHER_CAMELLIA = 3;
+        const int CIPHER_BLOWFISH = 4;
+        const int CIPHER_CHACHA20_IETF = 5;
+
+        private IntPtr _encryptCtx = IntPtr.Zero;
+        private IntPtr _decryptCtx = IntPtr.Zero;
+
+        public StreamOpenSSLEncryptor(string method, string password)
+            : base(method, password)
+        {
+        }
+
+        // XXX: name=RC4,blkSz=1,keyLen=16,ivLen=0, do NOT pass IV to it
+        private static readonly Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo>
+        {
+            { "aes-128-cfb", new EncryptorInfo("AES-128-CFB", 16, 16, CIPHER_AES) },
+            { "aes-192-cfb", new EncryptorInfo("AES-192-CFB", 24, 16, CIPHER_AES) },
+            { "aes-256-cfb", new EncryptorInfo("AES-256-CFB", 32, 16, CIPHER_AES) },
+            { "aes-128-ctr", new EncryptorInfo("aes-128-ctr", 16, 16, CIPHER_AES) },
+            { "aes-192-ctr", new EncryptorInfo("aes-192-ctr", 24, 16, CIPHER_AES) },
+            { "aes-256-ctr", new EncryptorInfo("aes-256-ctr", 32, 16, CIPHER_AES) },
+            { "bf-cfb", new EncryptorInfo("bf-cfb", 16, 8, CIPHER_BLOWFISH) },
+            { "camellia-128-cfb", new EncryptorInfo("CAMELLIA-128-CFB", 16, 16, CIPHER_CAMELLIA) },
+            { "camellia-192-cfb", new EncryptorInfo("CAMELLIA-192-CFB", 24, 16, CIPHER_CAMELLIA) },
+            { "camellia-256-cfb", new EncryptorInfo("CAMELLIA-256-CFB", 32, 16, CIPHER_CAMELLIA) },
+            { "rc4-md5", new EncryptorInfo("RC4", 16, 16, CIPHER_RC4) },
+            // it's using ivLen=16, not compatible
+            //{ "chacha20-ietf", new EncryptorInfo("chacha20", 32, 12, CIPHER_CHACHA20_IETF) }
+        };
+
+        public static List<string> SupportedCiphers()
+        {
+            return new List<string>(_ciphers.Keys);
+        }
+
+        protected override Dictionary<string, EncryptorInfo> getCiphers()
+        {
+            return _ciphers;
+        }
+
+        protected override void initCipher(byte[] iv, bool isEncrypt)
+        {
+            base.initCipher(iv, isEncrypt);
+            IntPtr cipherInfo = OpenSSL.GetCipherInfo(_innerLibName);
+            if (cipherInfo == IntPtr.Zero) throw new System.Exception("openssl: cipher not found");
+            IntPtr ctx = OpenSSL.EVP_CIPHER_CTX_new();
+            if (ctx == IntPtr.Zero) throw new System.Exception("fail to create ctx");
+            
+            if (isEncrypt)
+            {
+                _encryptCtx = ctx;
+            }
+            else
+            {
+                _decryptCtx = ctx;
+            }
+
+            byte[] realkey;
+            if (_method == "rc4-md5")
+            {
+                byte[] temp = new byte[keyLen + ivLen];
+                realkey = new byte[keyLen];
+                Array.Copy(_key, 0, temp, 0, keyLen);
+                Array.Copy(iv, 0, temp, keyLen, ivLen);
+                realkey = MbedTLS.MD5(temp);
+            }
+            else
+            {
+                realkey = _key;
+            }
+            
+            var ret = OpenSSL.EVP_CipherInit_ex(ctx, cipherInfo, IntPtr.Zero, null,null,
+                isEncrypt ? OpenSSL.OPENSSL_ENCRYPT : OpenSSL.OPENSSL_DECRYPT);
+            if (ret != 1) throw new System.Exception("openssl: fail to set key length");
+            ret = OpenSSL.EVP_CIPHER_CTX_set_key_length(ctx, keyLen);
+            if (ret != 1) throw new System.Exception("openssl: fail to set key length");
+            ret = OpenSSL.EVP_CipherInit_ex(ctx, IntPtr.Zero, IntPtr.Zero, realkey,
+                _method == "rc4-md5" ? null : iv,
+                isEncrypt ? OpenSSL.OPENSSL_ENCRYPT : OpenSSL.OPENSSL_DECRYPT);
+            if (ret != 1) throw new System.Exception("openssl: cannot set key and iv");
+            OpenSSL.EVP_CIPHER_CTX_set_padding(ctx, 0);
+        }
+
+        protected override void cipherUpdate(bool isEncrypt, int length, byte[] buf, byte[] outbuf)
+        {
+            // C# could be multi-threaded
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(this.ToString());
+            }
+
+            int outlen = 0;
+            var ret = OpenSSL.EVP_CipherUpdate(isEncrypt ? _encryptCtx : _decryptCtx,
+                outbuf, out outlen, buf, length);
+            if (ret != 1)
+                throw new CryptoErrorException(String.Format("ret is {0}", ret));
+            Debug.Assert(outlen == length);
+        }
+
+        #region IDisposable
+
+        private bool _disposed;
+
+        // instance based lock
+        private readonly object _lock = new object();
+
+        public override void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~StreamOpenSSLEncryptor()
+        {
+            Dispose(false);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_lock)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
+
+            if (disposing)
+            {
+                // free managed objects
+            }
+
+            // free unmanaged objects
+            if (_encryptCtx != IntPtr.Zero)
+            {
+                OpenSSL.EVP_CIPHER_CTX_free(_encryptCtx);
+                _encryptCtx = IntPtr.Zero;
+            }
+
+            if (_decryptCtx != IntPtr.Zero)
+            {
+                OpenSSL.EVP_CIPHER_CTX_free(_decryptCtx);
+                _decryptCtx = IntPtr.Zero;
+            }
+        }
+
+        #endregion
+    }
+}

shadowsocks-csharp/Encryption/Stream/StreamSodiumEncryptor.cs

@@ -27,7 +27,7 @@ namespace Shadowsocks.Encryption.Stream
             _decryptBuf = new byte[MAX_INPUT_SIZE + SODIUM_BLOCK_SIZE];
         }
 
-        private static Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo> {
+        private static readonly Dictionary<string, EncryptorInfo> _ciphers = new Dictionary<string, EncryptorInfo> {
             { "salsa20", new EncryptorInfo(32, 8, CIPHER_SALSA20) },
             { "chacha20", new EncryptorInfo(32, 8, CIPHER_CHACHA20) },
             { "chacha20-ietf", new EncryptorInfo(32, 12, CIPHER_CHACHA20_IETF) }

shadowsocks-csharp/Model/Server.cs

@@ -26,6 +26,7 @@ namespace Shadowsocks.Model
         public string method;
         public string plugin;
         public string plugin_opts;
+        public string plugin_args;
         public string remarks;
         public int timeout;
 
@@ -46,25 +47,25 @@ namespace Shadowsocks.Model
             {
                 return I18N.GetString("New server");
             }
-            string serverStr;
-            // CheckHostName() won't do a real DNS lookup
-            var hostType = Uri.CheckHostName(server);
 
-            switch (hostType)
-            {
-                case UriHostNameType.IPv6:
-                    serverStr = $"[{server}]:{server_port}";
-                    break;
-                default:
-                    // IPv4 and domain name
-                    serverStr = $"{server}:{server_port}";
-                    break;
-            }
+            string serverStr = $"{FormatHostName(server)}:{server_port}";
             return remarks.IsNullOrEmpty()
                 ? serverStr
                 : $"{remarks} ({serverStr})";
         }
 
+        public string FormatHostName(string hostName)
+        {
+            // CheckHostName() won't do a real DNS lookup
+            switch (Uri.CheckHostName(hostName))
+            {
+                case UriHostNameType.IPv6:  // Add square bracket when IPv6 (RFC3986)
+                    return $"[{hostName}]";
+                default:    // IPv4 or domain name
+                    return hostName;
+            }
+        }
+
         public Server()
         {
             server = "";
@@ -72,6 +73,7 @@ namespace Shadowsocks.Model
             method = "aes-256-cfb";
             plugin = "";
             plugin_opts = "";
+            plugin_args = "";
             password = "";
             remarks = "";
             timeout = DefaultServerTimeoutSec;
@@ -141,7 +143,7 @@ namespace Shadowsocks.Model
                     Server server = new Server
                     {
                         remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                        server = parsedUrl.GetComponents(UriComponents.Host, UriFormat.Unescaped),
+                        server = parsedUrl.IdnHost,
                         server_port = parsedUrl.Port,
                     };
 

shadowsocks-csharp/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Shadowsocks")]
-[assembly: AssemblyCopyright("clowwindy & community 2017")]
+[assembly: AssemblyCopyright("clowwindy & community 2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

shadowsocks-csharp/Properties/Resources.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,13 +13,13 @@ namespace Shadowsocks.Properties {
     
     
     /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -33,7 +33,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   返回此类使用的缓存的 ResourceManager 实例。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   使用此强类型资源类，为所有资源查找
+        ///   重写当前线程的 CurrentUICulture 属性。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] abp_js {
             get {
@@ -71,28 +71,28 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # translation for Japanese
+        ///   查找类似 # translation for Japanese
         ///
         ///Shadowsocks=Shadowsocks
         ///
         ///# Menu items
         ///
-        ///Enable System Proxy=システムの代理を有効にする
+        ///Enable System Proxy=システム プロキシを有効にする
         ///Mode=モード
         ///PAC=PAC
         ///Global=全般
-        ///Servers=サーバ
-        ///Edit Servers...=サーバーを編集する...
+        ///Servers=サーバー
+        ///Edit Servers...=サーバーの編集...
         ///Statistics Config...=統計情報の設定...
         ///Start on Boot=システムと同時に起動
-        ///Forward Proxy...=代理を転送する...
-        ///Allow Clients from LAN=LANからのクライアントを許可する
+        ///Forward Proxy...=フォワードプロキシの設定...
+        ///Allow Clients from LAN=LAN からのアクセスを許可
         ///Local PAC=ローカル PAC
         ///Online PAC=オンライン PAC
-        ///Edit Local PAC File...=ローカル PAC ファイルを編集する...
-        ///Update Local PAC from GFWList=GFWList から、ローカル PACを更新する
-        ///Edit User Rule for GFWList...=利用者規則を編集する...
-        ///Secure Local [rest of string was truncated]&quot;;.
+        ///Edit Local PAC File...=ローカル PAC ファイルの編集...
+        ///Update Local PAC from GFWList=GFWList からローカル PAC を更新
+        ///Edit User Rule for GFWList...=ユーザールールの編集...
+        ///Secure Local  [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string ja {
             get {
@@ -101,7 +101,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] libsscrypto_dll {
             get {
@@ -111,7 +111,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] mgwz_dll {
             get {
@@ -121,14 +121,14 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
+        ///   查找类似 listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
         ///toggle 0
         ///logfile ss_privoxy.log
         ///show-on-task-bar 0
         ///activity-animation 0
         ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
         ///hide-console
-        ///.
+        /// 的本地化字符串。
         /// </summary>
         internal static string privoxy_conf {
             get {
@@ -137,7 +137,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] privoxy_exe {
             get {
@@ -147,7 +147,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] proxy_pac_txt {
             get {
@@ -157,7 +157,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ss16 {
             get {
@@ -167,7 +167,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ss20 {
             get {
@@ -177,7 +177,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ss24 {
             get {
@@ -187,7 +187,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ssIn24 {
             get {
@@ -197,7 +197,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ssOut24 {
             get {
@@ -207,7 +207,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
         internal static System.Drawing.Bitmap ssw128 {
             get {
@@ -217,7 +217,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] sysproxy_exe {
             get {
@@ -227,7 +227,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
         internal static byte[] sysproxy64_exe {
             get {
@@ -237,9 +237,9 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ! Put user rules line by line in this file.
+        ///   查找类似 ! Put user rules line by line in this file.
         ///! See https://adblockplus.org/en/filter-cheatsheet
-        ///.
+        /// 的本地化字符串。
         /// </summary>
         internal static string user_rule {
             get {
@@ -248,7 +248,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # translation for Simplified Chinese
+        ///   查找类似 # translation for Simplified Chinese
         ///
         ///Shadowsocks=Shadowsocks
         ///
@@ -270,7 +270,7 @@ namespace Shadowsocks.Properties {
         ///Update Local PAC from GFWList=从 GFWList 更新本地 PAC
         ///Edit User Rule for GFWList...=编辑 GFWList 的用户规则...
         ///Secure Local PAC=保护本地 PAC
-        ///Cop [rest of string was truncated]&quot;;.
+        ///Cop [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string zh_CN {
             get {
@@ -279,7 +279,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to # translation for Traditional Chinese
+        ///   查找类似 # translation for Traditional Chinese
         ///
         ///Shadowsocks=Shadowsocks
         ///
@@ -300,7 +300,7 @@ namespace Shadowsocks.Properties {
         ///Edit Local PAC File...=編輯本機 PAC 檔案...
         ///Update Local PAC from GFWList=從 GFWList 更新本機 PAC
         ///Edit User Rule for GFWList...=編輯 GFWList 的使用者規則...
-        ///Secure Local PAC=安全本機 [rest of string was truncated]&quot;;.
+        ///Secure Local PAC=安全本機 [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string zh_TW {
             get {

shadowsocks-csharp/Properties/Resources.resx

@@ -125,7 +125,7 @@
     <value>..\Data\ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="libsscrypto_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\data\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

shadowsocks-csharp/Util/SystemProxy/Sysproxy.cs

@@ -60,7 +60,7 @@ namespace Shadowsocks.Util.SystemProxy
             if (enable)
             {
                 arguments = global
-                    ? $"global {proxyServer} <local>;localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;172.32.*;192.168.*"
+                    ? $"global {proxyServer} <local>;localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*"
                     : $"pac {pacURL}";
             }
             else

shadowsocks-csharp/View/ConfigForm.Designer.cs

@@ -28,11 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.PluginOptionsLabel = new System.Windows.Forms.Label();
             this.PluginTextBox = new System.Windows.Forms.TextBox();
             this.RemarksTextBox = new System.Windows.Forms.TextBox();
-            this.RemarksLabel = new System.Windows.Forms.Label();
             this.IPLabel = new System.Windows.Forms.Label();
             this.ServerPortLabel = new System.Windows.Forms.Label();
             this.PasswordLabel = new System.Windows.Forms.Label();
@@ -46,6 +46,9 @@
             this.PluginLabel = new System.Windows.Forms.Label();
             this.PluginOptionsTextBox = new System.Windows.Forms.TextBox();
             this.ShowPasswdCheckBox = new System.Windows.Forms.CheckBox();
+            this.RemarksLabel = new System.Windows.Forms.Label();
+            this.PluginArgumentsTextBox = new System.Windows.Forms.TextBox();
+            this.PluginArgumentsLabel = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.OKButton = new System.Windows.Forms.Button();
             this.MyCancelButton = new System.Windows.Forms.Button();
@@ -63,6 +66,7 @@
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
             this.DuplicateButton = new System.Windows.Forms.Button();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
             this.tableLayoutPanel1.SuspendLayout();
             this.ServerGroupBox.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
@@ -81,8 +85,7 @@
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel1.Controls.Add(this.PluginOptionsLabel, 0, 6);
             this.tableLayoutPanel1.Controls.Add(this.PluginTextBox, 1, 5);
-            this.tableLayoutPanel1.Controls.Add(this.RemarksTextBox, 1, 8);
-            this.tableLayoutPanel1.Controls.Add(this.RemarksLabel, 0, 8);
+            this.tableLayoutPanel1.Controls.Add(this.RemarksTextBox, 1, 9);
             this.tableLayoutPanel1.Controls.Add(this.IPLabel, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.ServerPortLabel, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.PasswordLabel, 0, 2);
@@ -91,16 +94,19 @@
             this.tableLayoutPanel1.Controls.Add(this.PasswordTextBox, 1, 2);
             this.tableLayoutPanel1.Controls.Add(this.EncryptionLabel, 0, 4);
             this.tableLayoutPanel1.Controls.Add(this.EncryptionSelect, 1, 4);
-            this.tableLayoutPanel1.Controls.Add(this.TimeoutLabel, 0, 9);
-            this.tableLayoutPanel1.Controls.Add(this.TimeoutTextBox, 1, 9);
+            this.tableLayoutPanel1.Controls.Add(this.TimeoutLabel, 0, 10);
+            this.tableLayoutPanel1.Controls.Add(this.TimeoutTextBox, 1, 10);
             this.tableLayoutPanel1.Controls.Add(this.PluginLabel, 0, 5);
             this.tableLayoutPanel1.Controls.Add(this.PluginOptionsTextBox, 1, 6);
             this.tableLayoutPanel1.Controls.Add(this.ShowPasswdCheckBox, 1, 3);
+            this.tableLayoutPanel1.Controls.Add(this.PluginArgumentsTextBox, 1, 7);
+            this.tableLayoutPanel1.Controls.Add(this.PluginArgumentsLabel, 0, 7);
+            this.tableLayoutPanel1.Controls.Add(this.RemarksLabel, 0, 9);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 21);
             this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(3);
-            this.tableLayoutPanel1.RowCount = 10;
+            this.tableLayoutPanel1.RowCount = 11;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -111,54 +117,46 @@
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(267, 243);
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(279, 270);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // PluginOptionsLabel
             // 
             this.PluginOptionsLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.PluginOptionsLabel.AutoSize = true;
-            this.PluginOptionsLabel.Location = new System.Drawing.Point(6, 166);
+            this.PluginOptionsLabel.Location = new System.Drawing.Point(18, 166);
             this.PluginOptionsLabel.Name = "PluginOptionsLabel";
             this.PluginOptionsLabel.Size = new System.Drawing.Size(89, 12);
-            this.PluginOptionsLabel.TabIndex = 15;
+            this.PluginOptionsLabel.TabIndex = 6;
             this.PluginOptionsLabel.Text = "Plugin Options";
+            this.toolTip1.SetToolTip(this.PluginOptionsLabel, "Environment variables");
             // 
             // PluginTextBox
             // 
             this.PluginTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.PluginTextBox.Location = new System.Drawing.Point(101, 135);
+            this.PluginTextBox.Location = new System.Drawing.Point(113, 135);
             this.PluginTextBox.MaxLength = 256;
             this.PluginTextBox.Name = "PluginTextBox";
             this.PluginTextBox.Size = new System.Drawing.Size(160, 21);
-            this.PluginTextBox.TabIndex = 4;
+            this.PluginTextBox.TabIndex = 5;
             this.PluginTextBox.WordWrap = false;
             // 
             // RemarksTextBox
             // 
             this.RemarksTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.RemarksTextBox.Location = new System.Drawing.Point(101, 189);
+            this.RemarksTextBox.Location = new System.Drawing.Point(113, 216);
             this.RemarksTextBox.MaxLength = 32;
             this.RemarksTextBox.Name = "RemarksTextBox";
             this.RemarksTextBox.Size = new System.Drawing.Size(160, 21);
-            this.RemarksTextBox.TabIndex = 6;
+            this.RemarksTextBox.TabIndex = 8;
             this.RemarksTextBox.WordWrap = false;
             // 
-            // RemarksLabel
-            // 
-            this.RemarksLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.RemarksLabel.AutoSize = true;
-            this.RemarksLabel.Location = new System.Drawing.Point(48, 193);
-            this.RemarksLabel.Name = "RemarksLabel";
-            this.RemarksLabel.Size = new System.Drawing.Size(47, 12);
-            this.RemarksLabel.TabIndex = 9;
-            this.RemarksLabel.Text = "Remarks";
-            // 
             // IPLabel
             // 
             this.IPLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.IPLabel.AutoSize = true;
-            this.IPLabel.Location = new System.Drawing.Point(36, 10);
+            this.IPLabel.Location = new System.Drawing.Point(48, 10);
             this.IPLabel.Name = "IPLabel";
             this.IPLabel.Size = new System.Drawing.Size(59, 12);
             this.IPLabel.TabIndex = 0;
@@ -168,7 +166,7 @@
             // 
             this.ServerPortLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.ServerPortLabel.AutoSize = true;
-            this.ServerPortLabel.Location = new System.Drawing.Point(24, 37);
+            this.ServerPortLabel.Location = new System.Drawing.Point(36, 37);
             this.ServerPortLabel.Name = "ServerPortLabel";
             this.ServerPortLabel.Size = new System.Drawing.Size(71, 12);
             this.ServerPortLabel.TabIndex = 1;
@@ -178,7 +176,7 @@
             // 
             this.PasswordLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.PasswordLabel.AutoSize = true;
-            this.PasswordLabel.Location = new System.Drawing.Point(42, 64);
+            this.PasswordLabel.Location = new System.Drawing.Point(54, 64);
             this.PasswordLabel.Name = "PasswordLabel";
             this.PasswordLabel.Size = new System.Drawing.Size(53, 12);
             this.PasswordLabel.TabIndex = 2;
@@ -188,7 +186,7 @@
             // IPTextBox
             // 
             this.IPTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.IPTextBox.Location = new System.Drawing.Point(101, 6);
+            this.IPTextBox.Location = new System.Drawing.Point(113, 6);
             this.IPTextBox.MaxLength = 512;
             this.IPTextBox.Name = "IPTextBox";
             this.IPTextBox.Size = new System.Drawing.Size(160, 21);
@@ -198,7 +196,7 @@
             // ServerPortTextBox
             // 
             this.ServerPortTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.ServerPortTextBox.Location = new System.Drawing.Point(101, 33);
+            this.ServerPortTextBox.Location = new System.Drawing.Point(113, 33);
             this.ServerPortTextBox.MaxLength = 10;
             this.ServerPortTextBox.Name = "ServerPortTextBox";
             this.ServerPortTextBox.Size = new System.Drawing.Size(160, 21);
@@ -208,7 +206,7 @@
             // PasswordTextBox
             // 
             this.PasswordTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.PasswordTextBox.Location = new System.Drawing.Point(101, 60);
+            this.PasswordTextBox.Location = new System.Drawing.Point(113, 60);
             this.PasswordTextBox.MaxLength = 256;
             this.PasswordTextBox.Name = "PasswordTextBox";
             this.PasswordTextBox.Size = new System.Drawing.Size(160, 21);
@@ -220,10 +218,10 @@
             // 
             this.EncryptionLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.EncryptionLabel.AutoSize = true;
-            this.EncryptionLabel.Location = new System.Drawing.Point(30, 113);
+            this.EncryptionLabel.Location = new System.Drawing.Point(42, 113);
             this.EncryptionLabel.Name = "EncryptionLabel";
             this.EncryptionLabel.Size = new System.Drawing.Size(65, 12);
-            this.EncryptionLabel.TabIndex = 8;
+            this.EncryptionLabel.TabIndex = 4;
             this.EncryptionLabel.Text = "Encryption";
             // 
             // EncryptionSelect
@@ -252,50 +250,51 @@
             "aes-128-gcm",
             "aes-192-gcm",
             "aes-256-gcm",
-            "chacha20-ietf-poly1305"});
-            this.EncryptionSelect.Location = new System.Drawing.Point(101, 109);
+            "chacha20-ietf-poly1305",
+            "xchacha20-ietf-poly1305"});
+            this.EncryptionSelect.Location = new System.Drawing.Point(113, 109);
             this.EncryptionSelect.Name = "EncryptionSelect";
             this.EncryptionSelect.Size = new System.Drawing.Size(160, 20);
-            this.EncryptionSelect.TabIndex = 3;
+            this.EncryptionSelect.TabIndex = 4;
             // 
             // TimeoutLabel
             // 
             this.TimeoutLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.TimeoutLabel.AutoSize = true;
-            this.TimeoutLabel.Location = new System.Drawing.Point(18, 220);
+            this.TimeoutLabel.Location = new System.Drawing.Point(30, 247);
             this.TimeoutLabel.Name = "TimeoutLabel";
             this.TimeoutLabel.RightToLeft = System.Windows.Forms.RightToLeft.No;
             this.TimeoutLabel.Size = new System.Drawing.Size(77, 12);
-            this.TimeoutLabel.TabIndex = 10;
+            this.TimeoutLabel.TabIndex = 9;
             this.TimeoutLabel.Text = "Timeout(Sec)";
             // 
             // TimeoutTextBox
             // 
             this.TimeoutTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.TimeoutTextBox.Location = new System.Drawing.Point(101, 216);
+            this.TimeoutTextBox.Location = new System.Drawing.Point(113, 243);
             this.TimeoutTextBox.MaxLength = 5;
             this.TimeoutTextBox.Name = "TimeoutTextBox";
             this.TimeoutTextBox.Size = new System.Drawing.Size(160, 21);
-            this.TimeoutTextBox.TabIndex = 7;
+            this.TimeoutTextBox.TabIndex = 9;
             // 
             // PluginLabel
             // 
             this.PluginLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.PluginLabel.AutoSize = true;
-            this.PluginLabel.Location = new System.Drawing.Point(54, 139);
+            this.PluginLabel.Location = new System.Drawing.Point(18, 139);
             this.PluginLabel.Name = "PluginLabel";
-            this.PluginLabel.Size = new System.Drawing.Size(41, 12);
-            this.PluginLabel.TabIndex = 12;
-            this.PluginLabel.Text = "Plugin";
+            this.PluginLabel.Size = new System.Drawing.Size(89, 12);
+            this.PluginLabel.TabIndex = 5;
+            this.PluginLabel.Text = "Plugin Program";
             // 
             // PluginOptionsTextBox
             // 
             this.PluginOptionsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.PluginOptionsTextBox.Location = new System.Drawing.Point(101, 162);
+            this.PluginOptionsTextBox.Location = new System.Drawing.Point(113, 162);
             this.PluginOptionsTextBox.MaxLength = 256;
             this.PluginOptionsTextBox.Name = "PluginOptionsTextBox";
             this.PluginOptionsTextBox.Size = new System.Drawing.Size(160, 21);
-            this.PluginOptionsTextBox.TabIndex = 5;
+            this.PluginOptionsTextBox.TabIndex = 6;
             this.PluginOptionsTextBox.WordWrap = false;
             // 
             // ShowPasswdCheckBox
@@ -303,14 +302,46 @@
             this.ShowPasswdCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ShowPasswdCheckBox.AutoSize = true;
-            this.ShowPasswdCheckBox.Location = new System.Drawing.Point(101, 87);
+            this.ShowPasswdCheckBox.Location = new System.Drawing.Point(113, 87);
             this.ShowPasswdCheckBox.Name = "ShowPasswdCheckBox";
             this.ShowPasswdCheckBox.Size = new System.Drawing.Size(102, 16);
-            this.ShowPasswdCheckBox.TabIndex = 16;
+            this.ShowPasswdCheckBox.TabIndex = 3;
             this.ShowPasswdCheckBox.Text = "Show Password";
             this.ShowPasswdCheckBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.ShowPasswdCheckBox.UseVisualStyleBackColor = true;
             this.ShowPasswdCheckBox.CheckedChanged += new System.EventHandler(this.ShowPasswdCheckBox_CheckedChanged);
+            // 
+            // RemarksLabel
+            // 
+            this.RemarksLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.RemarksLabel.AutoSize = true;
+            this.RemarksLabel.Location = new System.Drawing.Point(60, 220);
+            this.RemarksLabel.Name = "RemarksLabel";
+            this.RemarksLabel.Size = new System.Drawing.Size(47, 12);
+            this.RemarksLabel.TabIndex = 8;
+            this.RemarksLabel.Text = "Remarks";
+            // 
+            // PluginArgumentsTextBox
+            // 
+            this.PluginArgumentsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.PluginArgumentsTextBox.Location = new System.Drawing.Point(113, 189);
+            this.PluginArgumentsTextBox.MaxLength = 512;
+            this.PluginArgumentsTextBox.Name = "PluginArgumentsTextBox";
+            this.PluginArgumentsTextBox.Size = new System.Drawing.Size(160, 21);
+            this.PluginArgumentsTextBox.TabIndex = 7;
+            this.PluginArgumentsTextBox.WordWrap = false;
+            // 
+            // PluginArgumentsLabel
+            // 
+            this.PluginArgumentsLabel.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.PluginArgumentsLabel.AutoSize = true;
+            this.PluginArgumentsLabel.Location = new System.Drawing.Point(6, 193);
+            this.PluginArgumentsLabel.Name = "PluginArgumentsLabel";
+            this.PluginArgumentsLabel.Size = new System.Drawing.Size(101, 12);
+            this.PluginArgumentsLabel.TabIndex = 7;
+            this.PluginArgumentsLabel.Text = "Plugin Arguments";
+            this.toolTip1.SetToolTip(this.PluginArgumentsLabel, "Not SIP003 standard. Used as CLI arguments.\r\nMandatory:\r\n%SS_LOCAL_HOST%, %SS_LOC" +
+        "SL_PORT%, %SS_REMOTE_HOST%, %SS_REMOTE_PORT%\r\nOptional:\r\n%SS_PLUGIN_OPTIONS%");
             // 
             // panel2
             // 
@@ -330,7 +361,7 @@
             this.OKButton.Margin = new System.Windows.Forms.Padding(3, 3, 3, 0);
             this.OKButton.Name = "OKButton";
             this.OKButton.Size = new System.Drawing.Size(75, 23);
-            this.OKButton.TabIndex = 15;
+            this.OKButton.TabIndex = 17;
             this.OKButton.Text = "OK";
             this.OKButton.UseVisualStyleBackColor = true;
             this.OKButton.Click += new System.EventHandler(this.OKButton_Click);
@@ -343,7 +374,7 @@
             this.MyCancelButton.Margin = new System.Windows.Forms.Padding(3, 3, 0, 0);
             this.MyCancelButton.Name = "MyCancelButton";
             this.MyCancelButton.Size = new System.Drawing.Size(75, 23);
-            this.MyCancelButton.TabIndex = 16;
+            this.MyCancelButton.TabIndex = 18;
             this.MyCancelButton.Text = "Cancel";
             this.MyCancelButton.UseVisualStyleBackColor = true;
             this.MyCancelButton.Click += new System.EventHandler(this.CancelButton_Click);
@@ -355,7 +386,7 @@
             this.DeleteButton.Margin = new System.Windows.Forms.Padding(3, 6, 0, 3);
             this.DeleteButton.Name = "DeleteButton";
             this.DeleteButton.Size = new System.Drawing.Size(80, 23);
-            this.DeleteButton.TabIndex = 11;
+            this.DeleteButton.TabIndex = 13;
             this.DeleteButton.Text = "&Delete";
             this.DeleteButton.UseVisualStyleBackColor = true;
             this.DeleteButton.Click += new System.EventHandler(this.DeleteButton_Click);
@@ -367,7 +398,7 @@
             this.AddButton.Margin = new System.Windows.Forms.Padding(0, 6, 3, 3);
             this.AddButton.Name = "AddButton";
             this.AddButton.Size = new System.Drawing.Size(80, 23);
-            this.AddButton.TabIndex = 10;
+            this.AddButton.TabIndex = 12;
             this.AddButton.Text = "&Add";
             this.AddButton.UseVisualStyleBackColor = true;
             this.AddButton.Click += new System.EventHandler(this.AddButton_Click);
@@ -380,7 +411,7 @@
             this.ServerGroupBox.Location = new System.Drawing.Point(178, 0);
             this.ServerGroupBox.Margin = new System.Windows.Forms.Padding(12, 0, 0, 0);
             this.ServerGroupBox.Name = "ServerGroupBox";
-            this.ServerGroupBox.Size = new System.Drawing.Size(278, 281);
+            this.ServerGroupBox.Size = new System.Drawing.Size(290, 308);
             this.ServerGroupBox.TabIndex = 0;
             this.ServerGroupBox.TabStop = false;
             this.ServerGroupBox.Text = "Server";
@@ -394,7 +425,7 @@
             this.ServersListBox.Margin = new System.Windows.Forms.Padding(0);
             this.ServersListBox.Name = "ServersListBox";
             this.ServersListBox.Size = new System.Drawing.Size(166, 148);
-            this.ServersListBox.TabIndex = 9;
+            this.ServersListBox.TabIndex = 11;
             this.ServersListBox.SelectedIndexChanged += new System.EventHandler(this.ServersListBox_SelectedIndexChanged);
             // 
             // tableLayoutPanel2
@@ -417,7 +448,7 @@
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(456, 377);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(468, 404);
             this.tableLayoutPanel2.TabIndex = 7;
             // 
             // tableLayoutPanel6
@@ -430,7 +461,7 @@
             this.tableLayoutPanel6.Controls.Add(this.MoveDownButton, 1, 0);
             this.tableLayoutPanel6.Controls.Add(this.MoveUpButton, 0, 0);
             this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 345);
+            this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 372);
             this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0);
             this.tableLayoutPanel6.Name = "tableLayoutPanel6";
             this.tableLayoutPanel6.RowCount = 1;
@@ -445,7 +476,7 @@
             this.MoveDownButton.Margin = new System.Windows.Forms.Padding(3, 6, 0, 3);
             this.MoveDownButton.Name = "MoveDownButton";
             this.MoveDownButton.Size = new System.Drawing.Size(80, 23);
-            this.MoveDownButton.TabIndex = 14;
+            this.MoveDownButton.TabIndex = 16;
             this.MoveDownButton.Text = "Move D&own";
             this.MoveDownButton.UseVisualStyleBackColor = true;
             this.MoveDownButton.Click += new System.EventHandler(this.MoveDownButton_Click);
@@ -457,7 +488,7 @@
             this.MoveUpButton.Margin = new System.Windows.Forms.Padding(0, 6, 3, 3);
             this.MoveUpButton.Name = "MoveUpButton";
             this.MoveUpButton.Size = new System.Drawing.Size(80, 23);
-            this.MoveUpButton.TabIndex = 13;
+            this.MoveUpButton.TabIndex = 15;
             this.MoveUpButton.Text = "Move &Up";
             this.MoveUpButton.UseVisualStyleBackColor = true;
             this.MoveUpButton.Click += new System.EventHandler(this.MoveUpButton_Click);
@@ -473,7 +504,7 @@
             this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel5.Controls.Add(this.ProxyPortTextBox, 1, 0);
             this.tableLayoutPanel5.Controls.Add(this.ProxyPortLabel, 0, 0);
-            this.tableLayoutPanel5.Location = new System.Drawing.Point(260, 281);
+            this.tableLayoutPanel5.Location = new System.Drawing.Point(272, 308);
             this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0);
             this.tableLayoutPanel5.Name = "tableLayoutPanel5";
             this.tableLayoutPanel5.Padding = new System.Windows.Forms.Padding(3);
@@ -493,7 +524,7 @@
             this.ProxyPortTextBox.MaxLength = 10;
             this.ProxyPortTextBox.Name = "ProxyPortTextBox";
             this.ProxyPortTextBox.Size = new System.Drawing.Size(113, 21);
-            this.ProxyPortTextBox.TabIndex = 8;
+            this.ProxyPortTextBox.TabIndex = 10;
             this.ProxyPortTextBox.WordWrap = false;
             // 
             // ProxyPortLabel
@@ -503,7 +534,7 @@
             this.ProxyPortLabel.Location = new System.Drawing.Point(6, 26);
             this.ProxyPortLabel.Name = "ProxyPortLabel";
             this.ProxyPortLabel.Size = new System.Drawing.Size(65, 12);
-            this.ProxyPortLabel.TabIndex = 3;
+            this.ProxyPortLabel.TabIndex = 10;
             this.ProxyPortLabel.Text = "Proxy Port";
             // 
             // tableLayoutPanel3
@@ -517,7 +548,7 @@
             this.tableLayoutPanel3.Controls.Add(this.MyCancelButton, 1, 0);
             this.tableLayoutPanel3.Controls.Add(this.OKButton, 0, 0);
             this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Right;
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(297, 348);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(309, 375);
             this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             this.tableLayoutPanel3.RowCount = 1;
@@ -536,7 +567,7 @@
             this.tableLayoutPanel4.Controls.Add(this.DeleteButton, 1, 0);
             this.tableLayoutPanel4.Controls.Add(this.AddButton, 0, 0);
             this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Top;
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 281);
+            this.tableLayoutPanel4.Location = new System.Drawing.Point(0, 308);
             this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0);
             this.tableLayoutPanel4.Name = "tableLayoutPanel4";
             this.tableLayoutPanel4.RowCount = 2;
@@ -552,7 +583,7 @@
             this.DuplicateButton.Margin = new System.Windows.Forms.Padding(0, 6, 3, 3);
             this.DuplicateButton.Name = "DuplicateButton";
             this.DuplicateButton.Size = new System.Drawing.Size(80, 23);
-            this.DuplicateButton.TabIndex = 12;
+            this.DuplicateButton.TabIndex = 14;
             this.DuplicateButton.Text = "Dupli&cate";
             this.DuplicateButton.UseVisualStyleBackColor = true;
             this.DuplicateButton.Click += new System.EventHandler(this.DuplicateButton_Click);
@@ -565,7 +596,7 @@
             this.AutoSize = true;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.CancelButton = this.MyCancelButton;
-            this.ClientSize = new System.Drawing.Size(574, 398);
+            this.ClientSize = new System.Drawing.Size(574, 438);
             this.Controls.Add(this.tableLayoutPanel2);
             this.Controls.Add(this.panel2);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -632,6 +663,9 @@
         private System.Windows.Forms.TextBox PluginOptionsTextBox;
         private System.Windows.Forms.CheckBox ShowPasswdCheckBox;
         private System.Windows.Forms.TextBox PasswordTextBox;
+        private System.Windows.Forms.TextBox PluginArgumentsTextBox;
+        private System.Windows.Forms.Label PluginArgumentsLabel;
+        private System.Windows.Forms.ToolTip toolTip1;
     }
 }
 

shadowsocks-csharp/View/ConfigForm.cs

@@ -48,8 +48,9 @@ namespace Shadowsocks.View
             PasswordLabel.Text = I18N.GetString("Password");
             ShowPasswdCheckBox.Text = I18N.GetString("Show Password");
             EncryptionLabel.Text = I18N.GetString("Encryption");
-            PluginLabel.Text = I18N.GetString("Plugin");
+            PluginLabel.Text = I18N.GetString("Plugin Program");
             PluginOptionsLabel.Text = I18N.GetString("Plugin Options");
+            PluginArgumentsLabel.Text = I18N.GetString("Plugin Arguments");
             ProxyPortLabel.Text = I18N.GetString("Proxy Port");
             RemarksLabel.Text = I18N.GetString("Remarks");
             TimeoutLabel.Text = I18N.GetString("Timeout(Sec)");
@@ -99,6 +100,7 @@ namespace Shadowsocks.View
                 server.method = EncryptionSelect.Text;
                 server.plugin = PluginTextBox.Text;
                 server.plugin_opts = PluginOptionsTextBox.Text;
+                server.plugin_args = PluginArgumentsTextBox.Text;
                 server.remarks = RemarksTextBox.Text;
                 if (!int.TryParse(TimeoutTextBox.Text, out server.timeout))
                 {
@@ -134,6 +136,7 @@ namespace Shadowsocks.View
                 EncryptionSelect.Text = server.method ?? "aes-256-cfb";
                 PluginTextBox.Text = server.plugin;
                 PluginOptionsTextBox.Text = server.plugin_opts;
+                PluginArgumentsTextBox.Text = server.plugin_args;
                 RemarksTextBox.Text = server.remarks;
                 TimeoutTextBox.Text = server.timeout.ToString();
             }

shadowsocks-csharp/View/ConfigForm.resx

@@ -123,15 +123,15 @@
   <metadata name="PluginOptionsLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="PluginTextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="RemarksTextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="RemarksLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="IPLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -171,6 +171,18 @@
   <metadata name="ShowPasswdCheckBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="PluginArgumentsTextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PluginArgumentsLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="RemarksLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="panel2.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -222,6 +234,21 @@
   <metadata name="DuplicateButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="MoveDownButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MoveUpButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ProxyPortTextBox.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ProxyPortLabel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="DuplicateButton.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

shadowsocks-csharp/View/MenuViewController.cs

@@ -187,6 +187,10 @@ namespace Shadowsocks.View
                               I18N.GetString("System Proxy On: ") + (global ? I18N.GetString("Global") : I18N.GetString("PAC")) :
                               String.Format(I18N.GetString("Running: Port {0}"), config.localPort))  // this feedback is very important because they need to know Shadowsocks is running
                           + "\n" + serverInfo;
+            if (text.Length > 127)
+            {
+                text = text.Substring(0, 126 - 3) + "...";
+            }
             ViewUtils.SetNotifyIconText(_notifyIcon, text);
         }
 
@@ -286,7 +290,7 @@ namespace Shadowsocks.View
                 this.proxyItem = CreateMenuItem("Forward Proxy...", new EventHandler(this.proxyItem_Click)),
                 new MenuItem("-"),
                 this.AutoStartupItem = CreateMenuItem("Start on Boot", new EventHandler(this.AutoStartupItem_Click)),
-                this.ShareOverLANItem = CreateMenuItem("Allow Clients from LAN", new EventHandler(this.ShareOverLANItem_Click)),
+                this.ShareOverLANItem = CreateMenuItem("Allow other Devices to connect", new EventHandler(this.ShareOverLANItem_Click)),
                 new MenuItem("-"),
                 this.hotKeyItem = CreateMenuItem("Edit Hotkeys...", new EventHandler(this.hotKeyItem_Click)),
                 CreateMenuGroup("Help", new MenuItem[] {
@@ -707,7 +711,7 @@ namespace Shadowsocks.View
                             {
                                 splash.FormClosed += splash_FormClosed;
                             }
-                            else if (result.Text.StartsWith("http://") || result.Text.StartsWith("https://"))
+                            else if (result.Text.ToLower().StartsWith("http://") || result.Text.ToLower().StartsWith("https://"))
                             {
                                 _urlToOpen = result.Text;
                                 splash.FormClosed += openURLFromQRCode;
@@ -738,7 +742,7 @@ namespace Shadowsocks.View
                             splash.Location = new Point(screen.Bounds.X, screen.Bounds.Y);
                             // we need a panel because a window has a minimal size
                             // TODO: test on high DPI
-                            splash.TargetRect = new Rectangle((int)minX + screen.Bounds.X, (int)minY + screen.Bounds.Y, (int)maxX - (int)minX, (int)maxY - (int)minY);
+                            splash.TargetRect = new Rectangle((int)minX, (int)minY, (int)maxX - (int)minX, (int)maxY - (int)minY);
                             splash.Size = new Size(fullImage.Width, fullImage.Height);
                             splash.Show();
                             return;

shadowsocks-csharp/View/ProxyForm.cs

@@ -12,7 +12,7 @@ namespace Shadowsocks.View
         private ShadowsocksController controller;
 
         // this is a copy of configuration that we are working on
-        private ProxyConfig _modifiedConfiguration;
+        private ProxyConfig _modifiedProxyConfig;
 
         public ProxyForm(ShadowsocksController controller)
         {
@@ -49,53 +49,47 @@ namespace Shadowsocks.View
 
         private void LoadCurrentConfiguration()
         {
-            _modifiedConfiguration = controller.GetConfigurationCopy().proxy;
-            UseProxyCheckBox.Checked = _modifiedConfiguration.useProxy;
-            ProxyServerTextBox.Text = _modifiedConfiguration.proxyServer;
-            ProxyPortTextBox.Text = _modifiedConfiguration.proxyPort.ToString();
-            ProxyTimeoutTextBox.Text = _modifiedConfiguration.proxyTimeout.ToString();
-            ProxyTypeComboBox.SelectedIndex = _modifiedConfiguration.proxyType;
+            _modifiedProxyConfig = controller.GetConfigurationCopy().proxy;
+            UseProxyCheckBox.Checked = _modifiedProxyConfig.useProxy;
+            ProxyServerTextBox.Text = _modifiedProxyConfig.proxyServer;
+            ProxyPortTextBox.Text = _modifiedProxyConfig.proxyPort.ToString();
+            ProxyTimeoutTextBox.Text = _modifiedProxyConfig.proxyTimeout.ToString();
+            ProxyTypeComboBox.SelectedIndex = _modifiedProxyConfig.proxyType;
         }
 
         private void OKButton_Click(object sender, EventArgs e)
         {
 
-            if (UseProxyCheckBox.Checked)
+            if (_modifiedProxyConfig.useProxy=UseProxyCheckBox.Checked)
             {
-                int port;
-                int timeout;
-                if (!int.TryParse(ProxyPortTextBox.Text, out port))
+                if (!int.TryParse(ProxyPortTextBox.Text, out _modifiedProxyConfig.proxyPort))
                 {
                     MessageBox.Show(I18N.GetString("Illegal port number format"));
                     return;
                 }
 
-                if (!int.TryParse(ProxyTimeoutTextBox.Text, out timeout))
+                if (!int.TryParse(ProxyTimeoutTextBox.Text, out _modifiedProxyConfig.proxyTimeout))
                 {
                     MessageBox.Show(I18N.GetString("Illegal timeout format"));
                     return;
                 }
 
-                var type = ProxyTypeComboBox.SelectedIndex;
-                var proxy = ProxyServerTextBox.Text;
+                _modifiedProxyConfig.proxyType = ProxyTypeComboBox.SelectedIndex;
+
                 try
                 {
-                    Configuration.CheckServer(proxy);
-                    Configuration.CheckPort(port);
-                    Configuration.CheckTimeout(timeout, ProxyConfig.MaxProxyTimeoutSec);
+                    Configuration.CheckServer(_modifiedProxyConfig.proxyServer = ProxyServerTextBox.Text);
+                    Configuration.CheckPort(_modifiedProxyConfig.proxyPort);
+                    Configuration.CheckTimeout(_modifiedProxyConfig.proxyTimeout, ProxyConfig.MaxProxyTimeoutSec);
                 }
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message);
                     return;
                 }
+            }
 
-                controller.EnableProxy(type, proxy, port, timeout);
-            }
-            else
-            {
-                controller.DisableProxy();
-            }
+            controller.SaveProxy(_modifiedProxyConfig);
 
             this.Close();
         }
@@ -119,17 +113,17 @@ namespace Shadowsocks.View
         {
             if (UseProxyCheckBox.Checked)
             {
-                ProxyServerTextBox.Enabled = true;
-                ProxyPortTextBox.Enabled = true;
-                ProxyTimeoutTextBox.Enabled = true;
+                ProxyServerTextBox.Enabled = 
+                ProxyPortTextBox.Enabled = 
+                ProxyTimeoutTextBox.Enabled = 
                 ProxyTypeComboBox.Enabled = true;
             }
             else
             {
-                ProxyServerTextBox.Enabled = false;
-                ProxyPortTextBox.Enabled = false;
-                ProxyTimeoutTextBox.Enabled = false;
-                ProxyTypeComboBox.Enabled = false;
+                ProxyServerTextBox.Enabled =
+                ProxyPortTextBox.Enabled =
+                ProxyTimeoutTextBox.Enabled =
+                ProxyTypeComboBox.Enabled = false; 
             }
         }
     }

shadowsocks-csharp/View/QRCodeSplashForm.cs

@@ -12,12 +12,13 @@ using System.Diagnostics;
 
 namespace Shadowsocks.View
 {
-    public class QRCodeSplashForm : PerPixelAlphaForm
+    public class QRCodeSplashForm : Form
     {
         public Rectangle TargetRect;
 
         public QRCodeSplashForm()
         {
+            FormBorderStyle = FormBorderStyle.None;
             this.Load += QRCodeSplashForm_Load;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.White;
@@ -69,16 +70,6 @@ namespace Shadowsocks.View
             brush = new SolidBrush(Color.FromArgb(30, Color.Red));
         }
 
-        protected override CreateParams CreateParams
-        {
-            get
-            {
-                CreateParams cp = base.CreateParams;
-                cp.ExStyle |= 0x00080000; // This form has to have the WS_EX_LAYERED extended style
-                return cp;
-            }
-        }
-
         void timer_Tick(object sender, EventArgs e)
         {
             double percent = (double)sw.ElapsedMilliseconds / 1000.0 / (double)ANIMATION_TIME;
@@ -148,6 +139,69 @@ namespace Shadowsocks.View
                 flashStep++;
             }
         }
+
+        // PerPixelAlphaForm.cs
+        // http://www.codeproject.com/Articles/1822/Per-Pixel-Alpha-Blend-in-C
+        // Rui Lopes
+        protected override CreateParams CreateParams
+        {
+            get
+            {
+                CreateParams cp = base.CreateParams;
+                cp.ExStyle |= 0x00080000; // This form has to have the WS_EX_LAYERED extended style
+                return cp;
+            }
+        }
+
+        public void SetBitmap(Bitmap bitmap)
+        {
+            SetBitmap(bitmap, 255);
+        }
+
+        /// <para>Changes the current bitmap with a custom opacity level.  Here is where all happens!</para>
+        public void SetBitmap(Bitmap bitmap, byte opacity)
+        {
+            if (bitmap.PixelFormat != PixelFormat.Format32bppArgb)
+                throw new ApplicationException("The bitmap must be 32ppp with alpha-channel.");
+
+            // The idea of this is very simple,
+            // 1. Create a compatible DC with screen;
+            // 2. Select the bitmap with 32bpp with alpha-channel in the compatible DC;
+            // 3. Call the UpdateLayeredWindow.
+
+            IntPtr screenDc = Win32.GetDC(IntPtr.Zero);
+            IntPtr memDc = Win32.CreateCompatibleDC(screenDc);
+            IntPtr hBitmap = IntPtr.Zero;
+            IntPtr oldBitmap = IntPtr.Zero;
+
+            try
+            {
+                hBitmap = bitmap.GetHbitmap(Color.FromArgb(0));  // grab a GDI handle from this GDI+ bitmap
+                oldBitmap = Win32.SelectObject(memDc, hBitmap);
+
+                Win32.Size size = new Win32.Size(bitmap.Width, bitmap.Height);
+                Win32.Point pointSource = new Win32.Point(0, 0);
+                Win32.Point topPos = new Win32.Point(Left, Top);
+                Win32.BLENDFUNCTION blend = new Win32.BLENDFUNCTION();
+                blend.BlendOp = Win32.AC_SRC_OVER;
+                blend.BlendFlags = 0;
+                blend.SourceConstantAlpha = opacity;
+                blend.AlphaFormat = Win32.AC_SRC_ALPHA;
+
+                Win32.UpdateLayeredWindow(Handle, screenDc, ref topPos, ref size, memDc, ref pointSource, 0, ref blend, Win32.ULW_ALPHA);
+            }
+            finally
+            {
+                Win32.ReleaseDC(IntPtr.Zero, screenDc);
+                if (hBitmap != IntPtr.Zero)
+                {
+                    Win32.SelectObject(memDc, oldBitmap);
+                    //Windows.DeleteObject(hBitmap); // The documentation says that we have to use the Windows.DeleteObject... but since there is no such method I use the normal DeleteObject from Win32 GDI and it's working fine without any resource leak.
+                    Win32.DeleteObject(hBitmap);
+                }
+                Win32.DeleteDC(memDc);
+            }
+        }
     }
 
 
@@ -224,77 +278,4 @@ namespace Shadowsocks.View
         [DllImport("gdi32.dll", ExactSpelling = true, SetLastError = true)]
         public static extern int DeleteObject(IntPtr hObject);
     }
-
-
-    public class PerPixelAlphaForm : Form
-    {
-        // http://www.codeproject.com/Articles/1822/Per-Pixel-Alpha-Blend-in-C
-        // Rui Lopes
-
-        public PerPixelAlphaForm()
-        {
-            // This form should not have a border or else Windows will clip it.
-            FormBorderStyle = FormBorderStyle.None;
-        }
-
-        public void SetBitmap(Bitmap bitmap)
-        {
-            SetBitmap(bitmap, 255);
-        }
-
-        /// <para>Changes the current bitmap with a custom opacity level.  Here is where all happens!</para>
-        public void SetBitmap(Bitmap bitmap, byte opacity)
-        {
-            if (bitmap.PixelFormat != PixelFormat.Format32bppArgb)
-                throw new ApplicationException("The bitmap must be 32ppp with alpha-channel.");
-
-            // The idea of this is very simple,
-            // 1. Create a compatible DC with screen;
-            // 2. Select the bitmap with 32bpp with alpha-channel in the compatible DC;
-            // 3. Call the UpdateLayeredWindow.
-
-            IntPtr screenDc = Win32.GetDC(IntPtr.Zero);
-            IntPtr memDc = Win32.CreateCompatibleDC(screenDc);
-            IntPtr hBitmap = IntPtr.Zero;
-            IntPtr oldBitmap = IntPtr.Zero;
-
-            try
-            {
-                hBitmap = bitmap.GetHbitmap(Color.FromArgb(0));  // grab a GDI handle from this GDI+ bitmap
-                oldBitmap = Win32.SelectObject(memDc, hBitmap);
-
-                Win32.Size size = new Win32.Size(bitmap.Width, bitmap.Height);
-                Win32.Point pointSource = new Win32.Point(0, 0);
-                Win32.Point topPos = new Win32.Point(Left, Top);
-                Win32.BLENDFUNCTION blend = new Win32.BLENDFUNCTION();
-                blend.BlendOp = Win32.AC_SRC_OVER;
-                blend.BlendFlags = 0;
-                blend.SourceConstantAlpha = opacity;
-                blend.AlphaFormat = Win32.AC_SRC_ALPHA;
-
-                Win32.UpdateLayeredWindow(Handle, screenDc, ref topPos, ref size, memDc, ref pointSource, 0, ref blend, Win32.ULW_ALPHA);
-            }
-            finally
-            {
-                Win32.ReleaseDC(IntPtr.Zero, screenDc);
-                if (hBitmap != IntPtr.Zero)
-                {
-                    Win32.SelectObject(memDc, oldBitmap);
-                    //Windows.DeleteObject(hBitmap); // The documentation says that we have to use the Windows.DeleteObject... but since there is no such method I use the normal DeleteObject from Win32 GDI and it's working fine without any resource leak.
-                    Win32.DeleteObject(hBitmap);
-                }
-                Win32.DeleteDC(memDc);
-            }
-        }
-
-        protected override CreateParams CreateParams
-        {
-            get
-            {
-                CreateParams cp = base.CreateParams;
-                cp.ExStyle |= 0x00080000; // This form has to have the WS_EX_LAYERED extended style
-                return cp;
-            }
-        }
-    }
 }

shadowsocks-csharp/app.config

@@ -39,4 +39,49 @@
       </setting>
     </Shadowsocks.Properties.Settings>
   </userSettings>
+  <!-- Uncomment to dump network tracing info
+    <system.diagnostics>
+    <sources>
+      <source name="System.Net" tracemode="includehex" maxdatasize="1024">
+        <listeners>
+          <add name="System.Net"/>
+        </listeners>
+      </source>
+      <source name="System.Net.Cache">
+        <listeners>
+          <add name="System.Net"/>
+        </listeners>
+      </source>
+      <source name="System.Net.Http">
+        <listeners>
+          <add name="System.Net"/>
+        </listeners>
+      </source>
+      <source name="System.Net.Sockets">
+        <listeners>
+          <add name="System.Net"/>
+        </listeners>
+      </source>
+      <source name="System.Net.WebSockets">
+        <listeners>
+          <add name="System.Net"/>
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="System.Net" value="Verbose"/>
+      <add name="System.Net.Cache" value="Verbose"/>
+      <add name="System.Net.Http" value="Verbose"/>
+      <add name="System.Net.Sockets" value="Verbose"/>
+      <add name="System.Net.WebSockets" value="Verbose"/>
+    </switches>
+    <sharedListeners>
+      <add name="System.Net"
+        type="System.Diagnostics.TextWriterTraceListener"
+        initializeData="network-tracing.log"
+      />
+    </sharedListeners>
+    <trace autoflush="true"/>
+  </system.diagnostics>
+  -->
 </configuration>

shadowsocks-csharp/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caseless.Fody" version="1.5.0" targetFramework="net462" developmentDependency="true" />
-  <package id="Costura.Fody" version="1.4.1" targetFramework="net462" developmentDependency="true" />
-  <package id="Fody" version="2.0.9" targetFramework="net462" developmentDependency="true" />
+  <package id="Caseless.Fody" version="1.7.3" targetFramework="net462" developmentDependency="true" />
+  <package id="Costura.Fody" version="1.6.2" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="2.3.23" targetFramework="net462" developmentDependency="true" />
   <package id="GlobalHotKey" version="1.1.0" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
   <package id="StringEx.CS" version="0.3.1" targetFramework="net462" developmentDependency="true" />
-  <package id="ZXing.Net" version="0.15.0" targetFramework="net462" />
+  <package id="ZXing.Net" version="0.16.2" targetFramework="net462" />
 </packages>

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -66,6 +66,13 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Caseless, Version=0.0.0.0, Culture=neutral, PublicKeyToken=409b3227471b0f0d, processorArchitecture=MSIL">
+      <HintPath>3rd\Caseless.Fody.1.7.3\lib\net452\Caseless.dll</HintPath>
+    </Reference>
+    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>3rd\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="GlobalHotKey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>3rd\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll</HintPath>
       <Private>True</Private>
@@ -73,7 +80,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>3rd\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>3rd\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -85,17 +92,18 @@
     <Reference Include="System.Windows.Forms.DataVisualization" />
     <Reference Include="System.XML" />
     <Reference Include="WindowsBase" />
-    <Reference Include="zxing, Version=0.15.0.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <HintPath>3rd\ZXing.Net.0.15.0\lib\net461\zxing.dll</HintPath>
+    <Reference Include="zxing, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
+      <HintPath>3rd\ZXing.Net.0.16.2\lib\net461\zxing.dll</HintPath>
     </Reference>
-    <Reference Include="zxing.presentation, Version=0.15.0.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
-      <HintPath>3rd\ZXing.Net.0.15.0\lib\net461\zxing.presentation.dll</HintPath>
+    <Reference Include="zxing.presentation, Version=0.16.2.0, Culture=neutral, PublicKeyToken=4e88037ac681fe60, processorArchitecture=MSIL">
+      <HintPath>3rd\ZXing.Net.0.16.2\lib\net461\zxing.presentation.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controller\System\Hotkeys\HotkeyCallbacks.cs" />
     <Compile Include="Encryption\AEAD\AEADEncryptor.cs" />
     <Compile Include="Encryption\AEAD\AEADMbedTLSEncryptor.cs" />
+    <Compile Include="Encryption\AEAD\AEADOpenSSLEncryptor.cs" />
     <Compile Include="Encryption\AEAD\AEADSodiumEncryptor.cs" />
     <Compile Include="Encryption\CircularBuffer\ByteCircularBuffer.cs" />
     <Compile Include="Encryption\EncryptorBase.cs" />
@@ -103,10 +111,12 @@
     <Compile Include="Encryption\Exception\CryptoException.cs" />
     <Compile Include="Encryption\IEncryptor.cs" />
     <Compile Include="Encryption\MbedTLS.cs" />
+    <Compile Include="Encryption\OpenSSL.cs" />
     <Compile Include="Encryption\RNG.cs" />
     <Compile Include="Encryption\Sodium.cs" />
     <Compile Include="Encryption\Stream\StreamEncryptor.cs" />
     <Compile Include="Encryption\Stream\StreamMbedTLSEncryptor.cs" />
+    <Compile Include="Encryption\Stream\StreamOpenSSLEncryptor.cs" />
     <Compile Include="Encryption\Stream\StreamSodiumEncryptor.cs" />
     <Compile Include="Model\HotKeyConfig.cs" />
     <Compile Include="Model\ProxyConfig.cs" />
@@ -342,13 +352,15 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="3rd\Fody.2.0.9\build\netstandard1.4\Fody.targets" Condition="Exists('3rd\Fody.2.0.9\build\netstandard1.4\Fody.targets')" />
+  <Import Project="3rd\Fody.2.3.23\build\Fody.targets" Condition="Exists('3rd\Fody.2.3.23\build\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('3rd\Fody.2.0.9\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Fody.2.0.9\build\netstandard1.4\Fody.targets'))" />
+    <Error Condition="!Exists('3rd\Fody.2.3.23\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Fody.2.3.23\build\Fody.targets'))" />
+    <Error Condition="!Exists('3rd\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets'))" />
   </Target>
+  <Import Project="3rd\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets" Condition="Exists('3rd\Costura.Fody.1.6.2\build\dotnet\Costura.Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

test/UnitTest.cs

@@ -227,6 +227,47 @@ namespace test
             }
         }
 
+        [TestMethod]
+        public void TestOpenSSLEncryption()
+        {
+            // run it once before the multi-threading test to initialize global tables
+            RunSingleOpenSSLEncryptionThread();
+            List<Thread> threads = new List<Thread>();
+            for (int i = 0; i < 10; i++)
+            {
+                Thread t = new Thread(new ThreadStart(RunSingleOpenSSLEncryptionThread));
+                threads.Add(t);
+                t.Start();
+            }
+            foreach (Thread t in threads)
+            {
+                t.Join();
+            }
+            RNG.Close();
+            Assert.IsFalse(encryptionFailed);
+        }
+
+        private void RunSingleOpenSSLEncryptionThread()
+        {
+            try
+            {
+                for (int i = 0; i < 100; i++)
+                {
+                    var random = new Random();
+                    IEncryptor encryptor;
+                    IEncryptor decryptor;
+                    encryptor = new StreamOpenSSLEncryptor("aes-256-cfb", "barfoo!");
+                    decryptor = new StreamOpenSSLEncryptor("aes-256-cfb", "barfoo!");
+                    RunEncryptionRound(encryptor, decryptor);
+                }
+            }
+            catch
+            {
+                encryptionFailed = true;
+                throw;
+            }
+        }
+
         [TestMethod]
         public void ParseAndGenerateShadowsocksUrl()
         {