Improvements after #1177 (#1180)

WojciechNagorski · web-flow · commit 18e667303195 · 2023-09-23T08:33:10.000+02:00
diff --git a/src/Renci.SshNet.Benchmarks/Security/Cryptography/Ciphers/RsaCipherBenchmarks.cs b/src/Renci.SshNet.Benchmarks/Security/Cryptography/Ciphers/RsaCipherBenchmarks.cs
@@ -21,7 +21,8 @@ public RsaCipherBenchmarks()
 
             using (var s = typeof(RsaCipherBenchmarks).Assembly.GetManifestResourceStream("Renci.SshNet.Benchmarks.Data.Key.RSA.txt"))
             {
-                _privateKey = (RsaKey)((KeyHostAlgorithm) new PrivateKeyFile(s).HostKey).Key;
+                
+                _privateKey = (RsaKey)new PrivateKeyFile(s).Key;
                 
                 // The implementations of RsaCipher.Encrypt/Decrypt differ based on whether the supplied RsaKey has private key information
                 // or only public. So we extract out the public key information to a separate variable.
diff --git a/src/Renci.SshNet.Benchmarks/Security/Cryptography/ED25519DigitalSignatureBenchmarks.cs b/src/Renci.SshNet.Benchmarks/Security/Cryptography/ED25519DigitalSignatureBenchmarks.cs
@@ -21,7 +21,7 @@ public ED25519DigitalSignatureBenchmarks()
 
             using (var s = typeof(ED25519DigitalSignatureBenchmarks).Assembly.GetManifestResourceStream("Renci.SshNet.Benchmarks.Data.Key.OPENSSH.ED25519.txt"))
             {
-                _key = (ED25519Key) ((KeyHostAlgorithm) new PrivateKeyFile(s).HostKey).Key;
+                _key = (ED25519Key) new PrivateKeyFile(s).Key;
             }
             _signature = new ED25519DigitalSignature(_key).Sign(_data);
         }
diff --git a/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs b/src/Renci.SshNet.Tests/Classes/BaseClientTest_Connect_OnConnectedThrowsException.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -140,7 +141,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()
             using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))
             {
                 var privateKey = new PrivateKeyFile(s);
-                return (KeyHostAlgorithm) privateKey.HostKey;
+                return (KeyHostAlgorithm) privateKey.HostKeyAlgorithms.First();
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Common/HostKeyEventArgsTest.cs b/src/Renci.SshNet.Tests/Classes/Common/HostKeyEventArgsTest.cs
@@ -89,7 +89,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()
             using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))
             {
                 var privateKey = new PrivateKeyFile(s);
-                return (KeyHostAlgorithm)privateKey.HostKey;
+                return (KeyHostAlgorithm)privateKey.HostKeyAlgorithms.First();
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs b/src/Renci.SshNet.Tests/Classes/NetConfClientTest_Connect_NetConfSessionConnectFailure.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 
@@ -113,7 +114,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()
             using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))
             {
                 var privateKey = new PrivateKeyFile(s);
-                return (KeyHostAlgorithm)privateKey.HostKey;
+                return (KeyHostAlgorithm)privateKey.HostKeyAlgorithms.First();
             }
         }
     }
diff --git a/src/Renci.SshNet.Tests/Classes/PrivateKeyFileTest.cs b/src/Renci.SshNet.Tests/Classes/PrivateKeyFileTest.cs
@@ -1,9 +1,7 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Renci.SshNet.Common;
-using Renci.SshNet.Security;
 using Renci.SshNet.Tests.Common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
@@ -412,7 +410,7 @@ public void ConstructorWithStreamAndPassphrase()
             using (var stream = GetData("Key.RSA.Encrypted.Aes.128.CBC.12345.txt"))
             {
                 var privateKeyFile = new PrivateKeyFile(stream, "12345");
-                Assert.IsNotNull(privateKeyFile.HostKey);
+                TestRsaKeyFile(privateKeyFile);
             }
         }
 
@@ -430,7 +428,7 @@ public void ConstructorWithFileNameAndPassphrase()
             using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
                 var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");
-                Assert.IsNotNull(privateKeyFile.HostKey);
+                TestRsaKeyFile(privateKeyFile);
 
                 fs.Close();
             }
@@ -498,7 +496,7 @@ public void ConstructorWithFileName()
             }
 
             var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");
-            Assert.IsNotNull(privateKeyFile.HostKey);
+            TestRsaKeyFile(privateKeyFile);
         }
 
         /// <summary>
@@ -510,7 +508,7 @@ public void ConstructorWithStream()
             using (var stream = GetData("Key.RSA.txt"))
             {
                 var privateKeyFile = new PrivateKeyFile(stream);
-                Assert.IsNotNull(privateKeyFile.HostKey);
+                TestRsaKeyFile(privateKeyFile);
             }
         }
 
@@ -526,7 +524,7 @@ public void ConstructorWithFileNameShouldBeAbleToReadFileThatIsSharedForReadAcce
             using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
                 var privateKeyFile = new PrivateKeyFile(_temporaryFile);
-                Assert.IsNotNull(privateKeyFile.HostKey);
+                TestRsaKeyFile(privateKeyFile);
 
                 fs.Close();
             }
@@ -544,7 +542,7 @@ public void ConstructorWithFileNameAndPassPhraseShouldBeAbleToReadFileThatIsShar
             using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
                 var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");
-                Assert.IsNotNull(privateKeyFile.HostKey);
+                TestRsaKeyFile(privateKeyFile);
 
                 fs.Close();
             }
@@ -684,15 +682,14 @@ private string GetTempFileName()
 
         private static void TestRsaKeyFile(PrivateKeyFile rsaPrivateKeyFile)
         {
-            Assert.AreEqual(3, rsaPrivateKeyFile.HostAlgorithms.Count);
+            Assert.IsNotNull(rsaPrivateKeyFile.HostKeyAlgorithms);
+            Assert.AreEqual(3, rsaPrivateKeyFile.HostKeyAlgorithms.Count);
 
-            List<KeyHostAlgorithm> algorithms = rsaPrivateKeyFile.HostAlgorithms.Cast<KeyHostAlgorithm>().ToList();
+            var algorithms = rsaPrivateKeyFile.HostKeyAlgorithms.ToList();
 
             Assert.AreEqual("rsa-sha2-512", algorithms[0].Name);
             Assert.AreEqual("rsa-sha2-256", algorithms[1].Name);
             Assert.AreEqual("ssh-rsa", algorithms[2].Name);
-
-            Assert.AreSame(algorithms[0], rsaPrivateKeyFile.HostKey);
         }
     }
 }
diff --git a/src/Renci.SshNet.Tests/Classes/Security/Cryptography/RsaDigitalSignatureTest.cs b/src/Renci.SshNet.Tests/Classes/Security/Cryptography/RsaDigitalSignatureTest.cs
@@ -164,7 +164,7 @@ private static RsaKey GetRsaKey()
         {
             using (var stream = GetData("Key.RSA.txt"))
             {
-                return (RsaKey) ((KeyHostAlgorithm) new PrivateKeyFile(stream).HostKey).Key;
+                return (RsaKey) new PrivateKeyFile(stream).Key;
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/Security/KeyAlgorithmTest.cs b/src/Renci.SshNet.Tests/Classes/Security/KeyAlgorithmTest.cs
@@ -1,4 +1,4 @@
-﻿using System.Security.Cryptography;
+﻿﻿using System.Security.Cryptography;
 using System.Text;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -176,7 +176,7 @@ private static RsaKey GetRsaKey()
         {
             using (var stream = GetData("Key.RSA.txt"))
             {
-                return (RsaKey) ((KeyHostAlgorithm) new PrivateKeyFile(stream).HostKey).Key;
+                return (RsaKey) new PrivateKeyFile(stream).Key;
             }
         }
 
diff --git a/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs b/src/Renci.SshNet.Tests/Classes/SftpClientTest_Connect_SftpSessionConnectFailure.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 
@@ -122,7 +123,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()
             using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))
             {
                 var privateKey = new PrivateKeyFile(s);
-                return (KeyHostAlgorithm)privateKey.HostKey;
+                return (KeyHostAlgorithm)privateKey.HostKeyAlgorithms.First();
             }
         }
     }
diff --git a/src/Renci.SshNet/IHostAlgorithmsProvider.cs b/src/Renci.SshNet/IHostAlgorithmsProvider.cs
diff --git a/src/Renci.SshNet/IPrivateKeySource.cs b/src/Renci.SshNet/IPrivateKeySource.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.ComponentModel;
+using System.Collections.Generic;
 
 using Renci.SshNet.Security;
 
@@ -8,19 +7,15 @@ namespace Renci.SshNet
     /// <summary>
     /// Represents private key source interface.
     /// </summary>
-    /// <remarks>
-    /// This interface has been replaced by <see cref="IHostAlgorithmsProvider"/>
-    /// and is obsolete.
-    /// </remarks>
-    [Obsolete($"Use {nameof(IHostAlgorithmsProvider)} instead. " +
-        $"{nameof(IPrivateKeySource)} may be removed in a future release. " +
-        $"See https://github.com/sshnet/SSH.NET/issues/1174 for details.")]
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public interface IPrivateKeySource : IHostAlgorithmsProvider
+    public interface IPrivateKeySource
     {
         /// <summary>
-        /// Gets the host key.
+        /// Gets the host keys algorithms.
         /// </summary>
-        HostAlgorithm HostKey { get; }
+        /// <remarks>
+        /// In situations where there is a preferred order of usage of the host algorithms,
+        /// the collection should be ordered from most preferred to least.
+        /// </remarks>
+        IReadOnlyCollection<HostAlgorithm> HostKeyAlgorithms { get; }
     }
 }
diff --git a/src/Renci.SshNet/NetConfClient.cs b/src/Renci.SshNet/NetConfClient.cs
@@ -107,7 +107,7 @@ public NetConfClient(string host, string username, string password)
         /// <exception cref="ArgumentException"><paramref name="host"/> is invalid, -or- <paramref name="username"/> is <c>null</c> or contains only whitespace characters.</exception>
         /// <exception cref="ArgumentOutOfRangeException"><paramref name="port"/> is not within <see cref="IPEndPoint.MinPort"/> and <see cref="IPEndPoint.MaxPort"/>.</exception>
         [SuppressMessage("Microsoft.Reliability", "CA2000:DisposeObjectsBeforeLosingScope", Justification = "Disposed in Dispose(bool) method.")]
-        public NetConfClient(string host, int port, string username, params IHostAlgorithmsProvider[] keyFiles)
+        public NetConfClient(string host, int port, string username, params IPrivateKeySource[] keyFiles)
             : this(new PrivateKeyConnectionInfo(host, port, username, keyFiles), ownsConnectionInfo: true)
         {
         }
@@ -120,7 +120,7 @@ public NetConfClient(string host, int port, string username, params IHostAlgorit
         /// <param name="keyFiles">Authentication private key file(s) .</param>
         /// <exception cref="ArgumentNullException"><paramref name="keyFiles"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException"><paramref name="host"/> is invalid, -or- <paramref name="username"/> is <c>null</c> or contains only whitespace characters.</exception>
-        public NetConfClient(string host, string username, params IHostAlgorithmsProvider[] keyFiles)
+        public NetConfClient(string host, string username, params IPrivateKeySource[] keyFiles)
             : this(host, ConnectionInfo.DefaultPort, username, keyFiles)
         {
         }
diff --git a/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs b/src/Renci.SshNet/PrivateKeyAuthenticationMethod.cs
@@ -31,23 +31,23 @@ public override string Name
         /// <summary>
         /// Gets the key files used for authentication.
         /// </summary>
-        public ICollection<IHostAlgorithmsProvider> KeyFiles { get; private set; }
+        public ICollection<IPrivateKeySource> KeyFiles { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PrivateKeyAuthenticationMethod"/> class.
         /// </summary>
         /// <param name="username">The username.</param>
         /// <param name="keyFiles">The key files.</param>
         /// <exception cref="ArgumentException"><paramref name="username"/> is whitespace or <c>null</c>.</exception>
-        public PrivateKeyAuthenticationMethod(string username, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyAuthenticationMethod(string username, params IPrivateKeySource[] keyFiles)
             : base(username)
         {
             if (keyFiles is null)
             {
                 throw new ArgumentNullException(nameof(keyFiles));
             }
 
-            KeyFiles = new Collection<IHostAlgorithmsProvider>(keyFiles);
+            KeyFiles = new Collection<IPrivateKeySource>(keyFiles);
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ public override AuthenticationResult Authenticate(Session session)
 
             session.RegisterMessage("SSH_MSG_USERAUTH_PK_OK");
 
-            var hostAlgorithms = KeyFiles.SelectMany(x => x.HostAlgorithms).ToList();
+            var hostAlgorithms = KeyFiles.SelectMany(x => x.HostKeyAlgorithms).ToList();
 
             try
             {
diff --git a/src/Renci.SshNet/PrivateKeyConnectionInfo.cs b/src/Renci.SshNet/PrivateKeyConnectionInfo.cs
@@ -17,7 +17,7 @@ public class PrivateKeyConnectionInfo : ConnectionInfo, IDisposable
         /// <summary>
         /// Gets the key files used for authentication.
         /// </summary>
-        public ICollection<IHostAlgorithmsProvider> KeyFiles { get; private set; }
+        public ICollection<IPrivateKeySource> KeyFiles { get; private set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PrivateKeyConnectionInfo"/> class.
@@ -41,7 +41,7 @@ public PrivateKeyConnectionInfo(string host, string username, params PrivateKeyF
         /// <param name="port">Connection port.</param>
         /// <param name="username">Connection username.</param>
         /// <param name="keyFiles">Connection key files.</param>
-        public PrivateKeyConnectionInfo(string host, int port, string username, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, int port, string username, params IPrivateKeySource[] keyFiles)
             : this(host, port, username, ProxyTypes.None, string.Empty, 0, string.Empty, string.Empty, keyFiles)
         {
         }
@@ -56,7 +56,7 @@ public PrivateKeyConnectionInfo(string host, int port, string username, params I
         /// <param name="proxyHost">The proxy host.</param>
         /// <param name="proxyPort">The proxy port.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params IPrivateKeySource[] keyFiles)
             : this(host, port, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)
         {
         }
@@ -72,7 +72,7 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp
         /// <param name="proxyPort">The proxy port.</param>
         /// <param name="proxyUsername">The proxy username.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params IPrivateKeySource[] keyFiles)
             : this(host, port, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)
         {
         }
@@ -86,7 +86,7 @@ public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTyp
         /// <param name="proxyHost">The proxy host.</param>
         /// <param name="proxyPort">The proxy port.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, params IPrivateKeySource[] keyFiles)
             : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, string.Empty, string.Empty, keyFiles)
         {
         }
@@ -101,7 +101,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         /// <param name="proxyPort">The proxy port.</param>
         /// <param name="proxyUsername">The proxy username.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, params IPrivateKeySource[] keyFiles)
             : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, string.Empty, keyFiles)
         {
         }
@@ -117,7 +117,7 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         /// <param name="proxyUsername">The proxy username.</param>
         /// <param name="proxyPassword">The proxy password.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params IPrivateKeySource[] keyFiles)
             : this(host, DefaultPort, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, keyFiles)
         {
         }
@@ -134,10 +134,10 @@ public PrivateKeyConnectionInfo(string host, string username, ProxyTypes proxyTy
         /// <param name="proxyUsername">The proxy username.</param>
         /// <param name="proxyPassword">The proxy password.</param>
         /// <param name="keyFiles">The key files.</param>
-        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params IHostAlgorithmsProvider[] keyFiles)
+        public PrivateKeyConnectionInfo(string host, int port, string username, ProxyTypes proxyType, string proxyHost, int proxyPort, string proxyUsername, string proxyPassword, params IPrivateKeySource[] keyFiles)
             : base(host, port, username, proxyType, proxyHost, proxyPort, proxyUsername, proxyPassword, new PrivateKeyAuthenticationMethod(username, keyFiles))
         {
-            KeyFiles = new Collection<IHostAlgorithmsProvider>(keyFiles);
+            KeyFiles = new Collection<IPrivateKeySource>(keyFiles);
         }
 
         /// <summary>
diff --git a/src/Renci.SshNet/PrivateKeyFile.cs b/src/Renci.SshNet/PrivateKeyFile.cs
diff --git a/src/Renci.SshNet/ScpClient.cs b/src/Renci.SshNet/ScpClient.cs
diff --git a/src/Renci.SshNet/SftpClient.cs b/src/Renci.SshNet/SftpClient.cs
diff --git a/src/Renci.SshNet/SshClient.cs b/src/Renci.SshNet/SshClient.cs

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public RsaCipherBenchmarks()`
`21`	`21`
`22`	`22`	`using (var s = typeof(RsaCipherBenchmarks).Assembly.GetManifestResourceStream("Renci.SshNet.Benchmarks.Data.Key.RSA.txt"))`
`23`	`23`	`{`
`24`		`- _privateKey = (RsaKey)((KeyHostAlgorithm) new PrivateKeyFile(s).HostKey).Key;`
	`24`	`+`
	`25`	`+ _privateKey = (RsaKey)new PrivateKeyFile(s).Key;`
`25`	`26`
`26`	`27`	`// The implementations of RsaCipher.Encrypt/Decrypt differ based on whether the supplied RsaKey has private key information`
`27`	`28`	`// or only public. So we extract out the public key information to a separate variable.`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public ED25519DigitalSignatureBenchmarks()`
`21`	`21`
`22`	`22`	`using (var s = typeof(ED25519DigitalSignatureBenchmarks).Assembly.GetManifestResourceStream("Renci.SshNet.Benchmarks.Data.Key.OPENSSH.ED25519.txt"))`
`23`	`23`	`{`
`24`		`- _key = (ED25519Key) ((KeyHostAlgorithm) new PrivateKeyFile(s).HostKey).Key;`
	`24`	`+ _key = (ED25519Key) new PrivateKeyFile(s).Key;`
`25`	`25`	`}`
`26`	`26`	`_signature = new ED25519DigitalSignature(_key).Sign(_data);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Linq;`
`2`	`3`	`using System.Reflection;`
`3`	`4`	`using System.Threading;`
`4`	`5`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`@@ -140,7 +141,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()`
`140`	`141`	`using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))`
`141`	`142`	`{`
`142`	`143`	`var privateKey = new PrivateKeyFile(s);`
`143`		`- return (KeyHostAlgorithm) privateKey.HostKey;`
	`144`	`+ return (KeyHostAlgorithm) privateKey.HostKeyAlgorithms.First();`
`144`	`145`	`}`
`145`	`146`	`}`
`146`	`147`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private static KeyHostAlgorithm GetKeyHostAlgorithm()`
`89`	`89`	`using (var s = executingAssembly.GetManifestResourceStream(string.Format("Renci.SshNet.Tests.Data.{0}", "Key.RSA.txt")))`
`90`	`90`	`{`
`91`	`91`	`var privateKey = new PrivateKeyFile(s);`
`92`		`- return (KeyHostAlgorithm)privateKey.HostKey;`
	`92`	`+ return (KeyHostAlgorithm)privateKey.HostKeyAlgorithms.First();`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`2`	`2`	`using Renci.SshNet.Common;`
`3`		`-using Renci.SshNet.Security;`
`4`	`3`	`using Renci.SshNet.Tests.Common;`
`5`	`4`	`using System;`
`6`		`-using System.Collections.Generic;`
`7`	`5`	`using System.IO;`
`8`	`6`	`using System.Linq;`
`9`	`7`
`@@ -412,7 +410,7 @@ public void ConstructorWithStreamAndPassphrase()`
`412`	`410`	`using (var stream = GetData("Key.RSA.Encrypted.Aes.128.CBC.12345.txt"))`
`413`	`411`	`{`
`414`	`412`	`var privateKeyFile = new PrivateKeyFile(stream, "12345");`
`415`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`413`	`+ TestRsaKeyFile(privateKeyFile);`
`416`	`414`	`}`
`417`	`415`	`}`
`418`	`416`
`@@ -430,7 +428,7 @@ public void ConstructorWithFileNameAndPassphrase()`
`430`	`428`	`using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))`
`431`	`429`	`{`
`432`	`430`	`var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");`
`433`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`431`	`+ TestRsaKeyFile(privateKeyFile);`
`434`	`432`
`435`	`433`	`fs.Close();`
`436`	`434`	`}`
`@@ -498,7 +496,7 @@ public void ConstructorWithFileName()`
`498`	`496`	`}`
`499`	`497`
`500`	`498`	`var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");`
`501`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`499`	`+ TestRsaKeyFile(privateKeyFile);`
`502`	`500`	`}`
`503`	`501`
`504`	`502`	`/// <summary>`
`@@ -510,7 +508,7 @@ public void ConstructorWithStream()`
`510`	`508`	`using (var stream = GetData("Key.RSA.txt"))`
`511`	`509`	`{`
`512`	`510`	`var privateKeyFile = new PrivateKeyFile(stream);`
`513`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`511`	`+ TestRsaKeyFile(privateKeyFile);`
`514`	`512`	`}`
`515`	`513`	`}`
`516`	`514`
`@@ -526,7 +524,7 @@ public void ConstructorWithFileNameShouldBeAbleToReadFileThatIsSharedForReadAcce`
`526`	`524`	`using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))`
`527`	`525`	`{`
`528`	`526`	`var privateKeyFile = new PrivateKeyFile(_temporaryFile);`
`529`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`527`	`+ TestRsaKeyFile(privateKeyFile);`
`530`	`528`
`531`	`529`	`fs.Close();`
`532`	`530`	`}`
`@@ -544,7 +542,7 @@ public void ConstructorWithFileNameAndPassPhraseShouldBeAbleToReadFileThatIsShar`
`544`	`542`	`using (var fs = File.Open(_temporaryFile, FileMode.Open, FileAccess.Read, FileShare.Read))`
`545`	`543`	`{`
`546`	`544`	`var privateKeyFile = new PrivateKeyFile(_temporaryFile, "12345");`
`547`		`- Assert.IsNotNull(privateKeyFile.HostKey);`
	`545`	`+ TestRsaKeyFile(privateKeyFile);`
`548`	`546`
`549`	`547`	`fs.Close();`
`550`	`548`	`}`
`@@ -684,15 +682,14 @@ private string GetTempFileName()`
`684`	`682`
`685`	`683`	`private static void TestRsaKeyFile(PrivateKeyFile rsaPrivateKeyFile)`
`686`	`684`	`{`
`687`		`- Assert.AreEqual(3, rsaPrivateKeyFile.HostAlgorithms.Count);`
	`685`	`+ Assert.IsNotNull(rsaPrivateKeyFile.HostKeyAlgorithms);`
	`686`	`+ Assert.AreEqual(3, rsaPrivateKeyFile.HostKeyAlgorithms.Count);`
`688`	`687`
`689`		`- List<KeyHostAlgorithm> algorithms = rsaPrivateKeyFile.HostAlgorithms.Cast<KeyHostAlgorithm>().ToList();`
	`688`	`+ var algorithms = rsaPrivateKeyFile.HostKeyAlgorithms.ToList();`
`690`	`689`
`691`	`690`	`Assert.AreEqual("rsa-sha2-512", algorithms[0].Name);`
`692`	`691`	`Assert.AreEqual("rsa-sha2-256", algorithms[1].Name);`
`693`	`692`	`Assert.AreEqual("ssh-rsa", algorithms[2].Name);`
`694`		`-`
`695`		`- Assert.AreSame(algorithms[0], rsaPrivateKeyFile.HostKey);`
`696`	`693`	`}`
`697`	`694`	`}`
`698`	`695`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ private static RsaKey GetRsaKey()`
`164`	`164`	`{`
`165`	`165`	`using (var stream = GetData("Key.RSA.txt"))`
`166`	`166`	`{`
`167`		`- return (RsaKey) ((KeyHostAlgorithm) new PrivateKeyFile(stream).HostKey).Key;`
	`167`	`+ return (RsaKey) new PrivateKeyFile(stream).Key;`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System.Security.Cryptography;`
	`1`	`+using System.Security.Cryptography;`
`2`	`2`	`using System.Text;`
`3`	`3`
`4`	`4`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`@@ -176,7 +176,7 @@ private static RsaKey GetRsaKey()`
`176`	`176`	`{`
`177`	`177`	`using (var stream = GetData("Key.RSA.txt"))`
`178`	`178`	`{`
`179`		`- return (RsaKey) ((KeyHostAlgorithm) new PrivateKeyFile(stream).HostKey).Key;`
	`179`	`+ return (RsaKey) new PrivateKeyFile(stream).Key;`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`