Rename HashAlgorithmFactory to CryptoAbstraction, and move it to the Renci.SshNet.Abstractions namespace.

drieseng · drieseng · commit 1d5d58e17c68 · 2016-07-23T10:49:21.000+02:00
diff --git a/src/Renci.SshNet.Tests/Classes/Security/Cryptography/HMacTest.cs b/src/Renci.SshNet.Tests/Classes/Security/Cryptography/HMacTest.cs
@@ -1,8 +1,7 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Renci.SshNet.Security.Cryptography;
 using Renci.SshNet.Tests.Common;
 using Renci.SshNet.Tests.Properties;
-using System.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet.Tests.Classes.Security.Cryptography
 {
@@ -19,7 +18,7 @@ public void Test_HMac_MD5_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, HashAlgorithmFactory.CreateHMACMD5));
+            connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, CryptoAbstraction.CreateHMACMD5));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -34,7 +33,7 @@ public void Test_HMac_Sha1_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, HashAlgorithmFactory.CreateHMACSHA1));
+            connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, CryptoAbstraction.CreateHMACSHA1));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -49,7 +48,7 @@ public void Test_HMac_MD5_96_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, key => HashAlgorithmFactory.CreateHMACMD5(key, 96)));
+            connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, key => CryptoAbstraction.CreateHMACMD5(key, 96)));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -64,7 +63,7 @@ public void Test_HMac_Sha1_96_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, key => HashAlgorithmFactory.CreateHMACSHA1(key, 96)));
+            connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, key => CryptoAbstraction.CreateHMACSHA1(key, 96)));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -79,7 +78,7 @@ public void Test_HMac_Sha256_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-sha2-256", new HashInfo(32 * 8, HashAlgorithmFactory.CreateHMACSHA256));
+            connectionInfo.HmacAlgorithms.Add("hmac-sha2-256", new HashInfo(32 * 8, CryptoAbstraction.CreateHMACSHA256));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -94,7 +93,7 @@ public void Test_HMac_Sha256_96_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-sha2-256-96", new HashInfo(32 * 8, (key) => HashAlgorithmFactory.CreateHMACSHA256(key, 96)));
+            connectionInfo.HmacAlgorithms.Add("hmac-sha2-256-96", new HashInfo(32 * 8, (key) => CryptoAbstraction.CreateHMACSHA256(key, 96)));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -109,7 +108,7 @@ public void Test_HMac_RIPEMD160_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-ripemd160", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160));
+            connectionInfo.HmacAlgorithms.Add("hmac-ripemd160", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160));
 
             using (var client = new SshClient(connectionInfo))
             {
@@ -124,7 +123,7 @@ public void Test_HMac_RIPEMD160_OPENSSH_Connection()
         {
             var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);
             connectionInfo.HmacAlgorithms.Clear();
-            connectionInfo.HmacAlgorithms.Add("hmac-ripemd160@openssh.com", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160));
+            connectionInfo.HmacAlgorithms.Add("hmac-ripemd160@openssh.com", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160));
 
             using (var client = new SshClient(connectionInfo))
             {
diff --git a/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs b/src/Renci.SshNet/Abstractions/CryptoAbstraction.cs
@@ -1,8 +1,9 @@
 ﻿using System;
+using Renci.SshNet.Security.Cryptography;
 
-namespace Renci.SshNet.Security.Cryptography
+namespace Renci.SshNet.Abstractions
 {
-    internal static class HashAlgorithmFactory
+    internal static class CryptoAbstraction
     {
 #if FEATURE_RNG_CREATE || FEATURE_RNG_CSP
         private static readonly System.Security.Cryptography.RandomNumberGenerator Randomizer = CreateRandomNumberGenerator();
diff --git a/src/Renci.SshNet/Common/BigInteger.cs b/src/Renci.SshNet/Common/BigInteger.cs
@@ -51,7 +51,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using Renci.SshNet.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 
 /*
 Optimization
@@ -174,7 +174,7 @@ public static BigInteger PositiveMod(BigInteger dividend, BigInteger divisor)
         public static BigInteger Random(int bitLength)
         {
             var bytesArray = new byte[bitLength / 8 + (((bitLength % 8) > 0) ? 1 : 0)];
-            HashAlgorithmFactory.GenerateRandom(bytesArray);
+            CryptoAbstraction.GenerateRandom(bytesArray);
             bytesArray[bytesArray.Length - 1] = (byte)(bytesArray[bytesArray.Length - 1] & 0x7F);   //  Ensure not a negative value
             return new BigInteger(bytesArray);
         }
diff --git a/src/Renci.SshNet/Common/HostKeyEventArgs.cs b/src/Renci.SshNet/Common/HostKeyEventArgs.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using Renci.SshNet.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Security;
 
 namespace Renci.SshNet.Common
@@ -54,7 +54,7 @@ public HostKeyEventArgs(KeyHostAlgorithm host)
 
             KeyLength = host.Key.KeyLength;
 
-            using (var md5 = HashAlgorithmFactory.CreateMD5())
+            using (var md5 = CryptoAbstraction.CreateMD5())
             {
                 FingerPrint = md5.ComputeHash(host.Data);
             }
diff --git a/src/Renci.SshNet/ConnectionInfo.cs b/src/Renci.SshNet/ConnectionInfo.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Security;
 using Renci.SshNet.Messages.Connection;
 using Renci.SshNet.Common;
 using Renci.SshNet.Messages.Authentication;
-using Renci.SshNet.Security.Cryptography;
 using Renci.SshNet.Security.Cryptography.Ciphers.Modes;
 using Renci.SshNet.Security.Cryptography.Ciphers;
 
@@ -332,17 +332,17 @@ public ConnectionInfo(string host, int port, string username, ProxyTypes proxyTy
 
             HmacAlgorithms = new Dictionary<string, HashInfo>
                 {
-                    {"hmac-md5", new HashInfo(16*8, HashAlgorithmFactory.CreateHMACMD5)},
-                    {"hmac-md5-96", new HashInfo(16*8, key => HashAlgorithmFactory.CreateHMACMD5(key, 96))},
-                    {"hmac-sha1", new HashInfo(20*8, HashAlgorithmFactory.CreateHMACSHA1)},
-                    {"hmac-sha1-96", new HashInfo(20*8, key => HashAlgorithmFactory.CreateHMACSHA1(key, 96))},
-                    {"hmac-sha2-256", new HashInfo(32*8, HashAlgorithmFactory.CreateHMACSHA256)},
-                    {"hmac-sha2-256-96", new HashInfo(32*8, key => HashAlgorithmFactory.CreateHMACSHA256(key, 96))},
-                    {"hmac-sha2-512", new HashInfo(64 * 8, HashAlgorithmFactory.CreateHMACSHA512)},
-                    {"hmac-sha2-512-96", new HashInfo(64 * 8,  key => HashAlgorithmFactory.CreateHMACSHA512(key, 96))},
+                    {"hmac-md5", new HashInfo(16*8, CryptoAbstraction.CreateHMACMD5)},
+                    {"hmac-md5-96", new HashInfo(16*8, key => CryptoAbstraction.CreateHMACMD5(key, 96))},
+                    {"hmac-sha1", new HashInfo(20*8, CryptoAbstraction.CreateHMACSHA1)},
+                    {"hmac-sha1-96", new HashInfo(20*8, key => CryptoAbstraction.CreateHMACSHA1(key, 96))},
+                    {"hmac-sha2-256", new HashInfo(32*8, CryptoAbstraction.CreateHMACSHA256)},
+                    {"hmac-sha2-256-96", new HashInfo(32*8, key => CryptoAbstraction.CreateHMACSHA256(key, 96))},
+                    {"hmac-sha2-512", new HashInfo(64 * 8, CryptoAbstraction.CreateHMACSHA512)},
+                    {"hmac-sha2-512-96", new HashInfo(64 * 8,  key => CryptoAbstraction.CreateHMACSHA512(key, 96))},
                     //{"umac-64@openssh.com", typeof(HMacSha1)},
-                    {"hmac-ripemd160", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160)},
-                    {"hmac-ripemd160@openssh.com", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160)},
+                    {"hmac-ripemd160", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160)},
+                    {"hmac-ripemd160@openssh.com", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160)},
                     //{"none", typeof(...)},
                 };
 
diff --git a/src/Renci.SshNet/Messages/Message.cs b/src/Renci.SshNet/Messages/Message.cs
@@ -4,7 +4,6 @@
 using System.Globalization;
 using Renci.SshNet.Abstractions;
 using Renci.SshNet.Compression;
-using Renci.SshNet.Security.Cryptography;
 
 namespace Renci.SshNet.Messages
 {
@@ -100,7 +99,7 @@ internal byte[] GetPacket(byte paddingMultiplier, Compressor compressor)
 
                 // add padding bytes
                 var paddingBytes = new byte[paddingLength];
-                HashAlgorithmFactory.GenerateRandom(paddingBytes);
+                CryptoAbstraction.GenerateRandom(paddingBytes);
                 sshDataStream.Write(paddingBytes, 0, paddingLength);
 
                 var packetDataLength = GetPacketDataLength(messageLength, paddingLength);
@@ -140,7 +139,7 @@ internal byte[] GetPacket(byte paddingMultiplier, Compressor compressor)
 
                 // add padding bytes
                 var paddingBytes = new byte[paddingLength];
-                HashAlgorithmFactory.GenerateRandom(paddingBytes);
+                CryptoAbstraction.GenerateRandom(paddingBytes);
                 sshDataStream.Write(paddingBytes, 0, paddingLength);
             }
 
diff --git a/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs b/src/Renci.SshNet/Messages/Transport/KeyExchangeInitMessage.cs
@@ -1,4 +1,4 @@
-﻿using Renci.SshNet.Security.Cryptography;
+﻿using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet.Messages.Transport
 {
@@ -14,7 +14,7 @@ public class KeyExchangeInitMessage : Message, IKeyExchangedAllowed
         public KeyExchangeInitMessage()
         {
             var cookie = new byte[16];
-            HashAlgorithmFactory.GenerateRandom(cookie);
+            CryptoAbstraction.GenerateRandom(cookie);
             Cookie = cookie;
         }
 
diff --git a/src/Renci.SshNet/PrivateKeyFile.cs b/src/Renci.SshNet/PrivateKeyFile.cs
@@ -3,10 +3,10 @@
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Security;
 using Renci.SshNet.Common;
 using System.Globalization;
-using Renci.SshNet.Security.Cryptography;
 using Renci.SshNet.Security.Cryptography.Ciphers;
 using Renci.SshNet.Security.Cryptography.Ciphers.Modes;
 using Renci.SshNet.Security.Cryptography.Ciphers.Paddings;
@@ -278,7 +278,7 @@ private static byte[] GetCipherKey(string passphrase, int length)
         {
             var cipherKey = new List<byte>();
 
-            using (var md5 = HashAlgorithmFactory.CreateMD5())
+            using (var md5 = CryptoAbstraction.CreateMD5())
             {
                 var passwordBytes = Encoding.UTF8.GetBytes(passphrase);
 
@@ -319,7 +319,7 @@ private static byte[] DecryptKey(CipherInfo cipherInfo, byte[] cipherData, strin
 
             var cipherKey = new List<byte>();
 
-            using (var md5 = HashAlgorithmFactory.CreateMD5())
+            using (var md5 = CryptoAbstraction.CreateMD5())
             {
                 var passwordBytes = Encoding.UTF8.GetBytes(passPhrase);
 
diff --git a/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs b/src/Renci.SshNet/Security/Cryptography/DsaDigitalSignature.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 
 namespace Renci.SshNet.Security.Cryptography
@@ -25,7 +26,7 @@ public DsaDigitalSignature(DsaKey key)
 
             _key = key;
 
-            _hash = HashAlgorithmFactory.CreateSHA1();
+            _hash = CryptoAbstraction.CreateSHA1();
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs b/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Security.Cryptography.Ciphers;
 
@@ -19,7 +20,7 @@ public class RsaDigitalSignature : CipherDigitalSignature, IDisposable
         public RsaDigitalSignature(RsaKey rsaKey)
             : base(new ObjectIdentifier(1, 3, 14, 3, 2, 26), new RsaCipher(rsaKey))
         {
-            _hash = HashAlgorithmFactory.CreateSHA1();
+            _hash = CryptoAbstraction.CreateSHA1();
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/Security/KeyExchange.cs b/src/Renci.SshNet/Security/KeyExchange.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
+using Renci.SshNet.Abstractions;
 using Renci.SshNet.Common;
 using Renci.SshNet.Compression;
 using Renci.SshNet.Messages;
@@ -318,7 +319,7 @@ protected bool CanTrustHostKey(KeyHostAlgorithm host)
         /// </returns>
         protected virtual byte[] Hash(byte[] hashData)
         {
-            using (var sha1 = HashAlgorithmFactory.CreateSHA1())
+            using (var sha1 = CryptoAbstraction.CreateSHA1())
             {
                 return sha1.ComputeHash(hashData, 0, hashData.Length);
             }
diff --git a/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupExchangeSha256.cs b/src/Renci.SshNet/Security/KeyExchangeDiffieHellmanGroupExchangeSha256.cs
@@ -1,4 +1,4 @@
-﻿using Renci.SshNet.Security.Cryptography;
+﻿using Renci.SshNet.Abstractions;
 
 namespace Renci.SshNet.Security
 {
@@ -24,7 +24,7 @@ public override string Name
         /// </returns>
         protected override byte[] Hash(byte[] hashBytes)
         {
-            using (var sha256 = HashAlgorithmFactory.CreateSHA256())
+            using (var sha256 = CryptoAbstraction.CreateSHA256())
             {
                 return sha256.ComputeHash(hashBytes);
             }
diff --git a/test/Renci.SshNet.Shared.Tests/Abstractions/CryptoAbstraction_GenerateRandom.cs b/test/Renci.SshNet.Shared.Tests/Abstractions/CryptoAbstraction_GenerateRandom.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Linq;
+using Renci.SshNet.Abstractions;
 #if SILVERLIGHT
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 #else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
-using Renci.SshNet.Security.Cryptography;
 
 namespace Renci.SshNet.Tests.Abstractions
 {
@@ -19,7 +19,7 @@ public void ShouldThrowArgumentNullExceptionWhenDataIsNull()
 
             try
             {
-                HashAlgorithmFactory.GenerateRandom(data); 
+                CryptoAbstraction.GenerateRandom(data); 
                 Assert.Fail();
             }
             catch (ArgumentNullException ex)
@@ -34,7 +34,7 @@ public void ShouldPerformNoOpWhenDataIsZeroLength()
         {
             var data = new byte[0];
 
-            HashAlgorithmFactory.GenerateRandom(data);
+            CryptoAbstraction.GenerateRandom(data);
         }
 
         [TestMethod]
@@ -44,8 +44,8 @@ public void ShouldGenerateRandomSequenceOfValues()
             var dataA = new byte[dataLength];
             var dataB = new byte[dataLength];
 
-            HashAlgorithmFactory.GenerateRandom(dataA);
-            HashAlgorithmFactory.GenerateRandom(dataB);
+            CryptoAbstraction.GenerateRandom(dataA);
+            CryptoAbstraction.GenerateRandom(dataB);
 
             Assert.IsFalse(dataA.SequenceEqual(dataB));
         }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`2`		`-using Renci.SshNet.Security.Cryptography;`
`3`	`2`	`using Renci.SshNet.Tests.Common;`
`4`	`3`	`using Renci.SshNet.Tests.Properties;`
`5`		`-using System.Security.Cryptography;`
	`4`	`+using Renci.SshNet.Abstractions;`
`6`	`5`
`7`	`6`	`namespace Renci.SshNet.Tests.Classes.Security.Cryptography`
`8`	`7`	`{`
`@@ -19,7 +18,7 @@ public void Test_HMac_MD5_Connection()`
`19`	`18`	`{`
`20`	`19`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`21`	`20`	`connectionInfo.HmacAlgorithms.Clear();`
`22`		`- connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, HashAlgorithmFactory.CreateHMACMD5));`
	`21`	`+ connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, CryptoAbstraction.CreateHMACMD5));`
`23`	`22`
`24`	`23`	`using (var client = new SshClient(connectionInfo))`
`25`	`24`	`{`
`@@ -34,7 +33,7 @@ public void Test_HMac_Sha1_Connection()`
`34`	`33`	`{`
`35`	`34`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`36`	`35`	`connectionInfo.HmacAlgorithms.Clear();`
`37`		`- connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, HashAlgorithmFactory.CreateHMACSHA1));`
	`36`	`+ connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, CryptoAbstraction.CreateHMACSHA1));`
`38`	`37`
`39`	`38`	`using (var client = new SshClient(connectionInfo))`
`40`	`39`	`{`
`@@ -49,7 +48,7 @@ public void Test_HMac_MD5_96_Connection()`
`49`	`48`	`{`
`50`	`49`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`51`	`50`	`connectionInfo.HmacAlgorithms.Clear();`
`52`		`- connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, key => HashAlgorithmFactory.CreateHMACMD5(key, 96)));`
	`51`	`+ connectionInfo.HmacAlgorithms.Add("hmac-md5", new HashInfo(16 * 8, key => CryptoAbstraction.CreateHMACMD5(key, 96)));`
`53`	`52`
`54`	`53`	`using (var client = new SshClient(connectionInfo))`
`55`	`54`	`{`
`@@ -64,7 +63,7 @@ public void Test_HMac_Sha1_96_Connection()`
`64`	`63`	`{`
`65`	`64`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`66`	`65`	`connectionInfo.HmacAlgorithms.Clear();`
`67`		`- connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, key => HashAlgorithmFactory.CreateHMACSHA1(key, 96)));`
	`66`	`+ connectionInfo.HmacAlgorithms.Add("hmac-sha1", new HashInfo(20 * 8, key => CryptoAbstraction.CreateHMACSHA1(key, 96)));`
`68`	`67`
`69`	`68`	`using (var client = new SshClient(connectionInfo))`
`70`	`69`	`{`
`@@ -79,7 +78,7 @@ public void Test_HMac_Sha256_Connection()`
`79`	`78`	`{`
`80`	`79`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`81`	`80`	`connectionInfo.HmacAlgorithms.Clear();`
`82`		`- connectionInfo.HmacAlgorithms.Add("hmac-sha2-256", new HashInfo(32 * 8, HashAlgorithmFactory.CreateHMACSHA256));`
	`81`	`+ connectionInfo.HmacAlgorithms.Add("hmac-sha2-256", new HashInfo(32 * 8, CryptoAbstraction.CreateHMACSHA256));`
`83`	`82`
`84`	`83`	`using (var client = new SshClient(connectionInfo))`
`85`	`84`	`{`
`@@ -94,7 +93,7 @@ public void Test_HMac_Sha256_96_Connection()`
`94`	`93`	`{`
`95`	`94`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`96`	`95`	`connectionInfo.HmacAlgorithms.Clear();`
`97`		`- connectionInfo.HmacAlgorithms.Add("hmac-sha2-256-96", new HashInfo(32 * 8, (key) => HashAlgorithmFactory.CreateHMACSHA256(key, 96)));`
	`96`	`+ connectionInfo.HmacAlgorithms.Add("hmac-sha2-256-96", new HashInfo(32 * 8, (key) => CryptoAbstraction.CreateHMACSHA256(key, 96)));`
`98`	`97`
`99`	`98`	`using (var client = new SshClient(connectionInfo))`
`100`	`99`	`{`
`@@ -109,7 +108,7 @@ public void Test_HMac_RIPEMD160_Connection()`
`109`	`108`	`{`
`110`	`109`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`111`	`110`	`connectionInfo.HmacAlgorithms.Clear();`
`112`		`- connectionInfo.HmacAlgorithms.Add("hmac-ripemd160", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160));`
	`111`	`+ connectionInfo.HmacAlgorithms.Add("hmac-ripemd160", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160));`
`113`	`112`
`114`	`113`	`using (var client = new SshClient(connectionInfo))`
`115`	`114`	`{`
`@@ -124,7 +123,7 @@ public void Test_HMac_RIPEMD160_OPENSSH_Connection()`
`124`	`123`	`{`
`125`	`124`	`var connectionInfo = new PasswordConnectionInfo(Resources.HOST, int.Parse(Resources.PORT), Resources.USERNAME, Resources.PASSWORD);`
`126`	`125`	`connectionInfo.HmacAlgorithms.Clear();`
`127`		`- connectionInfo.HmacAlgorithms.Add("[email protected]", new HashInfo(160, HashAlgorithmFactory.CreateHMACRIPEMD160));`
	`126`	`+ connectionInfo.HmacAlgorithms.Add("[email protected]", new HashInfo(160, CryptoAbstraction.CreateHMACRIPEMD160));`
`128`	`127`
`129`	`128`	`using (var client = new SshClient(connectionInfo))`
`130`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System;`
	`2`	`+using Renci.SshNet.Security.Cryptography;`
`2`	`3`
`3`		`-namespace Renci.SshNet.Security.Cryptography`
	`4`	`+namespace Renci.SshNet.Abstractions`
`4`	`5`	`{`
`5`		`- internal static class HashAlgorithmFactory`
	`6`	`+ internal static class CryptoAbstraction`
`6`	`7`	`{`
`7`	`8`	`#if FEATURE_RNG_CREATE \|\| FEATURE_RNG_CSP`
`8`	`9`	`private static readonly System.Security.Cryptography.RandomNumberGenerator Randomizer = CreateRandomNumberGenerator();`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`using System;`
`2`		`-using Renci.SshNet.Security.Cryptography;`
	`2`	`+using Renci.SshNet.Abstractions;`
`3`	`3`	`using Renci.SshNet.Security;`
`4`	`4`
`5`	`5`	`namespace Renci.SshNet.Common`
`@@ -54,7 +54,7 @@ public HostKeyEventArgs(KeyHostAlgorithm host)`
`54`	`54`
`55`	`55`	`KeyLength = host.Key.KeyLength;`
`56`	`56`
`57`		`- using (var md5 = HashAlgorithmFactory.CreateMD5())`
	`57`	`+ using (var md5 = CryptoAbstraction.CreateMD5())`
`58`	`58`	`{`
`59`	`59`	`FingerPrint = md5.ComputeHash(host.Data);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Renci.SshNet.Security.Cryptography;`
	`1`	`+using Renci.SshNet.Abstractions;`
`2`	`2`
`3`	`3`	`namespace Renci.SshNet.Messages.Transport`
`4`	`4`	`{`
`@@ -14,7 +14,7 @@ public class KeyExchangeInitMessage : Message, IKeyExchangedAllowed`
`14`	`14`	`public KeyExchangeInitMessage()`
`15`	`15`	`{`
`16`	`16`	`var cookie = new byte[16];`
`17`		`- HashAlgorithmFactory.GenerateRandom(cookie);`
	`17`	`+ CryptoAbstraction.GenerateRandom(cookie);`
`18`	`18`	`Cookie = cookie;`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Security.Cryptography;`
	`3`	`+using Renci.SshNet.Abstractions;`
`3`	`4`	`using Renci.SshNet.Common;`
`4`	`5`	`using Renci.SshNet.Security.Cryptography.Ciphers;`
`5`	`6`
`@@ -19,7 +20,7 @@ public class RsaDigitalSignature : CipherDigitalSignature, IDisposable`
`19`	`20`	`public RsaDigitalSignature(RsaKey rsaKey)`
`20`	`21`	`: base(new ObjectIdentifier(1, 3, 14, 3, 2, 26), new RsaCipher(rsaKey))`
`21`	`22`	`{`
`22`		`- _hash = HashAlgorithmFactory.CreateSHA1();`
	`23`	`+ _hash = CryptoAbstraction.CreateSHA1();`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`/// <summary>`