diff --git a/shadowsocks-csharp/Encrypt/OpenSSL.cs b/shadowsocks-csharp/Encrypt/OpenSSL.cs deleted file mode 100755 index 8d7c31e4..00000000 --- a/shadowsocks-csharp/Encrypt/OpenSSL.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using System.Text; - -namespace Shadowsocks.Encrypt -{ - public class OpenSSL - { - const string DLLNAME = "libeay32"; - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static void OpenSSL_add_all_ciphers(); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static IntPtr EVP_md5(); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int EVP_BytesToKey(IntPtr type, IntPtr md, IntPtr salt, byte[] data, int datal, int count, byte[] key, byte[] iv); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int RAND_bytes(byte[] buf, int num); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static IntPtr EVP_get_cipherbyname(byte[] name); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static IntPtr EVP_CIPHER_CTX_new(); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int EVP_CipherInit_ex(IntPtr ctx, IntPtr type, IntPtr impl, byte[] key, byte[] iv, int enc); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int EVP_CIPHER_CTX_cleanup(IntPtr a); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int EVP_CIPHER_CTX_free(IntPtr a); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static int EVP_CipherUpdate(IntPtr ctx, byte[] outb, out int outl, byte[] inb, int inl); - - [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] - public extern static IntPtr MD5(byte[] d, long n, byte[] md); - } -} diff --git a/shadowsocks-csharp/Encrypt/OpenSSLEncryptor.cs b/shadowsocks-csharp/Encrypt/OpenSSLEncryptor.cs deleted file mode 100755 index bcea60a3..00000000 --- a/shadowsocks-csharp/Encrypt/OpenSSLEncryptor.cs +++ /dev/null @@ -1,170 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.InteropServices; -using System.Text; - -namespace Shadowsocks.Encrypt -{ - public class OpenSSLEncryptor - : EncryptorBase, IDisposable - { - static Dictionary ciphers = new Dictionary { - {"aes-128-cfb", new int[]{16, 16}}, - {"aes-192-cfb", new int[]{24, 16}}, - {"aes-256-cfb", new int[]{32, 16}}, - {"bf-cfb", new int[]{16, 8}}, - {"rc4", new int[]{16, 0}}, - {"rc4-md5", new int[]{16, 16}}, - }; - - static OpenSSLEncryptor() - { - OpenSSL.OpenSSL_add_all_ciphers(); - } - - public OpenSSLEncryptor(string method, string password) - : base(method, password) - { - InitKey(method, password); - } - - - static byte[] tempbuf = new byte[32768]; - - public override void Encrypt(byte[] buf, int length, byte[] outbuf, out int outlength) - { - if (_encryptCtx == IntPtr.Zero) - { - OpenSSL.RAND_bytes(outbuf, ivLen); - InitCipher(ref _encryptCtx, outbuf, true); - outlength = length + ivLen; - OpenSSL.EVP_CipherUpdate(_encryptCtx, tempbuf, out outlength, buf, length); - outlength = length + ivLen; - Buffer.BlockCopy(tempbuf, 0, outbuf, ivLen, length); - } - else - { - outlength = length; - OpenSSL.EVP_CipherUpdate(_encryptCtx, outbuf, out outlength, buf, length); - } - } - - public override void Decrypt(byte[] buf, int length, byte[] outbuf, out int outlength) - { - if (_decryptCtx == IntPtr.Zero) - { - InitCipher(ref _decryptCtx, buf, false); - outlength = length - ivLen; - Buffer.BlockCopy(buf, ivLen, tempbuf, 0, length - ivLen); - OpenSSL.EVP_CipherUpdate(_decryptCtx, outbuf, out outlength, tempbuf, length - ivLen); - } - else - { - outlength = length; - OpenSSL.EVP_CipherUpdate(_decryptCtx, outbuf, out outlength, buf, length); - } - } - - private static readonly Dictionary CachedKeys = new Dictionary(); - private byte[] _key; - private IntPtr _encryptCtx; - private IntPtr _decryptCtx; - private IntPtr _cipher; - private string _method; - private int keyLen; - private int ivLen; - - private void InitKey(string method, string password) - { - method = method.ToLower(); - _method = method; - string k = method + ":" + password; - if (method == "rc4-md5") - { - method = "rc4"; - } - _cipher = OpenSSL.EVP_get_cipherbyname(System.Text.Encoding.UTF8.GetBytes(method)); - if (_cipher == null) - { - throw new Exception("method not found"); - } - keyLen = ciphers[_method][0]; - ivLen = ciphers[_method][1]; - if (CachedKeys.ContainsKey(k)) - { - _key = CachedKeys[k]; - } - else - { - byte[] passbuf = Encoding.UTF8.GetBytes(password); - _key = new byte[32]; - byte[] iv = new byte[16]; - OpenSSL.EVP_BytesToKey(_cipher, OpenSSL.EVP_md5(), IntPtr.Zero, passbuf, passbuf.Length, 1, _key, iv); - CachedKeys[k] = _key; - } - } - - private void InitCipher(ref IntPtr ctx, byte[] iv, bool isCipher) - { - ctx = OpenSSL.EVP_CIPHER_CTX_new(); - int enc = isCipher ? 1 : 0; - byte[] realkey; - IntPtr r = IntPtr.Zero; - 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); - r = OpenSSL.MD5(temp, keyLen + ivLen, null); - Marshal.Copy(r, realkey, 0, keyLen); - } - else - { - realkey = _key; - } - OpenSSL.EVP_CipherInit_ex(ctx, _cipher, IntPtr.Zero, realkey, iv, enc); - } - - #region IDisposable - private bool _disposed; - - public override void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - ~OpenSSLEncryptor() - { - Dispose(false); - } - - protected virtual void Dispose(bool disposing) - { - if (!_disposed) - { - if (disposing) - { - - } - - if (_encryptCtx.ToInt64() != 0) - { - OpenSSL.EVP_CIPHER_CTX_cleanup(_encryptCtx); - OpenSSL.EVP_CIPHER_CTX_free(_encryptCtx); - _encryptCtx = IntPtr.Zero; - } - if (_decryptCtx.ToInt64() != 0) - { - OpenSSL.EVP_CIPHER_CTX_cleanup(_decryptCtx); - OpenSSL.EVP_CIPHER_CTX_free(_decryptCtx); - _decryptCtx = IntPtr.Zero; - } - - _disposed = true; - } - } - #endregion - } -} diff --git a/shadowsocks-csharp/Encrypt/PolarSSL.cs b/shadowsocks-csharp/Encrypt/PolarSSL.cs index ac1592f0..193e4ab0 100755 --- a/shadowsocks-csharp/Encrypt/PolarSSL.cs +++ b/shadowsocks-csharp/Encrypt/PolarSSL.cs @@ -1,5 +1,8 @@ -using System; +using Shadowsocks.Controller; +using Shadowsocks.Properties; +using System; using System.Collections.Generic; +using System.IO; using System.Runtime.InteropServices; using System.Text; @@ -13,6 +16,24 @@ namespace Shadowsocks.Encrypt public const int AES_ENCRYPT = 1; public const int AES_DECRYPT = 0; + static PolarSSL() + { + string tempPath = Path.GetTempPath(); + string dllPath = tempPath + "/polarssl.dll"; + try + { + FileManager.UncompressFile(dllPath, Resources.polarssl_dll); + } + catch (IOException e) + { + Console.WriteLine(e.ToString()); + } + LoadLibrary(dllPath); + } + + [DllImport("Kernel32.dll")] + private static extern IntPtr LoadLibrary(string path); + [DllImport(DLLNAME, CallingConvention = CallingConvention.Cdecl)] public extern static void aes_init(IntPtr ctx); diff --git a/shadowsocks-csharp/Program.cs b/shadowsocks-csharp/Program.cs index 2115c77a..b2834ed6 100755 --- a/shadowsocks-csharp/Program.cs +++ b/shadowsocks-csharp/Program.cs @@ -4,9 +4,6 @@ using Shadowsocks.View; using System; using System.Collections.Generic; using System.Diagnostics; -using System.IO; -using System.Reflection; -using System.Runtime.InteropServices; using System.Threading; using System.Windows.Forms; @@ -14,8 +11,6 @@ namespace Shadowsocks { static class Program { - [DllImport("Kernel32.dll")] - private static extern IntPtr LoadLibrary(string path); /// /// 应用程序的主入口点。 @@ -35,17 +30,6 @@ namespace Shadowsocks MessageBox.Show("Shadowsocks is already running.\n\nFind Shadowsocks icon in your notify tray."); return; } - string tempPath = Path.GetTempPath(); - string dllPath = tempPath + "/polarssl.dll"; - try - { - FileManager.UncompressFile(dllPath, Resources.polarssl_dll); - } - catch (IOException e) - { - Console.WriteLine(e.ToString()); - } - LoadLibrary(dllPath); #if !DEBUG Logging.OpenLogFile(); diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 0b312e57..41515225 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -77,8 +77,6 @@ - -