test

Author: scott-xu

src/Renci.SshNet/Security/KeyExchangeECCurve25519.BclImpl.cs

@@ -1,4 +1,5 @@
 #if NET
+using System;
 using System.Security.Cryptography;
 
 namespace Renci.SshNet.Security
@@ -22,26 +23,45 @@ public override byte[] GenerateClientPublicKey()
 
                 var q = _clientECDH.PublicKey.ExportParameters().Q;
 
-                return q.X;
+                return EncodeECPoint(q);
             }
 
             public override byte[] CalculateAgreement(byte[] serverPublicKey)
             {
+                var q = DecodeECPoint(serverPublicKey);
+
                 var parameters = new ECParameters
                 {
                     Curve = _curve,
-                    Q = new ECPoint
-                    {
-                        X = serverPublicKey,
-                        Y = new byte[serverPublicKey.Length]
-                    },
+                    Q = q,
                 };
 
                 using var serverECDH = ECDiffieHellman.Create(parameters);
 
                 return _clientECDH.DeriveRawSecretAgreement(serverECDH.PublicKey);
             }
 
+            private static byte[] EncodeECPoint(ECPoint point)
+            {
+                var q = new byte[1 + point.X.Length + point.Y.Length];
+                q[0] = 0x04;
+                Buffer.BlockCopy(point.X, 0, q, 1, point.X.Length);
+                Buffer.BlockCopy(point.Y, 0, q, point.X.Length + 1, point.Y.Length);
+
+                return q;
+            }
+
+            private static ECPoint DecodeECPoint(byte[] q)
+            {
+                var cordSize = (q.Length - 1) / 2;
+                var x = new byte[cordSize];
+                var y = new byte[cordSize];
+                Buffer.BlockCopy(q, 1, x, 0, x.Length);
+                Buffer.BlockCopy(q, cordSize + 1, y, 0, y.Length);
+
+                return new ECPoint { X = x, Y = y };
+            }
+
             protected override void Dispose(bool disposing)
             {
                 base.Dispose(disposing);