[Core] Fix the EcdhProvider would not provide 32 bytes sharekey

Author: Linwenxuan04

Lagrange.Core.Test/Cryptography/EcdhTest.cs

@@ -10,7 +10,7 @@ public class BotSsoPacket
 
     public int RetCode { get; }
 
-    public int Sequence { get; }
+    public int Sequence { get; internal set; }
 
     /// <summary>
     /// Constructs a new SSO packet with the specified command and data.

Lagrange.Core/Common/Entity/BotSsoPacket.cs

@@ -23,6 +23,6 @@ public static bool SubmitCaptcha(this BotContext context, string ticket, string
     public static bool SubmitSMSCode(this BotContext context, string code) =>
         context.EventContext.GetLogic<WtExchangeLogic>().SubmitSMSCode(code);
 
-    public static ValueTask<BotSsoPacket> SendPacket(this BotContext context, BotSsoPacket packet)
-        => context.EventContext.GetLogic<OperationLogic>().SendPacket(packet);
+    public static ValueTask<BotSsoPacket> SendPacket(this BotContext context, BotSsoPacket packet, RequestType requestType = RequestType.D2Auth, EncryptType encryptType = EncryptType.EncryptD2Key)
+        => context.EventContext.GetLogic<OperationLogic>().SendPacket(packet, requestType, encryptType);
 }

Lagrange.Core/Common/Interface/BotExt.cs

@@ -64,8 +64,17 @@ public ValueTask<BotSsoPacket> SendPacket(BotSsoPacket packet, ServiceAttribute
                 }
                 case RequestType.Simple:
                 {
-                    var sso = _ssoPacker.BuildProtocol13(packet);
-                    frame = _servicePacker.BuildProtocol13(packet, sso, options);
+                    if (SignProvider.IsWhiteListCommand(packet.Command))
+                    {
+                        var secInfo = await SignProvider.GetSecSign(_keystore.Uin, packet.Command, packet.Sequence, packet.Data);
+                        var sso = _ssoPacker.BuildProtocol13(packet, secInfo);
+                        frame = _servicePacker.BuildProtocol13(packet, sso, options);
+                    }
+                    else
+                    {
+                        var sso = _ssoPacker.BuildProtocol13(packet, null);
+                        frame = _servicePacker.BuildProtocol13(packet, sso, options);
+                    }
                     break;
                 }
                 default:

Lagrange.Core/Internal/Context/PacketContext.cs

@@ -76,7 +76,7 @@ public ValueTask<ProtocolEvent> Resolve(BotSsoPacket ssoPacket)
         return (new BotSsoPacket(attr.Command, await service.Build(@event, _context), GetNewSequence()), attr);
     }
 
-    private int GetNewSequence()
+    public int GetNewSequence()
     {
         Interlocked.CompareExchange(ref _sequence, 5000000, 9900000);
         return Interlocked.Increment(ref _sequence);

Lagrange.Core/Internal/Context/ServiceContext.cs

@@ -23,9 +23,11 @@ internal class OperationLogic(BotContext context) : ILogic
 
     public async Task<Dictionary<string, string>> FetchCookies(List<string> domains) => (await context.EventContext.SendEvent<FetchCookiesEventResp>(new FetchCookiesEventReq(domains))).Cookies;
 
-    public ValueTask<BotSsoPacket> SendPacket(BotSsoPacket packet)
+    public ValueTask<BotSsoPacket> SendPacket(BotSsoPacket packet, RequestType requestType, EncryptType encryptType)
     {
-        return context.PacketContext.SendPacket(packet, new ServiceAttribute(packet.Command));
+        int sequence = packet.Sequence != 0 ? packet.Sequence : context.ServiceContext.GetNewSequence();
+        packet.Sequence = sequence;
+        return context.PacketContext.SendPacket(packet, new ServiceAttribute(packet.Command, requestType, encryptType));
     }
 
     public async Task<(string, uint)> FetchClientKey()

Lagrange.Core/Internal/Logic/OperationLogic.cs

@@ -39,13 +39,13 @@ public BinaryPacket BuildProtocol12(BotSsoPacket sso, SsoSecureInfo? secInfo)
         return result;
     }
 
-    public BinaryPacket BuildProtocol13(BotSsoPacket sso)
+    public BinaryPacket BuildProtocol13(BotSsoPacket sso, SsoSecureInfo? secInfo)
     {
         var head = new BinaryPacket(stackalloc byte[0x200]);
 
         head.Write(sso.Command, Prefix.Int32 | Prefix.WithPrefix); // command
         head.Write(ReadOnlySpan<byte>.Empty, Prefix.Int32 | Prefix.WithPrefix); // message_cookies
-        WriteSsoReservedField(ref head, null);
+        WriteSsoReservedField(ref head, secInfo);
 
         var headSpan = head.CreateReadOnlySpan();
         var result = new BinaryPacket(headSpan.Length + sso.Data.Length + 2 * 4); // 2 * 4 for the length of the payload

Lagrange.Core/Internal/Packets/Struct/SsoPacker.cs

@@ -43,19 +43,22 @@ public byte[] PackPublic(bool compress)
         if (compress)
         {
             var result = new byte[Curve.Size + 1];
-            
+
             result[0] = (byte) (Public.Y.IsEven ^ Public.Y.Sign < 0 ? 0x02 : 0x03);
-            Public.X.TryWriteBytes(result.AsSpan()[1..], out _, true, true);
-            
+            var xBytes = ToFixedBytes(Public.X, Curve.Size);
+            xBytes.CopyTo(result, 1);
+
             return result;
         }
         else
         {
             var result = new byte[Curve.Size * 2 + 1];
-        
+
             result[0] = 0x04;
-            Public.X.TryWriteBytes(result.AsSpan()[1..], out _, true, true);
-            Public.Y.TryWriteBytes(result.AsSpan()[(Curve.Size + 1)..], out _, true, true);
+            var xBytes = ToFixedBytes(Public.X, Curve.Size);
+            var yBytes = ToFixedBytes(Public.Y, Curve.Size);
+            xBytes.CopyTo(result, 1);
+            yBytes.CopyTo(result, Curve.Size + 1);
 
             return result;
         }
@@ -72,7 +75,7 @@ public byte[] PackSecret()
 
     private byte[] PackShared(EllipticPoint ecShared, bool isHash)
     {
-        var x = ecShared.X.ToByteArray(true, true);
+        var x = ToFixedBytes(ecShared.X, Curve.Size);
         return !isHash ? x : MD5.HashData(x[..Curve.PackSize]);
     }
 
@@ -202,6 +205,24 @@ private static BigInteger Mod(BigInteger a, BigInteger b)
         if (result < 0) result += b;
         return result;
     }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static byte[] ToFixedBytes(BigInteger value, int size)
+    {
+        var bytes = value.ToByteArray(true, true);
+        if (bytes.Length == size) return bytes;
+
+        var result = new byte[size];
+        if (bytes.Length < size)
+        {
+            bytes.CopyTo(result, size - bytes.Length);
+        }
+        else
+        {
+            Array.Copy(bytes, bytes.Length - size, result, 0, size);
+        }
+        return result;
+    }
 }
 
 internal readonly struct EllipticCurve