Browse Source

Merge pull request #16 from mengskysama/master

Encryptor bugfix
tags/2.3
clowwindy 10 years ago
parent
commit
4ede5c20f9
2 changed files with 6 additions and 6 deletions
  1. +2
    -2
      shadowsocks-csharp/Encrypt/OpensslEncryptor.cs
  2. +4
    -4
      shadowsocks-csharp/Local.cs

+ 2
- 2
shadowsocks-csharp/Encrypt/OpensslEncryptor.cs View File

@@ -13,7 +13,7 @@ namespace shadowsocks_csharp.Encrypt
public OpensslEncryptor(string method, string password) public OpensslEncryptor(string method, string password)
: base(method, password) : base(method, password)
{ {
InitKey(Method, Password);
InitKey(method, password);
} }


public override byte[] Encrypt(byte[] buf, int length) public override byte[] Encrypt(byte[] buf, int length)
@@ -79,7 +79,7 @@ namespace shadowsocks_csharp.Encrypt
private IntPtr _encryptCtx; private IntPtr _encryptCtx;
private IntPtr _decryptCtx; private IntPtr _decryptCtx;


private void InitKey(string password, string method)
private void InitKey(string method, string password)
{ {
string k = method + ":" + password; string k = method + ":" + password;
if (CachedKeys.ContainsKey(k)) if (CachedKeys.ContainsKey(k))


+ 4
- 4
shadowsocks-csharp/Local.cs View File

@@ -54,10 +54,10 @@ namespace shadowsocks_csharp
// Get the socket that handles the client request. // Get the socket that handles the client request.
Socket listener = (Socket)ar.AsyncState; Socket listener = (Socket)ar.AsyncState;
if (!listener.Connected)
{
return;
}
//if (!listener.Connected)
//{
// return;
//}
listener.BeginAccept( listener.BeginAccept(
new AsyncCallback(AcceptCallback), new AsyncCallback(AcceptCallback),


Loading…
Cancel
Save