diff --git a/CompressIPUI/Program.cs b/CompressIPUI/Program.cs index ff73722..a4e7c4f 100644 --- a/CompressIPUI/Program.cs +++ b/CompressIPUI/Program.cs @@ -54,6 +54,7 @@ static async Task Main(string[] args) }; await client.SubscribeAsync(cts.Token); await client.RunAsync(cts.Token); + cts.Cancel(); } } catch (OperationCanceledException) diff --git a/RfpProxy.AaMiDe/AaMiDe/AaMiDeMessage.cs b/RfpProxy.AaMiDe/AaMiDe/AaMiDeMessage.cs index 70b3006..151f55e 100644 --- a/RfpProxy.AaMiDe/AaMiDe/AaMiDeMessage.cs +++ b/RfpProxy.AaMiDe/AaMiDe/AaMiDeMessage.cs @@ -13,6 +13,8 @@ public abstract class AaMiDeMessage { private readonly ushort _length; + public int MessageLength => _length + 4; + public virtual ushort Length => 4; public virtual bool HasUnknown => !Raw.IsEmpty; diff --git a/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeElement.cs b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeElement.cs index ef264b1..ea66a71 100644 --- a/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeElement.cs +++ b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeElement.cs @@ -60,6 +60,8 @@ public static DeTeWeElement Create(DeTeWeType type, ReadOnlyMemory data) return new SendTextDeTeWeElement(data); case DeTeWeType.Reserved1: return new Reserved1DeTeWeElement(data); + case DeTeWeType.Unknown1C: + return new Unknown1CDeTeWeElement(data); default: return new UnknownDeTeWeElement(type, data); } diff --git a/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeType.cs b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeType.cs index 268115d..37a8851 100644 --- a/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeType.cs +++ b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/DeTeWeType.cs @@ -3,6 +3,7 @@ public enum DeTeWeType:byte { Language = 0x16, + Unknown1C = 0x1C, Display = 0x20, SendText = 0x21, DateTime = 0x23, diff --git a/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/Unknown1CDeTeWeElement.cs b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/Unknown1CDeTeWeElement.cs new file mode 100644 index 0000000..3014c67 --- /dev/null +++ b/RfpProxy.AaMiDe/AaMiDe/Nwk/InformationElements/Proprietary/DeTeWe/Unknown1CDeTeWeElement.cs @@ -0,0 +1,26 @@ +using System; +using System.IO; +using System.Text; + +namespace RfpProxy.AaMiDe.Nwk.InformationElements.Proprietary.DeTeWe +{ + public class Unknown1CDeTeWeElement : DeTeWeElement + { + public string Content { get; set; } + + public override bool HasUnknown => false; + + public override ReadOnlyMemory Raw => Memory.Empty; + + public Unknown1CDeTeWeElement(ReadOnlyMemory data) : base(DeTeWeType.Unknown1C, data) + { + Content = Encoding.UTF8.GetString(data.Span); + } + + public override void Log(TextWriter writer) + { + base.Log(writer); + writer.Write($"({Content})"); + } + } +} \ No newline at end of file diff --git a/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs b/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs index b1e1248..be8149d 100644 --- a/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs +++ b/RfpProxy.AaMiDe/AaMiDe/Sys/SysInitMessage.cs @@ -214,7 +214,7 @@ public enum RfpCapabilities : uint public override bool HasUnknown => true; - protected override ReadOnlyMemory Raw => base.Raw.Slice(Protocol > 0x040000?0x110:0xF4); + protected override ReadOnlyMemory Raw => base.Raw.Slice(Protocol > 0x080000?0x110:0xF4); public override ushort Length => (ushort) (base.Length + 0x110u); diff --git a/RfpProxy.Test/CryptoTest.cs b/RfpProxy.Test/CryptoTest.cs index 9ba4c79..8b1317e 100644 --- a/RfpProxy.Test/CryptoTest.cs +++ b/RfpProxy.Test/CryptoTest.cs @@ -14,7 +14,7 @@ public class CryptoTest { private readonly ITestOutputHelper _output; - private CryptedRfpConnection _connection; + private readonly CryptedRfpConnection _connection; public CryptoTest(ITestOutputHelper output) { @@ -72,14 +72,39 @@ public void CanCalculateInitSignature() } } + [Fact] + public void CanCalculateInitSignature2() + { + var sysInit = "01200110 0000000d 00080100 0030421b 17370000 00000000 0001ef3c 2a0d8ce8" + + "725371d0 d799a029 8dc02c73 4ac5b803 abc38663 b494de7b 2ffbe03d 70b616eb" + + "facf2e7d 85f61b29 5cba5c76 ea515501 b3c02b75 5862261b fc08ffde 00080201" + + "00000000 00000000 00000000 00000000 00000000 5349502d 44454354 20382e31" + + "5350332d 464b3234 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000"; + sysInit = sysInit.Replace(" ", String.Empty); + var signature_key = "e7adda3adb0521f3d3fbdf3a18ee8648b47398b1570c2b45ef8d2a9180a1a32c69284a9c97d444abf87f5c578f9428214dd0183cba969dc5"; + var sysAuthenticate = "a1ec05aa36940a9c027cc8abe70455011c33e8aac57860f6ac9c2d00432182b8"; + using (var md5 = MD5.Create()) + { + var data = HexEncoding.HexToByte(sysAuthenticate + sysInit + signature_key); + var hash = md5.ComputeHash(data); + _output.WriteLine(data.AsSpan().ToHex()); + _output.WriteLine(sysInit); + _output.WriteLine(hash.AsSpan().ToHex()); + Assert.Equal("cb8321c7401dd174d3b350fafaa7b770", hash.AsSpan().ToHex()); + } + } + [Fact] public void CanDecryptSysInit() { using (var aes = Aes.Create()) { var key = "e705bc1a92412f3262c547f87946936997e690ada46fad25bbc626f6f5a5a6ce"; - var ciphered = "705bb6102d8f709f94ad5ba7382bdf0ce136e535c109c1e9b2ffed6c5ced5fe4" + - "0cc2c769d9e6b9597447531e2731f107f15931a66359b1b465d3ae192bbbb614"; + var ciphered = "2a0d8ce8725371d0d799a0298dc02c734529d51993eaae643c932fe6c571ddde4529d51993eaae643c932fe6c571dddea43c1f587f49cc35509c1c58b7fef978"; ciphered = ciphered.Replace(" ", String.Empty); aes.KeySize = 256; aes.Padding = PaddingMode.None; @@ -94,11 +119,93 @@ public void CanDecryptSysInit() { s.Write(data); _output.WriteLine(plain.AsSpan().ToHex()); - _output.WriteLine(crc32(ms.ToArray()).ToString("x8")); + _output.WriteLine(crc32(ms.ToArray()).ToString("x8")); + _output.WriteLine(crc32(ms.ToArray().AsSpan(0,60).ToArray()).ToString("x8")); + _output.WriteLine(bettercrc(ms.ToArray().AsSpan(0,60)).ToString("x8")); } } + uint bettercrc(ReadOnlySpan data) + { + var result = 0u; + uint[] crc_table = { + 0x00000000, 0xB71DC104, 0x6E3B8209, 0xD926430D, + 0xDC760413, 0x6B6BC517, 0xB24D861A, 0x0550471E, + 0xB8ED0826, 0x0FF0C922, 0xD6D68A2F, 0x61CB4B2B, + 0x649B0C35, 0xD386CD31, 0x0AA08E3C, 0xBDBD4F38, + 0x70DB114C, 0xC7C6D048, 0x1EE09345, 0xA9FD5241, + 0xACAD155F, 0x1BB0D45B, 0xC2969756, 0x758B5652, + 0xC836196A, 0x7F2BD86E, 0xA60D9B63, 0x11105A67, + 0x14401D79, 0xA35DDC7D, 0x7A7B9F70, 0xCD665E74, + 0xE0B62398, 0x57ABE29C, 0x8E8DA191, 0x39906095, + 0x3CC0278B, 0x8BDDE68F, 0x52FBA582, 0xE5E66486, + 0x585B2BBE, 0xEF46EABA, 0x3660A9B7, 0x817D68B3, + 0x842D2FAD, 0x3330EEA9, 0xEA16ADA4, 0x5D0B6CA0, + 0x906D32D4, 0x2770F3D0, 0xFE56B0DD, 0x494B71D9, + 0x4C1B36C7, 0xFB06F7C3, 0x2220B4CE, 0x953D75CA, + 0x28803AF2, 0x9F9DFBF6, 0x46BBB8FB, 0xF1A679FF, + 0xF4F63EE1, 0x43EBFFE5, 0x9ACDBCE8, 0x2DD07DEC, + 0x77708634, 0xC06D4730, 0x194B043D, 0xAE56C539, + 0xAB068227, 0x1C1B4323, 0xC53D002E, 0x7220C12A, + 0xCF9D8E12, 0x78804F16, 0xA1A60C1B, 0x16BBCD1F, + 0x13EB8A01, 0xA4F64B05, 0x7DD00808, 0xCACDC90C, + 0x07AB9778, 0xB0B6567C, 0x69901571, 0xDE8DD475, + 0xDBDD936B, 0x6CC0526F, 0xB5E61162, 0x02FBD066, + 0xBF469F5E, 0x085B5E5A, 0xD17D1D57, 0x6660DC53, + 0x63309B4D, 0xD42D5A49, 0x0D0B1944, 0xBA16D840, + 0x97C6A5AC, 0x20DB64A8, 0xF9FD27A5, 0x4EE0E6A1, + 0x4BB0A1BF, 0xFCAD60BB, 0x258B23B6, 0x9296E2B2, + 0x2F2BAD8A, 0x98366C8E, 0x41102F83, 0xF60DEE87, + 0xF35DA999, 0x4440689D, 0x9D662B90, 0x2A7BEA94, + 0xE71DB4E0, 0x500075E4, 0x892636E9, 0x3E3BF7ED, + 0x3B6BB0F3, 0x8C7671F7, 0x555032FA, 0xE24DF3FE, + 0x5FF0BCC6, 0xE8ED7DC2, 0x31CB3ECF, 0x86D6FFCB, + 0x8386B8D5, 0x349B79D1, 0xEDBD3ADC, 0x5AA0FBD8, + 0xEEE00C69, 0x59FDCD6D, 0x80DB8E60, 0x37C64F64, + 0x3296087A, 0x858BC97E, 0x5CAD8A73, 0xEBB04B77, + 0x560D044F, 0xE110C54B, 0x38368646, 0x8F2B4742, + 0x8A7B005C, 0x3D66C158, 0xE4408255, 0x535D4351, + 0x9E3B1D25, 0x2926DC21, 0xF0009F2C, 0x471D5E28, + 0x424D1936, 0xF550D832, 0x2C769B3F, 0x9B6B5A3B, + 0x26D61503, 0x91CBD407, 0x48ED970A, 0xFFF0560E, + 0xFAA01110, 0x4DBDD014, 0x949B9319, 0x2386521D, + 0x0E562FF1, 0xB94BEEF5, 0x606DADF8, 0xD7706CFC, + 0xD2202BE2, 0x653DEAE6, 0xBC1BA9EB, 0x0B0668EF, + 0xB6BB27D7, 0x01A6E6D3, 0xD880A5DE, 0x6F9D64DA, + 0x6ACD23C4, 0xDDD0E2C0, 0x04F6A1CD, 0xB3EB60C9, + 0x7E8D3EBD, 0xC990FFB9, 0x10B6BCB4, 0xA7AB7DB0, + 0xA2FB3AAE, 0x15E6FBAA, 0xCCC0B8A7, 0x7BDD79A3, + 0xC660369B, 0x717DF79F, 0xA85BB492, 0x1F467596, + 0x1A163288, 0xAD0BF38C, 0x742DB081, 0xC3307185, + 0x99908A5D, 0x2E8D4B59, 0xF7AB0854, 0x40B6C950, + 0x45E68E4E, 0xF2FB4F4A, 0x2BDD0C47, 0x9CC0CD43, + 0x217D827B, 0x9660437F, 0x4F460072, 0xF85BC176, + 0xFD0B8668, 0x4A16476C, 0x93300461, 0x242DC565, + 0xE94B9B11, 0x5E565A15, 0x87701918, 0x306DD81C, + 0x353D9F02, 0x82205E06, 0x5B061D0B, 0xEC1BDC0F, + 0x51A69337, 0xE6BB5233, 0x3F9D113E, 0x8880D03A, + 0x8DD09724, 0x3ACD5620, 0xE3EB152D, 0x54F6D429, + 0x7926A9C5, 0xCE3B68C1, 0x171D2BCC, 0xA000EAC8, + 0xA550ADD6, 0x124D6CD2, 0xCB6B2FDF, 0x7C76EEDB, + 0xC1CBA1E3, 0x76D660E7, 0xAFF023EA, 0x18EDE2EE, + 0x1DBDA5F0, 0xAAA064F4, 0x738627F9, 0xC49BE6FD, + 0x09FDB889, 0xBEE0798D, 0x67C63A80, 0xD0DBFB84, + 0xD58BBC9A, 0x62967D9E, 0xBBB03E93, 0x0CADFF97, + 0xB110B0AF, 0x060D71AB, 0xDF2B32A6, 0x6836F3A2, + 0x6D66B4BC, 0xDA7B75B8, 0x035D36B5, 0xB440F7B1 + }; + for (int i = 0; i < data.Length; i++) + { + var b = data[i]; + result = crc_table[b ^ (result & 0xff)] ^ (result >> 8); + } + + result = crc_table[data.Length ^ (result & 0xff)] ^ (result >> 8); + + return BinaryPrimitives.ReverseEndianness(~result); + } + uint crc32(byte[] data) { var result = 0u; diff --git a/RfpProxy.Test/MessageTest.cs b/RfpProxy.Test/MessageTest.cs index 58cfc32..17c299c 100644 --- a/RfpProxy.Test/MessageTest.cs +++ b/RfpProxy.Test/MessageTest.cs @@ -1,6 +1,8 @@ using System; using System.IO; using System.Linq; +using System.Net.NetworkInformation; +using System.Security.Cryptography; using RfpProxy.AaMiDe; using RfpProxy.AaMiDe.Dnm; using RfpProxy.AaMiDe.Mac; @@ -105,17 +107,63 @@ public void CanDecodeSysSnmpMessage() public void CanDecodeSysAuthenticateMessage() { var auth = Decode("012d0020" + - "57b858bb227549d7" + - "2215096317457eee" + - "f01aa118ab156ad5" + - "e8b35e55ab2b30a0"); - Assert.Equal("2215096317457eee", auth.RfpIv.ToHex()); - Assert.Equal("e8b35e55ab2b30a0", auth.OmmIv.ToHex()); - + "57b858bb227549" + + "d72215096317457e" + + "eef01aa118ab156a" + + "d5e8b35e55ab2b30" + + "a0"); Log(auth); + Assert.Equal("d72215096317457e", auth.RfpIv.ToHex()); + Assert.Equal("d5e8b35e55ab2b30", auth.OmmIv.ToHex()); + //TODO Assert.False(auth.HasUnknown); } + [Fact] + public void CanSign() + { + var auth = HexEncoding.HexToByte( + "012d0020 a1ec05aa 36940a9c 027cc8ab e7045501 1c33e8aa c57860f6 ac9c2d00 432182b8" + .Replace(" ", String.Empty)); + var orig = HexEncoding.HexToByte( + ("012001100000000d 00080100 0030421b 17370000 00000000 0001ef3c 2a0d8ce8 725371d0 d799a029" + + "8dc02c73 4ac5b803 abc38663 b494de7b 2ffbe03d 70b616eb facf2e7d 85f61b29 5cba5c76 ea515501" + + "b3c02b75 5862261b fc08ffde 00080201 00000000 00000000 00000000 00000000 00000000 5349502d" + + "44454354 20382e31 5350332d 464b3234 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 cb8321c7 401dd174 d3b350fa faa7b770") + .Replace(" ", String.Empty)); + var signatureKey = HexEncoding.HexToByte( + "e7adda3adb0521f3d3fbdf3a18ee8648" + + "b47398b1570c2b45ef8d2a9180a1a32c" + + "69284a9c97d444abf87f5c578f942821" + + "4dd0183cba969dc5"); + + _output.WriteLine(orig.AsSpan().ToHex()); + var init = new SysInitMessage(orig); + init.Sign(auth); + var created = new byte[0x114]; + init.Serialize(created); + _output.WriteLine(created.AsSpan().ToHex()); + var caps = SysInitMessage.RfpCapabilities.Reserved3 | + SysInitMessage.RfpCapabilities.Indoor | + SysInitMessage.RfpCapabilities.Wlan | + SysInitMessage.RfpCapabilities.Encryption | + SysInitMessage.RfpCapabilities.FrequencyShift | + SysInitMessage.RfpCapabilities.ConfigurableTX | + SysInitMessage.RfpCapabilities.Reserved12 | + SysInitMessage.RfpCapabilities.Reserved14 | + SysInitMessage.RfpCapabilities.Reserved15 | + SysInitMessage.RfpCapabilities.AdvancedFeature | + SysInitMessage.RfpCapabilities.WlanDfsSupported; + init = new SysInitMessage(PhysicalAddress.Parse("0030421b1737"), caps); + init.Sign(auth); + created = new byte[0x114]; + init.Serialize(created); + _output.WriteLine(created.AsSpan().ToHex()); + } + [Fact] public void CanDecodeSysInitMessage() { @@ -141,6 +189,28 @@ public void CanDecodeSysInitMessage() "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 cc59b116 bd3f31ef" + "34dd9fde 29b71133"); Log(init); + + init = Decode("01200110 0000000d 00080100 0030421b 17370000 00000000 0001ef3c 2a0d8ce8 725371d0 d799a029" + + "8dc02c73 4ac5b803 abc38663 b494de7b 2ffbe03d 70b616eb facf2e7d 85f61b29 5cba5c76 ea515501" + + "b3c02b75 5862261b fc08ffde 00080201 00000000 00000000 00000000 00000000 00000000 5349502d" + + "44454354 20382e31 5350332d 464b3234 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 cb8321c7 401dd174 d3b350fa faa7b770"); + var serialized = new byte[500]; + init.Serialize(serialized); + var auth = HexEncoding.HexToByte("012d0020 a1ec05aa 36940a9c 027cc8ab e7045501 1c33e8aa c57860f6 ac9c2d00 432182b8".Replace(" ", String.Empty)); + init.Sign(auth); + Log(init); + + init = Decode("01200104 00000011 00080000 08000fe0 151e0000 00000000 0001ef1c aece27b5 c1f0f091 a31e0cbc" + + "1c38a6b9 bcea10e1 6adf5595 6c15f6e3 d633903b 06c975cd f19050b5 681f3e2e 1c48f7e5 258526bb" + + "dd61d152 d065a6d0 121cf542 00080000 00000000 00000000 5349502d 44454354 20382e30 2d484630" + + "31444931 36000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000" + + "00000000 00000000 1779261c 5c73b323 20724091 67111e70"); + Log(init); } [Fact] diff --git a/RfpProxy.Traffic/Program.cs b/RfpProxy.Traffic/Program.cs index 989b500..94d2ece 100644 --- a/RfpProxy.Traffic/Program.cs +++ b/RfpProxy.Traffic/Program.cs @@ -69,7 +69,7 @@ static async Task Main(string[] args) } else { - await client.AddHandlerAsync(0, mac, "ffffffffffff", "010e0018ac1417010f", "ffffffffffffffff0f", cts.Token); + await client.AddHandlerAsync(0, mac, "ffffffffffff", "010e001800000000000000000000ffff0ac000195000000000adbeef", "ffffffffffffffffffffffffffffffffffffffff00000000ffffffff", cts.Token); } await client.FinishHandshakeAsync(cts.Token); if (omm) @@ -78,7 +78,7 @@ static async Task Main(string[] args) } else { - await client.WriteAsync(MessageDirection.ToRfp, 0, rfp, HexEncoding.HexToByte("010e000cac1417010f00000000000000"), cts.Token); + await client.WriteAsync(MessageDirection.ToRfp, 0, rfp, HexEncoding.HexToByte("010e001800000000000000000000ffff0ac0001950000000deadbeef"), cts.Token); } await client.RunAsync(cts.Token); } @@ -107,9 +107,10 @@ public TrafficClient(bool omm, string socket) : base(socket) } else { - _ping = HexEncoding.HexToByte("010e000c" + - "ac141701" + - "0f00000000000000"); + _ping = HexEncoding.HexToByte("010e0018" + + "00000000000000000000ffff0ac000195" + + "0000000" + + "deadbeef"); } } diff --git a/SoftRfp/VirtualRfp.cs b/SoftRfp/VirtualRfp.cs index 78cf603..33c7b64 100644 --- a/SoftRfp/VirtualRfp.cs +++ b/SoftRfp/VirtualRfp.cs @@ -49,9 +49,9 @@ public VirtualRfp(string mac, string omm) public async Task RunAsync(CancellationToken cancellationToken) { - using var connection = new TcpClient(AddressFamily.InterNetworkV6); + using var connection = new TcpClient(AddressFamily.InterNetwork); using var registration = cancellationToken.Register(() => connection.Close()); - await connection.ConnectAsync(_omm, 16321); + await connection.ConnectAsync(_omm, 16321, cancellationToken); _socket = connection.Client; _auth = await ReadPacketAsync(cancellationToken); if (!await InitAsync(cancellationToken)) return; @@ -76,7 +76,7 @@ public void SendMessage(AaMiDeMessage message) private async Task InitAsync(CancellationToken cancellationToken) { - var caps = RfpCapabilities.Indoor; + var caps = RfpCapabilities.Indoor | RfpCapabilities.Encryption | RfpCapabilities.AdvancedFeature; var init = new SysInitMessage(PhysicalAddress.Parse(_mac), caps); init.Sign(_auth.Span); await SendPacketAsync(init, cancellationToken);