GithubStar/SSH.NET
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-10-19 06:58:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add HashInfo class and refactor hashing works

Browse Source 
Fix *-96 hashing algorithms
This commit is contained in:
olegkap_cp
2013-01-22 13:36:54 +00:00
parent 95abd4557b
commit 3bf76ef842
8 changed files with 511 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Renci.SshClient/Renci.SshNet.Tests/Classes/SshCommandTest.cs
+9 -18
View File
@@ -484,8 +484,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
string commandText1 = string.Empty; // TODO: Initialize to an appropriate value
AsyncCallback callback = null; // TODO: Initialize to an appropriate value
object state = null; // TODO: Initialize to an appropriate value
@@ -504,8 +503,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
target.CancelAsync();
Assert.Inconclusive("A method that does not return a value cannot be verified.");
}
@@ -518,8 +516,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
target.Dispose();
Assert.Inconclusive("A method that does not return a value cannot be verified.");
}
@@ -532,8 +529,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
IAsyncResult asyncResult = null; // TODO: Initialize to an appropriate value
string expected = string.Empty; // TODO: Initialize to an appropriate value
string actual;
@@ -550,8 +546,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
string expected = string.Empty; // TODO: Initialize to an appropriate value
string actual;
actual = target.Execute();
@@ -567,8 +562,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
string commandText1 = string.Empty; // TODO: Initialize to an appropriate value
string expected = string.Empty; // TODO: Initialize to an appropriate value
string actual;
@@ -585,8 +579,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
TimeSpan expected = new TimeSpan(); // TODO: Initialize to an appropriate value
TimeSpan actual;
target.CommandTimeout = expected;
@@ -603,8 +596,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
string actual;
actual = target.Error;
Assert.Inconclusive("Verify the correctness of this test method.");
@@ -618,8 +610,7 @@ namespace Renci.SshNet.Tests.Classes
{
Session session = null; // TODO: Initialize to an appropriate value
string commandText = string.Empty; // TODO: Initialize to an appropriate value
Encoding encoding = null; // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText, encoding); // TODO: Initialize to an appropriate value
SshCommand target = new SshCommand(session, commandText); // TODO: Initialize to an appropriate value
string actual;
actual = target.Result;
Assert.Inconclusive("Verify the correctness of this test method.");
Renci.SshClient/Renci.SshNet/ConnectionInfo.cs
+13 -12
View File
@@ -36,7 +36,7 @@ namespace Renci.SshNet
/// <summary>
/// Gets supported hash algorithms for this connection.
/// </summary>
public IDictionary<string, Func<byte[], HashAlgorithm>> HmacAlgorithms { get; private set; }
public IDictionary<string, HashInfo> HmacAlgorithms { get; private set; }
/// <summary>
/// Gets supported host key algorithms for this connection.
@@ -276,6 +276,7 @@ namespace Renci.SshNet
{"diffie-hellman-group-exchange-sha1", typeof(KeyExchangeDiffieHellmanGroupExchangeSha1)},
{"diffie-hellman-group14-sha1", typeof(KeyExchangeDiffieHellmanGroup14Sha1)},
{"diffie-hellman-group1-sha1", typeof(KeyExchangeDiffieHellmanGroup1Sha1)},
//{"ecdh-sha2-nistp256", typeof(KeyExchangeEllipticCurveDiffieHellman)},
//{"ecdh-sha2-nistp256", typeof(...)},
//{"ecdh-sha2-nistp384", typeof(...)},
//{"ecdh-sha2-nistp521", typeof(...)},
@@ -309,19 +310,19 @@ namespace Renci.SshNet
{"aes192-ctr", new CipherInfo(192, (key, iv)=>{ return new AesCipher(key, new CtrCipherMode(iv), null); }) },
};
this.HmacAlgorithms = new Dictionary<string, Func<byte[], HashAlgorithm>>()
this.HmacAlgorithms = new Dictionary<string, HashInfo>()
{
{"hmac-md5", (key) => { return new HMac<MD5Hash>(key.Take(16).ToArray());}},
{"hmac-sha1", (key) => { return new HMac<SHA1Hash>(key.Take(20).ToArray());}},
{"hmac-sha2-256", (key) => { return new HMac<SHA256Hash>(key.Take(32).ToArray());}},
{"hmac-sha2-256-96", (key) => { return new HMac<SHA256Hash>(key.Take(32).ToArray(), 96);}},
//{"hmac-sha2-512", typeof(...)},
//{"hmac-sha2-512-96", typeof(...)},
{"hmac-md5", new HashInfo(16 * 8, (key)=>{ return new HMac<MD5Hash>(key); }) },
{"hmac-sha1", new HashInfo(20 * 8, (key)=>{ return new HMac<SHA1Hash>(key); }) },
{"hmac-sha2-256", new HashInfo(32 * 8, (key)=>{ return new HMac<SHA256Hash>(key); }) },
{"hmac-sha2-256-96", new HashInfo(32 * 8, (key)=>{ return new HMac<SHA256Hash>(key, 96); }) },
//{"hmac-sha2-512", new HashInfo(64 * 8, (key)=>{ return new HMac<SHA512Hash>(key); }) },
//{"hmac-sha2-512-96", new HashInfo(64 * 8, (key)=>{ return new HMac<SHA512Hash>(key, 96); }) },
//{"umac-64@openssh.com", typeof(HMacSha1)},
{"hmac-ripemd160", (key) => { return new HMac<RIPEMD160Hash>(key.Take(20).ToArray());}},
{"hmac-ripemd160@openssh.com", (key) => { return new HMac<RIPEMD160Hash>(key.Take(20).ToArray());}},
{"hmac-md5-96", (key) => { return new HMac<MD5Hash>(key.Take(16).ToArray(), 96);}},
{"hmac-sha1-96", (key) => { return new HMac<SHA1Hash>(key.Take(20).ToArray(), 96);}},
{"hmac-ripemd160", new HashInfo(160, (key)=>{ return new HMac<RIPEMD160Hash>(key); }) },
{"hmac-ripemd160@openssh.com", new HashInfo(160, (key)=>{ return new HMac<RIPEMD160Hash>(key); }) },
{"hmac-md5-96", new HashInfo(16 * 8, (key)=>{ return new HMac<MD5Hash>(key, 96); }) },
{"hmac-sha1-96", new HashInfo(20 * 8, (key)=>{ return new HMac<SHA1Hash>(key, 96); }) },
//{"none", typeof(...)},
};
Renci.SshClient/Renci.SshNet/HashInfo.cs
+39
View File
@@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Renci.SshNet.Security.Cryptography;
using System.Security.Cryptography;
namespace Renci.SshNet
{
/// <summary>
/// Holds information about key size and cipher to use
/// </summary>
public class HashInfo
{
/// <summary>
/// Gets the size of the key.
/// </summary>
/// <value>
/// The size of the key.
/// </value>
public int KeySize { get; private set; }
/// <summary>
/// Gets the cipher.
/// </summary>
public Func<byte[], HashAlgorithm> HashAlgorithm { get; private set; }
/// <summary>
/// Initializes a new instance of the <see cref="CipherInfo"/> class.
/// </summary>
/// <param name="keySize">Size of the key.</param>
/// <param name="cipher">The cipher.</param>
public HashInfo(int keySize, Func<byte[], HashAlgorithm> hash)
{
this.KeySize = keySize;
this.HashAlgorithm = (key) => (hash(key.Take(this.KeySize / 8).ToArray()));
}
}
}
Renci.SshClient/Renci.SshNet/Renci.SshNet.csproj
+2
View File
@@ -131,6 +131,8 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="ConnectionInfo.cs" />
<Compile Include="HashInfo.cs" />
<Compile Include="Security\Cryptography\Hashes\SHA512Hash.cs" />
<Compile Include="Security\Cryptography\Hashes\RIPEMD160Hash.cs" />
<Compile Include="ShellStream.NET40.cs" />
<Compile Include="ExpectAsyncResult.cs" />
Renci.SshClient/Renci.SshNet/Security/Cryptography/HMAC.cs
+2 -2
View File
@@ -113,7 +113,7 @@ namespace Renci.SshNet.Security.Cryptography
{
if (!this._isHashing)
{
this._hash.TransformBlock(this._innerPadding, 0, 64, this._innerPadding, 0);
this._hash.TransformBlock(this._innerPadding, 0, this.BlockSize, this._innerPadding, 0);
this._isHashing = true;
}
@@ -130,7 +130,7 @@ namespace Renci.SshNet.Security.Cryptography
this._isHashing = false;
return this._hash.Hash;
return this._hash.Hash.Take(this.HashSize / 8).ToArray();
}
private void InternalInitialize()
Renci.SshClient/Renci.SshNet/Security/Cryptography/Hashes/RIPEMD160Hash.cs
+2 -1
View File
@@ -11,10 +11,11 @@ namespace Renci.SshNet.Security.Cryptography
/// </summary>
public class RIPEMD160Hash : HashAlgorithm
{
private const int DIGEST_SIZE = 20;
private byte[] _buffer;
private int _bufferOffset;
private long _byteCount;
private const int DIGEST_SIZE = 20;
private int _offset;
private int H0, H1, H2, H3, H4; // IV's
private int[] X = new int[16];
Renci.SshClient/Renci.SshNet/Security/Cryptography/Hashes/SHA512Hash.cs
+430
View File
@@ -0,0 +1,430 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Security.Cryptography;
namespace Renci.SshNet.Security.Cryptography
{
/// <summary>
/// SHA256 algorithm implementation.
/// </summary>
public class SHA512Hash : HashAlgorithm
{
private const int DIGEST_SIZE = 64;
private ulong H1, H2, H3, H4, H5, H6, H7, H8;
private ulong[] X = new ulong[80];
private int _offset;
private byte[] _buffer;
private int _bufferOffset;
private long _byteCount;
private long _byteCount2;
/// <summary>
/// Gets the size, in bits, of the computed hash code.
/// </summary>
/// <returns>The size, in bits, of the computed hash code.</returns>
public override int HashSize
{
get
{
return DIGEST_SIZE * 8;
}
}
/// <summary>
/// Gets the input block size.
/// </summary>
/// <returns>The input block size.</returns>
public override int InputBlockSize
{
get
{
return 128;
}
}
/// <summary>
/// Gets the output block size.
/// </summary>
/// <returns>The output block size.</returns>
public override int OutputBlockSize
{
get
{
return 128;
}
}
/// <summary>
/// Gets a value indicating whether the current transform can be reused.
/// </summary>
/// <returns>Always true.</returns>
public override bool CanReuseTransform
{
get
{
return true;
}
}
/// <summary>
/// Gets a value indicating whether multiple blocks can be transformed.
/// </summary>
/// <returns>true if multiple blocks can be transformed; otherwise, false.</returns>
public override bool CanTransformMultipleBlocks
{
get
{
return true;
}
}
/// <summary>
/// Initializes a new instance of the <see cref="SHA1"/> class.
/// </summary>
public SHA512Hash()
{
this._buffer = new byte[8];
this.InternalInitialize();
}
/// <summary>
/// Routes data written to the object into the hash algorithm for computing the hash.
/// </summary>
/// <param name="array">The input to compute the hash code for.</param>
/// <param name="ibStart">The offset into the byte array from which to begin using data.</param>
/// <param name="cbSize">The number of bytes in the byte array to use as data.</param>
protected override void HashCore(byte[] array, int ibStart, int cbSize)
{
// Fill the current word
while ((this._bufferOffset != 0) && (cbSize > 0))
{
this.Update(array[ibStart]);
ibStart++;
cbSize--;
}
// Process whole words.
while (cbSize > this._buffer.Length)
{
this.ProcessWord(array, ibStart);
ibStart += this._buffer.Length;
cbSize -= this._buffer.Length;
this._byteCount += this._buffer.Length;
}
// Load in the remainder.
while (cbSize > 0)
{
this.Update(array[ibStart]);
ibStart++;
cbSize--;
}
}
/// <summary>
/// Finalizes the hash computation after the last data is processed by the cryptographic stream object.
/// </summary>
/// <returns>
/// The computed hash code.
/// </returns>
protected override byte[] HashFinal()
{
var output = new byte[DIGEST_SIZE];
AdjustByteCounts();
long lowBitLength = this._byteCount << 3;
long hiBitLength = this._byteCount2;
//
// add the pad bytes.
//
Update((byte)128);
while (this._bufferOffset != 0)
{
Update((byte)0);
}
ProcessLength(lowBitLength, hiBitLength);
ProcessBlock();
UInt64_To_BE(H1, output, 0);
UInt64_To_BE(H2, output, 0 + 8);
UInt64_To_BE(H3, output, 0 + 16);
UInt64_To_BE(H4, output, 0 + 24);
UInt64_To_BE(H5, output, 0 + 32);
UInt64_To_BE(H6, output, 0 + 40);
UInt64_To_BE(H7, output, 0 + 48);
UInt64_To_BE(H8, output, 0 + 56);
this.Initialize();
return output;
}
/// <summary>
/// Initializes an implementation of the <see cref="T:System.Security.Cryptography.HashAlgorithm"/> class.
/// </summary>
public override void Initialize()
{
this.InternalInitialize();
}
private void InternalInitialize()
{
this._byteCount = 0;
this._byteCount2 = 0;
this._bufferOffset = 0;
Array.Clear(this._buffer, 0, this._buffer.Length);
this._offset = 0;
Array.Clear(X, 0, X.Length);
H1 = 0x6a09e667f3bcc908;
H2 = 0xbb67ae8584caa73b;
H3 = 0x3c6ef372fe94f82b;
H4 = 0xa54ff53a5f1d36f1;
H5 = 0x510e527fade682d1;
H6 = 0x9b05688c2b3e6c1f;
H7 = 0x1f83d9abfb41bd6b;
H8 = 0x5be0cd19137e2179;
}
private void Update(byte input)
{
this._buffer[this._bufferOffset++] = input;
if (this._bufferOffset == this._buffer.Length)
{
ProcessWord(this._buffer, 0);
this._bufferOffset = 0;
}
this._byteCount++;
}
private static void UInt32_To_BE(uint n, byte[] bs, int off)
{
bs[off] = (byte)(n >> 24);
bs[++off] = (byte)(n >> 16);
bs[++off] = (byte)(n >> 8);
bs[++off] = (byte)(n);
}
private static void UInt64_To_BE(ulong n, byte[] bs, int off)
{
UInt32_To_BE((uint)(n >> 32), bs, off);
UInt32_To_BE((uint)(n), bs, off + 4);
}
private static uint BE_To_UInt32(byte[] bs, int off)
{
uint n = (uint)bs[off] << 24;
n |= (uint)bs[++off] << 16;
n |= (uint)bs[++off] << 8;
n |= (uint)bs[++off];
return n;
}
private static ulong BE_To_UInt64(byte[] bs, int off)
{
uint hi = BE_To_UInt32(bs, off);
uint lo = BE_To_UInt32(bs, off + 4);
return ((ulong)hi << 32) | (ulong)lo;
}
private void ProcessWord(byte[] input, int inOff)
{
X[this._offset] = BE_To_UInt64(input, inOff);
if (++this._offset == 16)
{
ProcessBlock();
}
}
private void ProcessLength(long low, long high)
{
if (this._offset > 14)
{
ProcessBlock();
}
X[14] = (ulong)high;
X[15] = (ulong)low;
}
private void ProcessBlock()
{
AdjustByteCounts();
//
// expand 16 word block into 80 word blocks.
//
for (int ti = 16; ti <= 79; ++ti)
{
X[ti] = Sigma1(X[ti - 2]) + X[ti - 7] + Sigma0(X[ti - 15]) + X[ti - 16];
}
//
// set up working variables.
//
ulong a = H1;
ulong b = H2;
ulong c = H3;
ulong d = H4;
ulong e = H5;
ulong f = H6;
ulong g = H7;
ulong h = H8;
int t = 0;
for (int i = 0; i < 10; i++)
{
// t = 8 * i
h += Sum1(e) + Ch(e, f, g) + K[t] + X[t++];
d += h;
h += Sum0(a) + Maj(a, b, c);
// t = 8 * i + 1
g += Sum1(d) + Ch(d, e, f) + K[t] + X[t++];
c += g;
g += Sum0(h) + Maj(h, a, b);
// t = 8 * i + 2
f += Sum1(c) + Ch(c, d, e) + K[t] + X[t++];
b += f;
f += Sum0(g) + Maj(g, h, a);
// t = 8 * i + 3
e += Sum1(b) + Ch(b, c, d) + K[t] + X[t++];
a += e;
e += Sum0(f) + Maj(f, g, h);
// t = 8 * i + 4
d += Sum1(a) + Ch(a, b, c) + K[t] + X[t++];
h += d;
d += Sum0(e) + Maj(e, f, g);
// t = 8 * i + 5
c += Sum1(h) + Ch(h, a, b) + K[t] + X[t++];
g += c;
c += Sum0(d) + Maj(d, e, f);
// t = 8 * i + 6
b += Sum1(g) + Ch(g, h, a) + K[t] + X[t++];
f += b;
b += Sum0(c) + Maj(c, d, e);
// t = 8 * i + 7
a += Sum1(f) + Ch(f, g, h) + K[t] + X[t++];
e += a;
a += Sum0(b) + Maj(b, c, d);
}
H1 += a;
H2 += b;
H3 += c;
H4 += d;
H5 += e;
H6 += f;
H7 += g;
H8 += h;
//
// reset the offset and clean out the word buffer.
//
_bufferOffset = 0;
Array.Clear(X, 0, 16);
}
/**
* adjust the byte counts so that byteCount2 represents the
* upper long (less 3 bits) word of the byte count.
*/
private void AdjustByteCounts()
{
if (this._byteCount > 0x1fffffffffffffffL)
{
this._byteCount2 += (long)((ulong)this._byteCount >> 61);
this._byteCount &= 0x1fffffffffffffffL;
}
}
/* SHA-384 and SHA-512 functions (as for SHA-256 but for longs) */
private static ulong Ch(ulong x, ulong y, ulong z)
{
return (x & y) ^ (~x & z);
}
private static ulong Maj(ulong x, ulong y, ulong z)
{
return (x & y) ^ (x & z) ^ (y & z);
}
private static ulong Sum0(ulong x)
{
return ((x << 36) | (x >> 28)) ^ ((x << 30) | (x >> 34)) ^ ((x << 25) | (x >> 39));
}
private static ulong Sum1(ulong x)
{
return ((x << 50) | (x >> 14)) ^ ((x << 46) | (x >> 18)) ^ ((x << 23) | (x >> 41));
}
private static ulong Sigma0(ulong x)
{
return ((x << 63) | (x >> 1)) ^ ((x << 56) | (x >> 8)) ^ (x >> 7);
}
private static ulong Sigma1(ulong x)
{
return ((x << 45) | (x >> 19)) ^ ((x << 3) | (x >> 61)) ^ (x >> 6);
}
/* SHA-384 and SHA-512 Constants
* (represent the first 64 bits of the fractional parts of the
* cube roots of the first sixty-four prime numbers)
*/
internal static readonly ulong[] K =
{
0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f, 0xe9b5dba58189dbbc,
0x3956c25bf348b538, 0x59f111f1b605d019, 0x923f82a4af194f9b, 0xab1c5ed5da6d8118,
0xd807aa98a3030242, 0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235, 0xc19bf174cf692694,
0xe49b69c19ef14ad2, 0xefbe4786384f25e3, 0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65,
0x2de92c6f592b0275, 0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f, 0xbf597fc7beef0ee4,
0xc6e00bf33da88fc2, 0xd5a79147930aa725, 0x06ca6351e003826f, 0x142929670a0e6e70,
0x27b70a8546d22ffc, 0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6, 0x92722c851482353b,
0xa2bfe8a14cf10364, 0xa81a664bbc423001, 0xc24b8b70d0f89791, 0xc76c51a30654be30,
0xd192e819d6ef5218, 0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99, 0x34b0bcb5e19b48a8,
0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb, 0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3,
0x748f82ee5defb2fc, 0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec,
0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b,
0xca273eceea26619c, 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178,
0x06f067aa72176fba, 0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b,
0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc, 0x431d67c49c100d4c,
0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
};
}
}
Renci.SshClient/Renci.SshNet/Security/KeyExchange.cs
+14 -6
View File
@@ -20,9 +20,9 @@ namespace Renci.SshNet.Security
private CipherInfo _serverCipherInfo;
private Func<byte[], HashAlgorithm> _cientHmacAlgorithmType;
private HashInfo _clientHashInfo;
private Func<byte[], HashAlgorithm> _serverHmacAlgorithmType;
private HashInfo _serverHashInfo;
private Type _compressionType;
@@ -152,8 +152,8 @@ namespace Renci.SshNet.Security
this._clientCipherInfo = session.ConnectionInfo.Encryptions[clientEncryptionAlgorithmName];
this._serverCipherInfo = session.ConnectionInfo.Encryptions[clientEncryptionAlgorithmName];
this._cientHmacAlgorithmType = session.ConnectionInfo.HmacAlgorithms[clientHmacAlgorithmName];
this._serverHmacAlgorithmType = session.ConnectionInfo.HmacAlgorithms[serverHmacAlgorithmName];
this._clientHashInfo = session.ConnectionInfo.HmacAlgorithms[clientHmacAlgorithmName];
this._serverHashInfo = session.ConnectionInfo.HmacAlgorithms[serverHmacAlgorithmName];
this._compressionType = session.ConnectionInfo.CompressionAlgorithms[compressionAlgorithmName];
this._decompressionType = session.ConnectionInfo.CompressionAlgorithms[decompressionAlgorithmName];
}
@@ -225,8 +225,12 @@ namespace Renci.SshNet.Security
// Resolve Session ID
var sessionId = this.Session.SessionId ?? this.ExchangeHash;
var serverKey = this.Hash(this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, 'F', sessionId));
serverKey = this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, serverKey, this._serverHashInfo.KeySize / 8);
//return serverHMac;
return this._serverHmacAlgorithmType(this.Hash(this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, 'F', sessionId)));
return this._serverHashInfo.HashAlgorithm(serverKey);
}
/// <summary>
@@ -238,8 +242,12 @@ namespace Renci.SshNet.Security
// Resolve Session ID
var sessionId = this.Session.SessionId ?? this.ExchangeHash;
var clientKey = this.Hash(this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, 'E', sessionId));
clientKey = this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, clientKey, this._clientHashInfo.KeySize / 8);
//return clientHMac;
return this._cientHmacAlgorithmType(this.Hash(this.GenerateSessionKey(this.SharedKey, this.ExchangeHash, 'E', sessionId)));
return this._clientHashInfo.HashAlgorithm(clientKey);
}
/// <summary>