Note: If you want to compile it by yourself, please make sure do NOT use `no-asm` configure option, since the main point of this commit is to utilize assembly in openssl Add OpenSSL testtags/4.0.8
@@ -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 |
@@ -85,6 +85,7 @@ namespace Shadowsocks.Controller | |||||
// Start an asynchronous socket to listen for connections. | // Start an asynchronous socket to listen for connections. | ||||
Logging.Info("Shadowsocks started"); | Logging.Info("Shadowsocks started"); | ||||
Logging.Info(Encryption.EncryptorFactory.DumpRegisteredEncryptor()); | |||||
_tcpSocket.BeginAccept(new AsyncCallback(AcceptCallback), _tcpSocket); | _tcpSocket.BeginAccept(new AsyncCallback(AcceptCallback), _tcpSocket); | ||||
UDPState udpState = new UDPState(); | UDPState udpState = new UDPState(); | ||||
udpState.socket = _udpSocket; | udpState.socket = _udpSocket; | ||||
@@ -127,9 +127,9 @@ namespace Shadowsocks.Encryption.AEAD | |||||
public static void randBytes(byte[] buf, int length) { RNG.GetBytes(buf, length); } | 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 | #region TCP | ||||
@@ -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-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-192-gcm", new EncryptorInfo("AES-192-GCM", 24, 24, 12, 16, CIPHER_AES)}, | ||||
@@ -48,6 +48,7 @@ namespace Shadowsocks.Encryption.AEAD | |||||
{ | { | ||||
_decryptCtx = ctx; | _decryptCtx = ctx; | ||||
} | } | ||||
MbedTLS.cipher_init(ctx); | MbedTLS.cipher_init(ctx); | ||||
if (MbedTLS.cipher_setup(ctx, MbedTLS.cipher_info_from_string(_innerLibName)) != 0) | if (MbedTLS.cipher_setup(ctx, MbedTLS.cipher_info_from_string(_innerLibName)) != 0) | ||||
throw new System.Exception("Cannot initialize mbed TLS cipher context"); | 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"); | 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 | // buf: all plaintext | ||||
// outbuf: ciphertext + tag | // outbuf: ciphertext + tag | ||||
@@ -87,18 +88,18 @@ namespace Shadowsocks.Encryption.AEAD | |||||
/* cipher */ | /* cipher */ | ||||
ciphertext, ref olen, | ciphertext, ref olen, | ||||
tagbuf, (uint) tagLen); | 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); | Debug.Assert(olen == plen); | ||||
// attach tag to ciphertext | // attach tag to ciphertext | ||||
Array.Copy(tagbuf, 0, ciphertext, (int) plen, tagLen); | Array.Copy(tagbuf, 0, ciphertext, (int) plen, tagLen); | ||||
clen = olen + (uint) tagLen; | clen = olen + (uint) tagLen; | ||||
return ret; | |||||
break; | |||||
default: | default: | ||||
throw new System.Exception("not implemented"); | 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 | // buf: ciphertext + tag | ||||
// outbuf: plaintext | // outbuf: plaintext | ||||
@@ -116,10 +117,10 @@ namespace Shadowsocks.Encryption.AEAD | |||||
ciphertext, (uint) (clen - tagLen), | ciphertext, (uint) (clen - tagLen), | ||||
plaintext, ref olen, | plaintext, ref olen, | ||||
tagbuf, (uint) tagLen); | 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); | Debug.Assert(olen == clen - tagLen); | ||||
plen = olen; | plen = olen; | ||||
return ret; | |||||
break; | |||||
default: | default: | ||||
throw new System.Exception("not implemented"); | throw new System.Exception("not implemented"); | ||||
} | } | ||||
@@ -163,6 +164,7 @@ namespace Shadowsocks.Encryption.AEAD | |||||
Marshal.FreeHGlobal(_encryptCtx); | Marshal.FreeHGlobal(_encryptCtx); | ||||
_encryptCtx = IntPtr.Zero; | _encryptCtx = IntPtr.Zero; | ||||
} | } | ||||
if (_decryptCtx != IntPtr.Zero) | if (_decryptCtx != IntPtr.Zero) | ||||
{ | { | ||||
MbedTLS.cipher_free(_decryptCtx); | MbedTLS.cipher_free(_decryptCtx); | ||||
@@ -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 | |||||
} | |||||
} |
@@ -22,7 +22,7 @@ namespace Shadowsocks.Encryption.AEAD | |||||
_sodiumDecSubkey = new byte[keyLen]; | _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)}, | {"chacha20-ietf-poly1305", new EncryptorInfo(32, 32, 12, 16, CIPHER_CHACHA20IETFPOLY1305)}, | ||||
{"aes-256-gcm", new EncryptorInfo(32, 32, 12, 16, CIPHER_AES256GCM)}, | {"aes-256-gcm", new EncryptorInfo(32, 32, 12, 16, CIPHER_AES256GCM)}, | ||||
@@ -46,7 +46,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); | Debug.Assert(_sodiumEncSubkey != null); | ||||
// buf: all plaintext | // buf: all plaintext | ||||
@@ -75,13 +75,12 @@ namespace Shadowsocks.Encryption.AEAD | |||||
default: | default: | ||||
throw new System.Exception("not implemented"); | 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); | Logging.Dump("after cipherEncrypt: cipher", ciphertext, (int) encClen); | ||||
clen = (uint) 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); | Debug.Assert(_sodiumDecSubkey != null); | ||||
// buf: ciphertext + tag | // buf: ciphertext + tag | ||||
@@ -111,10 +110,9 @@ namespace Shadowsocks.Encryption.AEAD | |||||
throw new System.Exception("not implemented"); | 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); | Logging.Dump("after cipherDecrypt: plain", plaintext, (int) decPlen); | ||||
plen = (uint) decPlen; | plen = (uint) decPlen; | ||||
return ret; | |||||
} | } | ||||
public override void Dispose() | public override void Dispose() | ||||
@@ -1,6 +1,7 @@ | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Reflection; | using System.Reflection; | ||||
using System.Text; | |||||
using Shadowsocks.Encryption.AEAD; | using Shadowsocks.Encryption.AEAD; | ||||
using Shadowsocks.Encryption.Stream; | using Shadowsocks.Encryption.Stream; | ||||
@@ -26,21 +27,42 @@ namespace Shadowsocks.Encryption | |||||
AEADSodiumEncryptorSupportedCiphers.Remove("aes-256-gcm"); | 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()) | 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) | 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 = "aes-256-cfb"; | ||||
} | } | ||||
method = method.ToLowerInvariant(); | method = method.ToLowerInvariant(); | ||||
Type t = _registeredEncryptors[method]; | Type t = _registeredEncryptors[method]; | ||||
ConstructorInfo c = t.GetConstructor(ConstructorTypes); | ConstructorInfo c = t.GetConstructor(ConstructorTypes); | ||||
if (c == null) throw new System.Exception("Invalid ctor"); | if (c == null) throw new System.Exception("Invalid ctor"); | ||||
IEncryptor result = (IEncryptor) c.Invoke(new object[] {method, password}); | IEncryptor result = (IEncryptor) c.Invoke(new object[] {method, password}); | ||||
return result; | 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(); | |||||
} | |||||
} | } | ||||
} | } |
@@ -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 = "libcrypto-1_1.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.libcrypto_1_1_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); | |||||
} | |||||
} |
@@ -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-cfb64", 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 | |||||
} | |||||
} |
@@ -27,7 +27,7 @@ namespace Shadowsocks.Encryption.Stream | |||||
_decryptBuf = new byte[MAX_INPUT_SIZE + SODIUM_BLOCK_SIZE]; | _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) }, | { "salsa20", new EncryptorInfo(32, 8, CIPHER_SALSA20) }, | ||||
{ "chacha20", new EncryptorInfo(32, 8, CIPHER_CHACHA20) }, | { "chacha20", new EncryptorInfo(32, 8, CIPHER_CHACHA20) }, | ||||
{ "chacha20-ietf", new EncryptorInfo(32, 12, CIPHER_CHACHA20_IETF) } | { "chacha20-ietf", new EncryptorInfo(32, 12, CIPHER_CHACHA20_IETF) } | ||||
@@ -1,10 +1,10 @@ | |||||
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ | ||||
// <auto-generated> | // <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> | // </auto-generated> | ||||
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ | ||||
@@ -13,13 +13,13 @@ namespace Shadowsocks.Properties { | |||||
/// <summary> | /// <summary> | ||||
/// A strongly-typed resource class, for looking up localized strings, etc. | |||||
/// 一个强类型的资源类,用于查找本地化的字符串等。 | |||||
/// </summary> | /// </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.Diagnostics.DebuggerNonUserCodeAttribute()] | ||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] | [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] | ||||
internal class Resources { | internal class Resources { | ||||
@@ -33,7 +33,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Returns the cached ResourceManager instance used by this class. | |||||
/// 返回此类使用的缓存的 ResourceManager 实例。 | |||||
/// </summary> | /// </summary> | ||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | ||||
internal static global::System.Resources.ResourceManager ResourceManager { | internal static global::System.Resources.ResourceManager ResourceManager { | ||||
@@ -47,8 +47,8 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Overrides the current thread's CurrentUICulture property for all | |||||
/// resource lookups using this strongly typed resource class. | |||||
/// 使用此强类型资源类,为所有资源查找 | |||||
/// 重写当前线程的 CurrentUICulture 属性。 | |||||
/// </summary> | /// </summary> | ||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] | ||||
internal static global::System.Globalization.CultureInfo Culture { | internal static global::System.Globalization.CultureInfo Culture { | ||||
@@ -61,7 +61,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] abp_js { | internal static byte[] abp_js { | ||||
get { | get { | ||||
@@ -71,28 +71,28 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized string similar to # translation for Japanese | |||||
/// 查找类似 # translation for Japanese | |||||
/// | /// | ||||
///Shadowsocks=Shadowsocks | ///Shadowsocks=Shadowsocks | ||||
/// | /// | ||||
///# Menu items | ///# Menu items | ||||
/// | /// | ||||
///Enable System Proxy=システムの代理を有効にする | |||||
///Enable System Proxy=システム プロキシを有効にする | |||||
///Mode=モード | ///Mode=モード | ||||
///PAC=PAC | ///PAC=PAC | ||||
///Global=全般 | ///Global=全般 | ||||
///Servers=サーバ | |||||
///Edit Servers...=サーバーを編集する... | |||||
///Servers=サーバー | |||||
///Edit Servers...=サーバーの編集... | |||||
///Statistics Config...=統計情報の設定... | ///Statistics Config...=統計情報の設定... | ||||
///Start on Boot=システムと同時に起動 | ///Start on Boot=システムと同時に起動 | ||||
///Forward Proxy...=代理を転送する... | |||||
///Allow Clients from LAN=LANからのクライアントを許可する | |||||
///Forward Proxy...=フォワードプロキシの設定... | |||||
///Allow Clients from LAN=LAN からのアクセスを許可 | |||||
///Local PAC=ローカル PAC | ///Local PAC=ローカル PAC | ||||
///Online 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]";. | |||||
///Edit Local PAC File...=ローカル PAC ファイルの編集... | |||||
///Update Local PAC from GFWList=GFWList からローカル PAC を更新 | |||||
///Edit User Rule for GFWList...=ユーザールールの編集... | |||||
///Secure Local [字符串的其余部分被截断]"; 的本地化字符串。 | |||||
/// </summary> | /// </summary> | ||||
internal static string ja { | internal static string ja { | ||||
get { | get { | ||||
@@ -101,7 +101,17 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | |||||
internal static byte[] libcrypto_1_1_dll { | |||||
get { | |||||
object obj = ResourceManager.GetObject("libcrypto_1_1_dll", resourceCulture); | |||||
return ((byte[])(obj)); | |||||
} | |||||
} | |||||
/// <summary> | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] libsscrypto_dll { | internal static byte[] libsscrypto_dll { | ||||
get { | get { | ||||
@@ -111,7 +121,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] mgwz_dll { | internal static byte[] mgwz_dll { | ||||
get { | get { | ||||
@@ -121,14 +131,14 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <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 | ///toggle 0 | ||||
///logfile ss_privoxy.log | ///logfile ss_privoxy.log | ||||
///show-on-task-bar 0 | ///show-on-task-bar 0 | ||||
///activity-animation 0 | ///activity-animation 0 | ||||
///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ . | ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ . | ||||
///hide-console | ///hide-console | ||||
///. | |||||
/// 的本地化字符串。 | |||||
/// </summary> | /// </summary> | ||||
internal static string privoxy_conf { | internal static string privoxy_conf { | ||||
get { | get { | ||||
@@ -137,7 +147,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] privoxy_exe { | internal static byte[] privoxy_exe { | ||||
get { | get { | ||||
@@ -147,7 +157,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] proxy_pac_txt { | internal static byte[] proxy_pac_txt { | ||||
get { | get { | ||||
@@ -157,7 +167,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ss16 { | internal static System.Drawing.Bitmap ss16 { | ||||
get { | get { | ||||
@@ -167,7 +177,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ss20 { | internal static System.Drawing.Bitmap ss20 { | ||||
get { | get { | ||||
@@ -177,7 +187,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ss24 { | internal static System.Drawing.Bitmap ss24 { | ||||
get { | get { | ||||
@@ -187,7 +197,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ssIn24 { | internal static System.Drawing.Bitmap ssIn24 { | ||||
get { | get { | ||||
@@ -197,7 +207,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ssOut24 { | internal static System.Drawing.Bitmap ssOut24 { | ||||
get { | get { | ||||
@@ -207,7 +217,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Drawing.Bitmap. | |||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static System.Drawing.Bitmap ssw128 { | internal static System.Drawing.Bitmap ssw128 { | ||||
get { | get { | ||||
@@ -217,7 +227,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] sysproxy_exe { | internal static byte[] sysproxy_exe { | ||||
get { | get { | ||||
@@ -227,7 +237,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized resource of type System.Byte[]. | |||||
/// 查找 System.Byte[] 类型的本地化资源。 | |||||
/// </summary> | /// </summary> | ||||
internal static byte[] sysproxy64_exe { | internal static byte[] sysproxy64_exe { | ||||
get { | get { | ||||
@@ -237,9 +247,9 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <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 | ///! See https://adblockplus.org/en/filter-cheatsheet | ||||
///. | |||||
/// 的本地化字符串。 | |||||
/// </summary> | /// </summary> | ||||
internal static string user_rule { | internal static string user_rule { | ||||
get { | get { | ||||
@@ -248,7 +258,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized string similar to # translation for Simplified Chinese | |||||
/// 查找类似 # translation for Simplified Chinese | |||||
/// | /// | ||||
///Shadowsocks=Shadowsocks | ///Shadowsocks=Shadowsocks | ||||
/// | /// | ||||
@@ -270,7 +280,7 @@ namespace Shadowsocks.Properties { | |||||
///Update Local PAC from GFWList=从 GFWList 更新本地 PAC | ///Update Local PAC from GFWList=从 GFWList 更新本地 PAC | ||||
///Edit User Rule for GFWList...=编辑 GFWList 的用户规则... | ///Edit User Rule for GFWList...=编辑 GFWList 的用户规则... | ||||
///Secure Local PAC=保护本地 PAC | ///Secure Local PAC=保护本地 PAC | ||||
///Cop [rest of string was truncated]";. | |||||
///Cop [字符串的其余部分被截断]"; 的本地化字符串。 | |||||
/// </summary> | /// </summary> | ||||
internal static string zh_CN { | internal static string zh_CN { | ||||
get { | get { | ||||
@@ -279,7 +289,7 @@ namespace Shadowsocks.Properties { | |||||
} | } | ||||
/// <summary> | /// <summary> | ||||
/// Looks up a localized string similar to # translation for Traditional Chinese | |||||
/// 查找类似 # translation for Traditional Chinese | |||||
/// | /// | ||||
///Shadowsocks=Shadowsocks | ///Shadowsocks=Shadowsocks | ||||
/// | /// | ||||
@@ -300,7 +310,7 @@ namespace Shadowsocks.Properties { | |||||
///Edit Local PAC File...=編輯本機 PAC 檔案... | ///Edit Local PAC File...=編輯本機 PAC 檔案... | ||||
///Update Local PAC from GFWList=從 GFWList 更新本機 PAC | ///Update Local PAC from GFWList=從 GFWList 更新本機 PAC | ||||
///Edit User Rule for GFWList...=編輯 GFWList 的使用者規則... | ///Edit User Rule for GFWList...=編輯 GFWList 的使用者規則... | ||||
///Secure Local PAC=安全本機 [rest of string was truncated]";. | |||||
///Secure Local PAC=安全本機 [字符串的其余部分被截断]"; 的本地化字符串。 | |||||
/// </summary> | /// </summary> | ||||
internal static string zh_TW { | internal static string zh_TW { | ||||
get { | get { | ||||
@@ -124,6 +124,9 @@ | |||||
<data name="ja" type="System.Resources.ResXFileRef, System.Windows.Forms"> | <data name="ja" type="System.Resources.ResXFileRef, System.Windows.Forms"> | ||||
<value>..\Data\ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value> | <value>..\Data\ja.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value> | ||||
</data> | </data> | ||||
<data name="libcrypto_1_1_dll" type="System.Resources.ResXFileRef, System.Windows.Forms"> | |||||
<value>..\Data\libcrypto-1_1.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | |||||
</data> | |||||
<data name="libsscrypto_dll" type="System.Resources.ResXFileRef, System.Windows.Forms"> | <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> | ||||
</data> | </data> | ||||
@@ -96,6 +96,7 @@ | |||||
<Compile Include="Controller\System\Hotkeys\HotkeyCallbacks.cs" /> | <Compile Include="Controller\System\Hotkeys\HotkeyCallbacks.cs" /> | ||||
<Compile Include="Encryption\AEAD\AEADEncryptor.cs" /> | <Compile Include="Encryption\AEAD\AEADEncryptor.cs" /> | ||||
<Compile Include="Encryption\AEAD\AEADMbedTLSEncryptor.cs" /> | <Compile Include="Encryption\AEAD\AEADMbedTLSEncryptor.cs" /> | ||||
<Compile Include="Encryption\AEAD\AEADOpenSSLEncryptor.cs" /> | |||||
<Compile Include="Encryption\AEAD\AEADSodiumEncryptor.cs" /> | <Compile Include="Encryption\AEAD\AEADSodiumEncryptor.cs" /> | ||||
<Compile Include="Encryption\CircularBuffer\ByteCircularBuffer.cs" /> | <Compile Include="Encryption\CircularBuffer\ByteCircularBuffer.cs" /> | ||||
<Compile Include="Encryption\EncryptorBase.cs" /> | <Compile Include="Encryption\EncryptorBase.cs" /> | ||||
@@ -103,10 +104,12 @@ | |||||
<Compile Include="Encryption\Exception\CryptoException.cs" /> | <Compile Include="Encryption\Exception\CryptoException.cs" /> | ||||
<Compile Include="Encryption\IEncryptor.cs" /> | <Compile Include="Encryption\IEncryptor.cs" /> | ||||
<Compile Include="Encryption\MbedTLS.cs" /> | <Compile Include="Encryption\MbedTLS.cs" /> | ||||
<Compile Include="Encryption\OpenSSL.cs" /> | |||||
<Compile Include="Encryption\RNG.cs" /> | <Compile Include="Encryption\RNG.cs" /> | ||||
<Compile Include="Encryption\Sodium.cs" /> | <Compile Include="Encryption\Sodium.cs" /> | ||||
<Compile Include="Encryption\Stream\StreamEncryptor.cs" /> | <Compile Include="Encryption\Stream\StreamEncryptor.cs" /> | ||||
<Compile Include="Encryption\Stream\StreamMbedTLSEncryptor.cs" /> | <Compile Include="Encryption\Stream\StreamMbedTLSEncryptor.cs" /> | ||||
<Compile Include="Encryption\Stream\StreamOpenSSLEncryptor.cs" /> | |||||
<Compile Include="Encryption\Stream\StreamSodiumEncryptor.cs" /> | <Compile Include="Encryption\Stream\StreamSodiumEncryptor.cs" /> | ||||
<Compile Include="Model\HotKeyConfig.cs" /> | <Compile Include="Model\HotKeyConfig.cs" /> | ||||
<Compile Include="Model\ProxyConfig.cs" /> | <Compile Include="Model\ProxyConfig.cs" /> | ||||
@@ -243,6 +246,7 @@ | |||||
<SubType>Designer</SubType> | <SubType>Designer</SubType> | ||||
</None> | </None> | ||||
<None Include="Data\abp.js.gz" /> | <None Include="Data\abp.js.gz" /> | ||||
<None Include="Data\libcrypto-1_1.dll.gz" /> | |||||
<None Include="Data\libsscrypto.dll.gz" /> | <None Include="Data\libsscrypto.dll.gz" /> | ||||
<None Include="Data\mgwz.dll.gz" /> | <None Include="Data\mgwz.dll.gz" /> | ||||
<None Include="Data\privoxy.exe.gz" /> | <None Include="Data\privoxy.exe.gz" /> | ||||
@@ -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] | [TestMethod] | ||||
public void ParseAndGenerateShadowsocksUrl() | public void ParseAndGenerateShadowsocksUrl() | ||||
{ | { | ||||