diff --git a/websocket-sharp.userprefs b/websocket-sharp.userprefs index c1a56c57..64f7189b 100644 --- a/websocket-sharp.userprefs +++ b/websocket-sharp.userprefs @@ -1,8 +1,8 @@  - + - + diff --git a/websocket-sharp/AssemblyInfo.cs b/websocket-sharp/AssemblyInfo.cs index 89a8f31a..1dc4f231 100644 --- a/websocket-sharp/AssemblyInfo.cs +++ b/websocket-sharp/AssemblyInfo.cs @@ -17,7 +17,7 @@ using System.Runtime.CompilerServices; // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyVersion("0.9.9.*")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs index 54934a29..12fc5ee1 100644 --- a/websocket-sharp/Ext.cs +++ b/websocket-sharp/Ext.cs @@ -28,7 +28,6 @@ using System; using System.Collections.Generic; -using System.Linq; namespace WebSocketSharp { @@ -41,58 +40,6 @@ namespace WebSocketSharp return b == Convert.ToByte(c); } - public static uint GenerateKey(this Random rand, int space) - { - uint max = (uint)(0xffffffff / space); - - int upper16 = (int)((max & 0xffff0000) >> 16); - int lower16 = (int)(max & 0x0000ffff); - - return ((uint)rand.Next(upper16 + 1) << 16) + (uint)rand.Next(lower16 + 1); - } - - public static char GeneratePrintableASCIIwithoutSPandNum(this Random rand) - { - int ascii = rand.Next(2) == 0 ? rand.Next(33, 48) : rand.Next(58, 127); - return Convert.ToChar(ascii); - } - - public static string GenerateSecKey(this Random rand, out uint key) - { - int space = rand.Next(1, 13); - int ascii = rand.Next(1, 13); - - key = rand.GenerateKey(space); - - long mKey = key * space; - List secKey = new List(mKey.ToString().ToCharArray()); - - int i; - ascii.Times( () => - { - i = rand.Next(secKey.Count + 1); - secKey.Insert(i, rand.GeneratePrintableASCIIwithoutSPandNum()); - } ); - - space.Times( () => - { - i = rand.Next(1, secKey.Count); - secKey.Insert(i, ' '); - } ); - - return new String(secKey.ToArray()); - } - - public static Byte[] InitializeWithPrintableASCII(this Byte[] bytes, Random rand) - { - for (int i = 0; i < bytes.Length; i++) - { - bytes[i] = (byte)rand.Next(32, 127); - } - - return bytes; - } - public static void NotEqualsDo(this string expected, string actual, Action act) { if (expected != actual) @@ -100,13 +47,5 @@ namespace WebSocketSharp act(expected, actual); } } - - public static void Times(this int n, Action act) - { - for (int i = 0; i < n; i++) - { - act(); - } - } } } diff --git a/websocket-sharp/WebSocket.cs b/websocket-sharp/WebSocket.cs index 865fd211..d814456c 100644 --- a/websocket-sharp/WebSocket.cs +++ b/websocket-sharp/WebSocket.cs @@ -33,13 +33,11 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Net; using System.Net.Security; using System.Net.Sockets; using System.Text; using System.Threading; -using System.Security.Cryptography; namespace WebSocketSharp { @@ -248,12 +246,7 @@ namespace WebSocketSharp private void doHandshake() { -#if !CHALLENGE string request = createOpeningHandshake(); -#else - byte[] expectedRes, actualRes = new byte[16]; - string request = createOpeningHandshake(out expectedRes); -#endif #if DEBUG Console.WriteLine("WS: Info @doHandshake: Handshake from client: \n{0}", request); #endif @@ -270,10 +263,6 @@ namespace WebSocketSharp wsStream.ReadByte().EqualsWithSaveTo('\r', rawdata) && wsStream.ReadByte().EqualsWithSaveTo('\n', rawdata)) { -#if CHALLENGE - wsStream.Read(actualRes, 0, actualRes.Length); - rawdata.AddRange(actualRes); -#endif break; } } @@ -292,21 +281,14 @@ namespace WebSocketSharp { throw new IOException("Invalid handshake response: " + a); }; -#if !CHALLENGE + "HTTP/1.1 101 Web Socket Protocol Handshake".NotEqualsDo(response[0], act); -#else - "HTTP/1.1 101 WebSocket Protocol Handshake".NotEqualsDo(response[0], act); -#endif "Upgrade: WebSocket".NotEqualsDo(response[1], act); "Connection: Upgrade".NotEqualsDo(response[2], act); for (int i = 3; i < response.Length; i++) { -#if !CHALLENGE if (response[i].Contains("WebSocket-Protocol:")) -#else - if (response[i].Contains("Sec-WebSocket-Protocol:")) -#endif { int j = response[i].IndexOf(":"); protocol = response[i].Substring(j + 1).Trim(); @@ -315,29 +297,11 @@ namespace WebSocketSharp } #if DEBUG Console.WriteLine("WS: Info @doHandshake: Sub protocol: {0}", protocol); -#endif -#if CHALLENGE - string expectedResToHexStr = BitConverter.ToString(expectedRes); - string actualResToHexStr = BitConverter.ToString(actualRes); - - expectedResToHexStr.NotEqualsDo(actualResToHexStr, (e, a) => - { - #if DEBUG - Console.WriteLine("WS: Error @doHandshake: Invalid challenge response."); - Console.WriteLine("\texpected: {0}", e); - Console.WriteLine("\tactual : {0}", a); - #endif - throw new IOException("Invalid challenge response: " + a); - }); #endif ReadyState = WsState.OPEN; } -#if !CHALLENGE private string createOpeningHandshake() -#else - private string createOpeningHandshake(out byte[] expectedRes) -#endif { string path = uri.PathAndQuery; string host = uri.DnsSafeHost; @@ -350,43 +314,18 @@ namespace WebSocketSharp } string subProtocol = protocol != String.Empty -#if !CHALLENGE ? String.Format("WebSocket-Protocol: {0}\r\n", protocol) -#else - ? String.Format("Sec-WebSocket-Protocol: {0}\r\n", protocol) -#endif : protocol; -#if !CHALLENGE - string secKeys = String.Empty; - string key3ToAscii = String.Empty; -#else - Random rand = new Random(); - uint key1, key2; - string secKey1 = rand.GenerateSecKey(out key1); - string secKey2 = rand.GenerateSecKey(out key2); - - byte[] key3 = new byte[8].InitializeWithPrintableASCII(rand); - - string secKeys = "Sec-WebSocket-Key1: {0}\r\n" + - "Sec-WebSocket-Key2: {1}\r\n"; - secKeys = String.Format(secKeys, secKey1, secKey2); - - string key3ToAscii = Encoding.ASCII.GetString(key3); - - expectedRes = createExpectedRes(key1, key2, key3); -#endif return "GET " + path + " HTTP/1.1\r\n" + "Upgrade: WebSocket\r\n" + "Connection: Upgrade\r\n" + subProtocol + "Host: " + host + "\r\n" + "Origin: " + origin + "\r\n" + - secKeys + - "\r\n" + - key3ToAscii; + "\r\n"; } - +/* private byte[] createExpectedRes(uint key1, uint key2, byte[] key3) { byte[] key1Bytes = BitConverter.GetBytes(key1); @@ -400,7 +339,7 @@ namespace WebSocketSharp MD5 md5 = MD5.Create(); return md5.ComputeHash(concatKeys); } - + */ private void message() { #if DEBUG diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll b/websocket-sharp/bin/Debug/websocket-sharp.dll index b33f3d66..03e626cc 100755 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll and b/websocket-sharp/bin/Debug/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb index 84b9cea6..e2e33d9d 100644 Binary files a/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll index 80b26186..bc1e76e8 100755 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 03f71e02..00df25d5 100644 Binary files a/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/websocket-sharp/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/websocket-sharp/bin/Release/websocket-sharp.dll b/websocket-sharp/bin/Release/websocket-sharp.dll index 82caef18..14a15a07 100755 Binary files a/websocket-sharp/bin/Release/websocket-sharp.dll and b/websocket-sharp/bin/Release/websocket-sharp.dll differ diff --git a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll index 2a3946e0..48eac99d 100755 Binary files a/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll and b/websocket-sharp/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/websocket-sharp/websocket-sharp.csproj b/websocket-sharp/websocket-sharp.csproj index 4f902fb8..8d32d7f1 100644 --- a/websocket-sharp/websocket-sharp.csproj +++ b/websocket-sharp/websocket-sharp.csproj @@ -18,7 +18,7 @@ full false bin\Debug - DEBUG,CHALLENGE + DEBUG prompt 4 false @@ -36,7 +36,7 @@ full false bin\Debug_Ubuntu - DEBUG,CHALLENGE + DEBUG prompt 4 false diff --git a/websocket-sharp/websocket-sharp.pidb b/websocket-sharp/websocket-sharp.pidb index f9110761..a74c8087 100644 Binary files a/websocket-sharp/websocket-sharp.pidb and b/websocket-sharp/websocket-sharp.pidb differ diff --git a/wsclient/bin/Debug/websocket-sharp.dll b/wsclient/bin/Debug/websocket-sharp.dll index b33f3d66..03e626cc 100755 Binary files a/wsclient/bin/Debug/websocket-sharp.dll and b/wsclient/bin/Debug/websocket-sharp.dll differ diff --git a/wsclient/bin/Debug/websocket-sharp.dll.mdb b/wsclient/bin/Debug/websocket-sharp.dll.mdb index 84b9cea6..e2e33d9d 100644 Binary files a/wsclient/bin/Debug/websocket-sharp.dll.mdb and b/wsclient/bin/Debug/websocket-sharp.dll.mdb differ diff --git a/wsclient/bin/Debug/wsclient.exe b/wsclient/bin/Debug/wsclient.exe index 8f3d39f1..3d06a070 100755 Binary files a/wsclient/bin/Debug/wsclient.exe and b/wsclient/bin/Debug/wsclient.exe differ diff --git a/wsclient/bin/Debug/wsclient.exe.mdb b/wsclient/bin/Debug/wsclient.exe.mdb index b7038045..8a9f8238 100644 Binary files a/wsclient/bin/Debug/wsclient.exe.mdb and b/wsclient/bin/Debug/wsclient.exe.mdb differ diff --git a/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll b/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll index 80b26186..bc1e76e8 100755 Binary files a/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll and b/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll differ diff --git a/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll.mdb b/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll.mdb index 03f71e02..00df25d5 100644 Binary files a/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll.mdb and b/wsclient/bin/Debug_Ubuntu/websocket-sharp.dll.mdb differ diff --git a/wsclient/bin/Debug_Ubuntu/wsclient.exe b/wsclient/bin/Debug_Ubuntu/wsclient.exe index 246a33c4..02f1c239 100755 Binary files a/wsclient/bin/Debug_Ubuntu/wsclient.exe and b/wsclient/bin/Debug_Ubuntu/wsclient.exe differ diff --git a/wsclient/bin/Debug_Ubuntu/wsclient.exe.mdb b/wsclient/bin/Debug_Ubuntu/wsclient.exe.mdb index d3cb2c6a..2b75a9c4 100644 Binary files a/wsclient/bin/Debug_Ubuntu/wsclient.exe.mdb and b/wsclient/bin/Debug_Ubuntu/wsclient.exe.mdb differ diff --git a/wsclient/bin/Release/websocket-sharp.dll b/wsclient/bin/Release/websocket-sharp.dll index 82caef18..14a15a07 100755 Binary files a/wsclient/bin/Release/websocket-sharp.dll and b/wsclient/bin/Release/websocket-sharp.dll differ diff --git a/wsclient/bin/Release/wsclient.exe b/wsclient/bin/Release/wsclient.exe index 432e7468..68ddcb05 100755 Binary files a/wsclient/bin/Release/wsclient.exe and b/wsclient/bin/Release/wsclient.exe differ diff --git a/wsclient/bin/Release_Ubuntu/websocket-sharp.dll b/wsclient/bin/Release_Ubuntu/websocket-sharp.dll index 2a3946e0..48eac99d 100755 Binary files a/wsclient/bin/Release_Ubuntu/websocket-sharp.dll and b/wsclient/bin/Release_Ubuntu/websocket-sharp.dll differ diff --git a/wsclient/bin/Release_Ubuntu/wsclient.exe b/wsclient/bin/Release_Ubuntu/wsclient.exe index 92ea1e26..5954d73a 100755 Binary files a/wsclient/bin/Release_Ubuntu/wsclient.exe and b/wsclient/bin/Release_Ubuntu/wsclient.exe differ diff --git a/wsclient/wsclient.pidb b/wsclient/wsclient.pidb index 214097e1..00f775c5 100644 Binary files a/wsclient/wsclient.pidb and b/wsclient/wsclient.pidb differ