minor code refactor

scott-xu · scott-xu · commit ab67b2bfd5c2 · 2025-09-28T18:27:52.000+08:00
diff --git a/src/Renci.SshNet/Security/KeyExchangeEC.cs b/src/Renci.SshNet/Security/KeyExchangeEC.cs
@@ -79,11 +79,11 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool
             _clientPayload = Session.ClientInitMessage.GetBytes();
         }
 
-        protected internal abstract class Impl : IDisposable
+        protected abstract class Impl : IDisposable
         {
-            public abstract byte[] GenerateClientECPoint();
+            public abstract byte[] GenerateClientPublicKey();
 
-            public abstract byte[] CalculateAgreement(byte[] serverECPoint);
+            public abstract byte[] CalculateAgreement(byte[] serverPublicKey);
 
             protected virtual void Dispose(bool disposing)
             {
diff --git a/src/Renci.SshNet/Security/KeyExchangeECCurve25519.BclImpl.cs b/src/Renci.SshNet/Security/KeyExchangeECCurve25519.BclImpl.cs
@@ -10,13 +10,13 @@ protected sealed class BclImpl : Impl
             private readonly ECCurve _curve;
             private readonly ECDiffieHellman _clientECDH;
 
-            public BclImpl(ECCurve curve)
+            public BclImpl()
             {
-                _curve = curve;
+                _curve = ECCurve.CreateFromFriendlyName("Curve25519");
                 _clientECDH = ECDiffieHellman.Create();
             }
 
-            public override byte[] GenerateClientECPoint()
+            public override byte[] GenerateClientPublicKey()
             {
                 _clientECDH.GenerateKey(_curve);
 
@@ -25,15 +25,15 @@ public override byte[] GenerateClientECPoint()
                 return q.X;
             }
 
-            public override byte[] CalculateAgreement(byte[] serverECPoint)
+            public override byte[] CalculateAgreement(byte[] serverPublicKey)
             {
                 var parameters = new ECParameters
                 {
                     Curve = _curve,
                     Q = new ECPoint
                     {
-                        X = serverECPoint,
-                        Y = new byte[serverECPoint.Length]
+                        X = serverPublicKey,
+                        Y = new byte[serverPublicKey.Length]
                     },
                 };
 
diff --git a/src/Renci.SshNet/Security/KeyExchangeECCurve25519.BouncyCastleImpl.cs b/src/Renci.SshNet/Security/KeyExchangeECCurve25519.BouncyCastleImpl.cs
@@ -12,7 +12,7 @@ protected sealed class BouncyCastleImpl : Impl
         {
             private X25519Agreement _keyAgreement;
 
-            public override byte[] GenerateClientECPoint()
+            public override byte[] GenerateClientPublicKey()
             {
                 var g = new X25519KeyPairGenerator();
                 g.Init(new X25519KeyGenerationParameters(CryptoAbstraction.SecureRandom));
@@ -24,9 +24,9 @@ public override byte[] GenerateClientECPoint()
                 return ((X25519PublicKeyParameters)aKeyPair.Public).GetEncoded();
             }
 
-            public override byte[] CalculateAgreement(byte[] serverECPoint)
+            public override byte[] CalculateAgreement(byte[] serverPublicKey)
             {
-                var publicKey = new X25519PublicKeyParameters(serverECPoint);
+                var publicKey = new X25519PublicKeyParameters(serverPublicKey);
 
                 var k1 = new byte[_keyAgreement.AgreementSize];
                 _keyAgreement.CalculateAgreement(publicKey, k1, 0);
diff --git a/src/Renci.SshNet/Security/KeyExchangeECCurve25519.cs b/src/Renci.SshNet/Security/KeyExchangeECCurve25519.cs
@@ -40,8 +40,7 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool
 #if NET
             if (System.OperatingSystem.IsWindowsVersionAtLeast(10))
             {
-                var curve = System.Security.Cryptography.ECCurve.CreateFromFriendlyName("Curve25519");
-                _impl = new BclImpl(curve);
+                _impl = new BclImpl();
             }
             else
 #endif
@@ -61,7 +60,7 @@ protected virtual void StartImpl()
 
             Session.KeyExchangeEcdhReplyMessageReceived += Session_KeyExchangeEcdhReplyMessageReceived;
 
-            _clientExchangeValue = _impl.GenerateClientECPoint();
+            _clientExchangeValue = _impl.GenerateClientPublicKey();
 
             SendMessage(new KeyExchangeEcdhInitMessage(_clientExchangeValue));
         }
diff --git a/src/Renci.SshNet/Security/KeyExchangeECDH.BclImpl.cs b/src/Renci.SshNet/Security/KeyExchangeECDH.BclImpl.cs
@@ -17,7 +17,7 @@ public BclImpl(ECCurve curve)
                 _clientECDH = ECDiffieHellman.Create();
             }
 
-            public override byte[] GenerateClientECPoint()
+            public override byte[] GenerateClientPublicKey()
             {
                 _clientECDH.GenerateKey(_curve);
 
@@ -26,9 +26,9 @@ public override byte[] GenerateClientECPoint()
                 return EncodeECPoint(q);
             }
 
-            public override byte[] CalculateAgreement(byte[] serverECPoint)
+            public override byte[] CalculateAgreement(byte[] serverPublicKey)
             {
-                var q = DecodeECPoint(serverECPoint);
+                var q = DecodeECPoint(serverPublicKey);
 
                 var parameters = new ECParameters
                 {
diff --git a/src/Renci.SshNet/Security/KeyExchangeECDH.BouncyCastleImpl.cs b/src/Renci.SshNet/Security/KeyExchangeECDH.BouncyCastleImpl.cs
@@ -20,7 +20,7 @@ public BouncyCastleImpl(X9ECParameters curveParameters)
                 _keyAgreement = new ECDHCBasicAgreement();
             }
 
-            public override byte[] GenerateClientECPoint()
+            public override byte[] GenerateClientPublicKey()
             {
                 var g = new ECKeyPairGenerator();
                 g.Init(new ECKeyGenerationParameters(_domainParameters, CryptoAbstraction.SecureRandom));
@@ -31,10 +31,10 @@ public override byte[] GenerateClientECPoint()
                 return ((ECPublicKeyParameters)aKeyPair.Public).Q.GetEncoded();
             }
 
-            public override byte[] CalculateAgreement(byte[] serverECPoint)
+            public override byte[] CalculateAgreement(byte[] serverPublicKey)
             {
                 var c = _domainParameters.Curve;
-                var q = c.DecodePoint(serverECPoint);
+                var q = c.DecodePoint(serverPublicKey);
                 var publicKey = new ECPublicKeyParameters("ECDH", q, _domainParameters);
 
                 return _keyAgreement.CalculateAgreement(publicKey).ToByteArray();
diff --git a/src/Renci.SshNet/Security/KeyExchangeECDH.cs b/src/Renci.SshNet/Security/KeyExchangeECDH.cs
@@ -49,7 +49,7 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool
                 _impl = new BouncyCastleImpl(CurveParameter);
             }
 
-            _clientExchangeValue = _impl.GenerateClientECPoint();
+            _clientExchangeValue = _impl.GenerateClientPublicKey();
 
             SendMessage(new KeyExchangeEcdhInitMessage(_clientExchangeValue));
         }
diff --git a/src/Renci.SshNet/Security/KeyExchangeMLKem768X25519Sha256.cs b/src/Renci.SshNet/Security/KeyExchangeMLKem768X25519Sha256.cs
@@ -50,7 +50,7 @@ protected override void StartImpl()
 
             var mlkem768PublicKey = ((MLKemPublicKeyParameters)mlkem768KeyPair.Public).GetEncoded();
 
-            var x25519PublicKey = _impl.GenerateClientECPoint();
+            var x25519PublicKey = _impl.GenerateClientPublicKey();
 
             _clientExchangeValue = mlkem768PublicKey.Concat(x25519PublicKey);
 
diff --git a/src/Renci.SshNet/Security/KeyExchangeSNtruP761X25519Sha512.cs b/src/Renci.SshNet/Security/KeyExchangeSNtruP761X25519Sha512.cs
@@ -48,7 +48,7 @@ protected override void StartImpl()
 
             var sntrup761PublicKey = ((SNtruPrimePublicKeyParameters)sntrup761KeyPair.Public).GetEncoded();
 
-            var x25519PublicKey = _impl.GenerateClientECPoint();
+            var x25519PublicKey = _impl.GenerateClientPublicKey();
 
             _clientExchangeValue = sntrup761PublicKey.Concat(x25519PublicKey);
 

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,11 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool`
`79`	`79`	`_clientPayload = Session.ClientInitMessage.GetBytes();`
`80`	`80`	`}`
`81`	`81`
`82`		`- protected internal abstract class Impl : IDisposable`
	`82`	`+ protected abstract class Impl : IDisposable`
`83`	`83`	`{`
`84`		`- public abstract byte[] GenerateClientECPoint();`
	`84`	`+ public abstract byte[] GenerateClientPublicKey();`
`85`	`85`
`86`		`- public abstract byte[] CalculateAgreement(byte[] serverECPoint);`
	`86`	`+ public abstract byte[] CalculateAgreement(byte[] serverPublicKey);`
`87`	`87`
`88`	`88`	`protected virtual void Dispose(bool disposing)`
`89`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ protected sealed class BclImpl : Impl`
`10`	`10`	`private readonly ECCurve _curve;`
`11`	`11`	`private readonly ECDiffieHellman _clientECDH;`
`12`	`12`
`13`		`- public BclImpl(ECCurve curve)`
	`13`	`+ public BclImpl()`
`14`	`14`	`{`
`15`		`- _curve = curve;`
	`15`	`+ _curve = ECCurve.CreateFromFriendlyName("Curve25519");`
`16`	`16`	`_clientECDH = ECDiffieHellman.Create();`
`17`	`17`	`}`
`18`	`18`
`19`		`- public override byte[] GenerateClientECPoint()`
	`19`	`+ public override byte[] GenerateClientPublicKey()`
`20`	`20`	`{`
`21`	`21`	`_clientECDH.GenerateKey(_curve);`
`22`	`22`
`@@ -25,15 +25,15 @@ public override byte[] GenerateClientECPoint()`
`25`	`25`	`return q.X;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public override byte[] CalculateAgreement(byte[] serverECPoint)`
	`28`	`+ public override byte[] CalculateAgreement(byte[] serverPublicKey)`
`29`	`29`	`{`
`30`	`30`	`var parameters = new ECParameters`
`31`	`31`	`{`
`32`	`32`	`Curve = _curve,`
`33`	`33`	`Q = new ECPoint`
`34`	`34`	`{`
`35`		`- X = serverECPoint,`
`36`		`- Y = new byte[serverECPoint.Length]`
	`35`	`+ X = serverPublicKey,`
	`36`	`+ Y = new byte[serverPublicKey.Length]`
`37`	`37`	`},`
`38`	`38`	`};`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ protected sealed class BouncyCastleImpl : Impl`
`12`	`12`	`{`
`13`	`13`	`private X25519Agreement _keyAgreement;`
`14`	`14`
`15`		`- public override byte[] GenerateClientECPoint()`
	`15`	`+ public override byte[] GenerateClientPublicKey()`
`16`	`16`	`{`
`17`	`17`	`var g = new X25519KeyPairGenerator();`
`18`	`18`	`g.Init(new X25519KeyGenerationParameters(CryptoAbstraction.SecureRandom));`
`@@ -24,9 +24,9 @@ public override byte[] GenerateClientECPoint()`
`24`	`24`	`return ((X25519PublicKeyParameters)aKeyPair.Public).GetEncoded();`
`25`	`25`	`}`
`26`	`26`
`27`		`- public override byte[] CalculateAgreement(byte[] serverECPoint)`
	`27`	`+ public override byte[] CalculateAgreement(byte[] serverPublicKey)`
`28`	`28`	`{`
`29`		`- var publicKey = new X25519PublicKeyParameters(serverECPoint);`
	`29`	`+ var publicKey = new X25519PublicKeyParameters(serverPublicKey);`
`30`	`30`
`31`	`31`	`var k1 = new byte[_keyAgreement.AgreementSize];`
`32`	`32`	`_keyAgreement.CalculateAgreement(publicKey, k1, 0);`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool`
`40`	`40`	`#if NET`
`41`	`41`	`if (System.OperatingSystem.IsWindowsVersionAtLeast(10))`
`42`	`42`	`{`
`43`		`- var curve = System.Security.Cryptography.ECCurve.CreateFromFriendlyName("Curve25519");`
`44`		`- _impl = new BclImpl(curve);`
	`43`	`+ _impl = new BclImpl();`
`45`	`44`	`}`
`46`	`45`	`else`
`47`	`46`	`#endif`
`@@ -61,7 +60,7 @@ protected virtual void StartImpl()`
`61`	`60`
`62`	`61`	`Session.KeyExchangeEcdhReplyMessageReceived += Session_KeyExchangeEcdhReplyMessageReceived;`
`63`	`62`
`64`		`- _clientExchangeValue = _impl.GenerateClientECPoint();`
	`63`	`+ _clientExchangeValue = _impl.GenerateClientPublicKey();`
`65`	`64`
`66`	`65`	`SendMessage(new KeyExchangeEcdhInitMessage(_clientExchangeValue));`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public BclImpl(ECCurve curve)`
`17`	`17`	`_clientECDH = ECDiffieHellman.Create();`
`18`	`18`	`}`
`19`	`19`
`20`		`- public override byte[] GenerateClientECPoint()`
	`20`	`+ public override byte[] GenerateClientPublicKey()`
`21`	`21`	`{`
`22`	`22`	`_clientECDH.GenerateKey(_curve);`
`23`	`23`
`@@ -26,9 +26,9 @@ public override byte[] GenerateClientECPoint()`
`26`	`26`	`return EncodeECPoint(q);`
`27`	`27`	`}`
`28`	`28`
`29`		`- public override byte[] CalculateAgreement(byte[] serverECPoint)`
	`29`	`+ public override byte[] CalculateAgreement(byte[] serverPublicKey)`
`30`	`30`	`{`
`31`		`- var q = DecodeECPoint(serverECPoint);`
	`31`	`+ var q = DecodeECPoint(serverPublicKey);`
`32`	`32`
`33`	`33`	`var parameters = new ECParameters`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public BouncyCastleImpl(X9ECParameters curveParameters)`
`20`	`20`	`_keyAgreement = new ECDHCBasicAgreement();`
`21`	`21`	`}`
`22`	`22`
`23`		`- public override byte[] GenerateClientECPoint()`
	`23`	`+ public override byte[] GenerateClientPublicKey()`
`24`	`24`	`{`
`25`	`25`	`var g = new ECKeyPairGenerator();`
`26`	`26`	`g.Init(new ECKeyGenerationParameters(_domainParameters, CryptoAbstraction.SecureRandom));`
`@@ -31,10 +31,10 @@ public override byte[] GenerateClientECPoint()`
`31`	`31`	`return ((ECPublicKeyParameters)aKeyPair.Public).Q.GetEncoded();`
`32`	`32`	`}`
`33`	`33`
`34`		`- public override byte[] CalculateAgreement(byte[] serverECPoint)`
	`34`	`+ public override byte[] CalculateAgreement(byte[] serverPublicKey)`
`35`	`35`	`{`
`36`	`36`	`var c = _domainParameters.Curve;`
`37`		`- var q = c.DecodePoint(serverECPoint);`
	`37`	`+ var q = c.DecodePoint(serverPublicKey);`
`38`	`38`	`var publicKey = new ECPublicKeyParameters("ECDH", q, _domainParameters);`
`39`	`39`
`40`	`40`	`return _keyAgreement.CalculateAgreement(publicKey).ToByteArray();`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override void Start(Session session, KeyExchangeInitMessage message, bool`
`49`	`49`	`_impl = new BouncyCastleImpl(CurveParameter);`
`50`	`50`	`}`
`51`	`51`
`52`		`- _clientExchangeValue = _impl.GenerateClientECPoint();`
	`52`	`+ _clientExchangeValue = _impl.GenerateClientPublicKey();`
`53`	`53`
`54`	`54`	`SendMessage(new KeyExchangeEcdhInitMessage(_clientExchangeValue));`
`55`	`55`	`}`