diff --git a/CHANGES b/CHANGES index 0a52a4a2..781044c9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +2.0.7 2014-11-11 +- Use OpenSSL for now + +2.0.6 2014-11-10 +- Minor bug fixes + 2.0.5 2014-11-09 - Fix QRCode size - Share over LAN option diff --git a/shadowsocks-csharp/Data/libeay32.dll.gz b/shadowsocks-csharp/Data/libeay32.dll.gz new file mode 100755 index 00000000..673427ba Binary files /dev/null and b/shadowsocks-csharp/Data/libeay32.dll.gz differ diff --git a/shadowsocks-csharp/Encrypt/EncryptorFactory.cs b/shadowsocks-csharp/Encrypt/EncryptorFactory.cs index 59111a69..dbb45d33 100644 --- a/shadowsocks-csharp/Encrypt/EncryptorFactory.cs +++ b/shadowsocks-csharp/Encrypt/EncryptorFactory.cs @@ -10,7 +10,7 @@ namespace Shadowsocks.Encrypt return new TableEncryptor(method, password); } - return new PolarSSLEncryptor(method, password); + return new OpenSSLEncryptor(method, password); } } } diff --git a/shadowsocks-csharp/Encrypt/OpenSSL.cs b/shadowsocks-csharp/Encrypt/OpenSSL.cs new file mode 100755 index 00000000..8d7c31e4 --- /dev/null +++ b/shadowsocks-csharp/Encrypt/OpenSSL.cs @@ -0,0 +1,45 @@ +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 new file mode 100755 index 00000000..7abdb375 --- /dev/null +++ b/shadowsocks-csharp/Encrypt/OpenSSLEncryptor.cs @@ -0,0 +1,170 @@ +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, outlength); + } + 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/Program.cs b/shadowsocks-csharp/Program.cs index 2115c77a..d730419a 100755 --- a/shadowsocks-csharp/Program.cs +++ b/shadowsocks-csharp/Program.cs @@ -36,10 +36,10 @@ namespace Shadowsocks return; } string tempPath = Path.GetTempPath(); - string dllPath = tempPath + "/polarssl.dll"; + string dllPath = tempPath + "/libeay32.dll"; try { - FileManager.UncompressFile(dllPath, Resources.polarssl_dll); + FileManager.UncompressFile(dllPath, Resources.libeay32_dll); } catch (IOException e) { diff --git a/shadowsocks-csharp/Properties/Resources.Designer.cs b/shadowsocks-csharp/Properties/Resources.Designer.cs index 4f9edeba..65b2d0a2 100755 --- a/shadowsocks-csharp/Properties/Resources.Designer.cs +++ b/shadowsocks-csharp/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace Shadowsocks.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] libeay32_dll { + get { + object obj = ResourceManager.GetObject("libeay32_dll", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// diff --git a/shadowsocks-csharp/Properties/Resources.resx b/shadowsocks-csharp/Properties/Resources.resx index a644b5f9..f196cbea 100755 --- a/shadowsocks-csharp/Properties/Resources.resx +++ b/shadowsocks-csharp/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Data\libeay32.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Data\polarssl.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 2fa3cf78..7629f4fc 100755 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -76,6 +76,8 @@ + + @@ -122,6 +124,7 @@ Designer +