Partially revert changes from #643.

drieseng · drieseng · commit 1a803b50ee33 · 2020-04-24T21:09:30.000+02:00
Fixes #653.
diff --git a/src/Renci.SshNet/Common/Extensions.cs b/src/Renci.SshNet/Common/Extensions.cs
@@ -72,21 +72,6 @@ internal static BigInteger ToBigInteger(this byte[] data)
             return new BigInteger(reversed.Reverse());
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BigInteger"/> structure using the SSH BigNum2 Format
-        /// </summary>
-        public static byte[] ToBigNum2(this byte[] data)
-        {
-            if ((data[0] & (1 << 7)) != 0)
-            {
-                var buf = new byte[data.Length + 1];
-                Buffer.BlockCopy(data, 0, buf, 1, data.Length);
-                data = buf;
-            }
-
-            return data;
-        }
-
         /// <summary>
         /// Initializes a new instance of the <see cref="BigInteger"/> structure using the SSH BigNum2 Format
         /// </summary>
diff --git a/src/Renci.SshNet/Security/KeyExchange.cs b/src/Renci.SshNet/Security/KeyExchange.cs
@@ -345,14 +345,17 @@ protected void SendMessage(Message message)
         private byte[] GenerateSessionKey(byte[] sharedKey, byte[] exchangeHash, byte[] key, int size)
         {
             var result = new List<byte>(key);
+
             while (size > result.Count)
             {
-                result.AddRange(Hash(new _SessionKeyAdjustment
-                {
-                    SharedKey = sharedKey,
-                    ExchangeHash = exchangeHash,
-                    Key = key,
-                }.GetBytes()));
+                var sessionKeyAdjustment = new SessionKeyAdjustment
+                    {
+                        SharedKey = sharedKey,
+                        ExchangeHash = exchangeHash,
+                        Key = key,
+                    };
+
+                result.AddRange(Hash(sessionKeyAdjustment.GetBytes()));
             }
 
             return result.ToArray();
@@ -368,7 +371,7 @@ private byte[] GenerateSessionKey(byte[] sharedKey, byte[] exchangeHash, byte[]
         /// <returns></returns>
         private static byte[] GenerateSessionKey(byte[] sharedKey, byte[] exchangeHash, char p, byte[] sessionId)
         {
-            var sessionKeyGeneration = new _SessionKeyGeneration
+            var sessionKeyGeneration = new SessionKeyGeneration
                 {
                     SharedKey = sharedKey,
                     ExchangeHash = exchangeHash,
@@ -378,11 +381,14 @@ private static byte[] GenerateSessionKey(byte[] sharedKey, byte[] exchangeHash,
             return sessionKeyGeneration.GetBytes();
         }
 
-        private class _SessionKeyGeneration : SshData
+        private class SessionKeyGeneration : SshData
         {
             public byte[] SharedKey { get; set; }
+
             public byte[] ExchangeHash { get; set; }
+
             public char Char { get; set; }
+
             public byte[] SessionId { get; set; }
 
             /// <summary>
@@ -419,10 +425,12 @@ protected override void SaveData()
             }
         }
 
-        private class _SessionKeyAdjustment : SshData
+        private class SessionKeyAdjustment : SshData
         {
             public byte[] SharedKey { get; set; }
+
             public byte[] ExchangeHash { get; set; }
+
             public byte[] Key { get; set; }
 
             /// <summary>
diff --git a/src/Renci.SshNet/Security/KeyExchangeEC.cs b/src/Renci.SshNet/Security/KeyExchangeEC.cs
@@ -1,7 +1,6 @@
 ﻿using System.Text;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Common;
-using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet.Security
 {
@@ -45,21 +44,6 @@ internal abstract class KeyExchangeEC : KeyExchange
         /// </value>
         protected abstract int HashSize { get; }
 
-        /// <summary>
-        /// Hashes the specified data bytes.
-        /// </summary>
-        /// <param name="hashData">The hash data.</param>
-        /// <returns>
-        /// Hashed bytes
-        /// </returns>
-        protected override byte[] Hash(byte[] hashData)
-        {
-            using (var sha256 = CryptoAbstraction.CreateSHA256())
-            {
-                return sha256.ComputeHash(hashData, 0, hashData.Length);
-            }
-        }
-
         /// <summary>
         /// Calculates key exchange hash value.
         /// </summary>
@@ -68,7 +52,7 @@ protected override byte[] Hash(byte[] hashData)
         /// </returns>
         protected override byte[] CalculateHash()
         {
-            var keyExchangeHashData = new KeyExchangeHashData
+            var hashData = new KeyExchangeHashData
                 {
                     ClientVersion = Session.ClientVersion,
                     ServerVersion = Session.ServerVersion,
@@ -77,10 +61,10 @@ protected override byte[] CalculateHash()
                     HostKey = _hostKey,
                     ClientExchangeValue = _clientExchangeValue,
                     ServerExchangeValue = _serverExchangeValue,
-                    SharedKey = SharedKey
+                    SharedKey = SharedKey,
                 };
 
-            return Hash(keyExchangeHashData.GetBytes());
+            return Hash(hashData.GetBytes());
         }
 
         /// <summary>
@@ -118,5 +102,5 @@ public override void Start(Session session, KeyExchangeInitMessage message)
             _serverPayload = message.GetBytes();
             _clientPayload = Session.ClientInitMessage.GetBytes();
         }
-    }
+   }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchangeECCurve25519.cs b/src/Renci.SshNet/Security/KeyExchangeECCurve25519.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Transport;
 using Renci.SshNet.Security.Chaos.NaCl;
@@ -65,6 +66,21 @@ public override void Finish()
             Session.KeyExchangeEcdhReplyMessageReceived -= Session_KeyExchangeEcdhReplyMessageReceived;
         }
 
+        /// <summary>
+        /// Hashes the specified data bytes.
+        /// </summary>
+        /// <param name="hashData">The hash data.</param>
+        /// <returns>
+        /// Hashed bytes
+        /// </returns>
+        protected override byte[] Hash(byte[] hashData)
+        {
+            using (var sha256 = CryptoAbstraction.CreateSHA256())
+            {
+                return sha256.ComputeHash(hashData, 0, hashData.Length);
+            }
+        }
+
         private void Session_KeyExchangeEcdhReplyMessageReceived(object sender, MessageEventArgs<KeyExchangeEcdhReplyMessage> e)
         {
             var message = e.Message;
@@ -92,7 +108,7 @@ private void HandleServerEcdhReply(byte[] hostKey, byte[] serverExchangeValue, b
 
             var sharedKey = new byte[MontgomeryCurve25519.PublicKeySizeInBytes];
             MontgomeryOperations.scalarmult(sharedKey, 0, _privateKey, 0, serverExchangeValue, 0);
-            SharedKey = sharedKey.ToBigNum2();
+            SharedKey = sharedKey.ToBigInteger2().ToByteArray().Reverse();
         }
     }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchangeECDH.cs b/src/Renci.SshNet/Security/KeyExchangeECDH.cs
@@ -100,7 +100,7 @@ private void HandleServerEcdhReply(byte[] hostKey, byte[] serverExchangeValue, b
             var publicKey = new ECPublicKeyParameters("ECDH", q, DomainParameters);
 
             var k1 = KeyAgreement.CalculateAgreement(publicKey);
-            SharedKey = k1.ToByteArray().ToBigNum2();
+            SharedKey = k1.ToByteArray().ToBigInteger2().ToByteArray().Reverse();
         }
     }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchangeECDH256.cs b/src/Renci.SshNet/Security/KeyExchangeECDH256.cs
@@ -1,4 +1,5 @@
-﻿using Renci.SshNet.Security.Org.BouncyCastle.Asn1.Sec;
+﻿using Renci.SshNet.Abstractions;
+using Renci.SshNet.Security.Org.BouncyCastle.Asn1.Sec;
 using Renci.SshNet.Security.Org.BouncyCastle.Asn1.X9;
 
 namespace Renci.SshNet.Security
@@ -34,5 +35,20 @@ protected override int HashSize
         {
             get { return 256; }
         }
+
+        /// <summary>
+        /// Hashes the specified data bytes.
+        /// </summary>
+        /// <param name="hashData">The hash data.</param>
+        /// <returns>
+        /// Hashed bytes
+        /// </returns>
+        protected override byte[] Hash(byte[] hashData)
+        {
+            using (var sha256 = CryptoAbstraction.CreateSHA256())
+            {
+                return sha256.ComputeHash(hashData, 0, hashData.Length);
+            }
+        }
     }
 }
diff --git a/src/Renci.SshNet/Security/KeyExchangeHash.cs b/src/Renci.SshNet/Security/KeyExchangeHash.cs
@@ -1,6 +1,5 @@
 ﻿using Renci.SshNet.Common;
 using System;
-using System.Linq;
 
 namespace Renci.SshNet.Security
 {
diff --git a/src/Renci.SshNet/Security/KeyHostAlgorithm.cs b/src/Renci.SshNet/Security/KeyHostAlgorithm.cs
@@ -82,7 +82,7 @@ public override bool VerifySignature(byte[] data, byte[] signature)
         private class SshKeyData : SshData
         {
             private byte[] _name;
-            private IList<byte[]> _keys;
+            private List<byte[]> _keys;
 
             public BigInteger[] Keys
             {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private void HandleServerEcdhReply(byte[] hostKey, byte[] serverExchangeValue, b`
`100`	`100`	`var publicKey = new ECPublicKeyParameters("ECDH", q, DomainParameters);`
`101`	`101`
`102`	`102`	`var k1 = KeyAgreement.CalculateAgreement(publicKey);`
`103`		`- SharedKey = k1.ToByteArray().ToBigNum2();`
	`103`	`+ SharedKey = k1.ToByteArray().ToBigInteger2().ToByteArray().Reverse();`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using Renci.SshNet.Common;`
`2`	`2`	`using System;`
`3`		`-using System.Linq;`
`4`	`3`
`5`	`4`	`namespace Renci.SshNet.Security`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public override bool VerifySignature(byte[] data, byte[] signature)`
`82`	`82`	`private class SshKeyData : SshData`
`83`	`83`	`{`
`84`	`84`	`private byte[] _name;`
`85`		`- private IList<byte[]> _keys;`
	`85`	`+ private List<byte[]> _keys;`
`86`	`86`
`87`	`87`	`public BigInteger[] Keys`
`88`	`88`	`{`