warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes encryption support for pre-6.0.5 clients (#2365)

Browse source 
### Summary

Fixes encryption detection for clients pre-6.0.5.0. To limit the amount of brute-force key checking we are only checking 4.0.11 to 6.0.4.
This commit is contained in:
Kamron Batman 2026-03-12 21:59:01 -07:00 • committed by GitHub
parent 76395b77ec
commit f150458578
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 71 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Projects/Server/Network/NetState/NetState.cs
View file

@ -63,9 +63,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
// Managed socket with buffers (handles lifecycle automatically)
internal RingSocket _socket;
// General packet throttle state (used for other throttled packets)
internal bool _isThrottled;
private IAccount _account;
internal enum ParserState
@ -664,8 +661,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
_encryption = loginEncryption;
// Decrypt the buffer in place for processing
var mutableBuffer = _socket.RecvBuffer.GetReadSpan();
loginEncryption.ClientDecrypt(mutableBuffer[..62]);
loginEncryption.ClientDecrypt(buffer[..62]);
}
// Now process as normal (first byte should now be 0x80)
@ -714,7 +710,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
case ProtocolState.GameServer_AwaitingGameServerLogin:
{
// Some clients send 0x80 on game server connection
if (packetId == 0x80)
if (packetId == 0x80 || length == 62)
{
goto case ProtocolState.LoginServer_AwaitingLogin;
}
@ -767,8 +763,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
_encryption = gameEncryption;
// Decrypt the buffer in place for processing
var mutableBuffer = _socket.RecvBuffer.GetReadSpan();
gameEncryption.ClientDecrypt(mutableBuffer[..65]);
gameEncryption.ClientDecrypt(buffer[..65]);
}
// Now process as normal (first byte should now be 0x91)