Merge branch 'release/1.9.2'

spodskubka · Dec 12, 2017 · 539a23e · 539a23e
2 parents 6292489 + b32f8ba
commit 539a23e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 5 deletions.
diff --git a/RemoteTerminal/ChangelogManager.cs b/RemoteTerminal/ChangelogManager.cs
@@ -26,7 +26,7 @@ public static class ChangelogManager
         /// <summary>
         /// The version of the most current changelog.
         /// </summary>
-        private const string CurrentVersion = "1.9.1";
+        private const string CurrentVersion = "1.9.2";
 
         /// <summary>
         /// The name of the setting containing the last read changelog version.
@@ -39,6 +39,7 @@ public static class ChangelogManager
         /// <remarks><see cref="CurrentVersion"/> must not be included in this list.</remarks>
         private static readonly string[] PreviousVersions = new[]
         {
+            "1.9.1",
             "1.9.0",
             "1.8.2",
         };

diff --git a/RemoteTerminal/Changelogs/1.9.2.htm b/RemoteTerminal/Changelogs/1.9.2.htm
@@ -0,0 +1,9 @@
+<h2>1.9.2 (2017-12-11)</h2>
+<p>
+    <b>Added support for more secure HMAC algorithms</b>
+</p>
+<p>
+    Until now only <b>hmac-md5</b> and <b>hmac-sha1</b> were supported.<br/>
+    This update adds support for <b>hmac-sha2-256</b> and <b>hmac-sha2-512</b> to support connections to servers that only accept SHA2 HMAC algorithms.<br/>
+    Additionally this may also increase security even when connecting to servers that still accept the less secure HMAC algorithms (if they also support and prefer the SHA2 HMAC algorithms).
+</p>
diff --git a/RemoteTerminal/Package.appxmanifest b/RemoteTerminal/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="46436StefanPodskubka.RemoteTerminal" Publisher="CN=46536A2F-5D79-4B8A-8099-26E3FCC16743" Version="1.9.1.23" />
+  <Identity Name="46436StefanPodskubka.RemoteTerminal" Publisher="CN=46536A2F-5D79-4B8A-8099-26E3FCC16743" Version="1.9.2.24" />
   <Properties>
     <DisplayName>Remote Terminal</DisplayName>
     <PublisherDisplayName>Stefan Podskubka</PublisherDisplayName>

diff --git a/RemoteTerminal/Properties/AssemblyInfo.cs b/RemoteTerminal/Properties/AssemblyInfo.cs
@@ -23,6 +23,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.1.23")]
-[assembly: AssemblyFileVersion("1.9.1.23")]
+[assembly: AssemblyVersion("1.9.2.24")]
+[assembly: AssemblyFileVersion("1.9.2.24")]
 [assembly: ComVisible(false)]
diff --git a/RemoteTerminal/RemoteTerminal.csproj b/RemoteTerminal/RemoteTerminal.csproj
@@ -200,6 +200,7 @@
     <EmbeddedResource Include="Changelogs\tail.htm" />
     <EmbeddedResource Include="Changelogs\1.9.0.htm" />
     <EmbeddedResource Include="Changelogs\1.9.1.htm" />
+    <EmbeddedResource Include="Changelogs\1.9.2.htm" />
     <Content Include="LICENSE.txt" />
     <Page Include="ChangelogPage.xaml">
       <SubType>Designer</SubType>

diff --git a/SshNet/ConnectionInfo.cs b/SshNet/ConnectionInfo.cs
@@ -234,6 +234,8 @@ public ConnectionInfo(string host, int port, Lazy<string> username, params Authe
             {
                 {"hmac-md5", (key) => { return MacAlgorithmProvider.OpenAlgorithm(MacAlgorithmNames.HmacMd5).CreateKey(CryptographicBuffer.CreateFromByteArray(key.Take(16).ToArray()));}},
                 {"hmac-sha1", (key) => { return MacAlgorithmProvider.OpenAlgorithm(MacAlgorithmNames.HmacSha1).CreateKey(CryptographicBuffer.CreateFromByteArray(key.Take(20).ToArray()));}},
+                {"hmac-sha2-256", (key) => { return MacAlgorithmProvider.OpenAlgorithm(MacAlgorithmNames.HmacSha256).CreateKey(CryptographicBuffer.CreateFromByteArray(key.Take(32).ToArray()));}},
+                {"hmac-sha2-512", (key) => { return MacAlgorithmProvider.OpenAlgorithm(MacAlgorithmNames.HmacSha512).CreateKey(CryptographicBuffer.CreateFromByteArray(key.Take(64).ToArray()));}},
                 //{"umac-64@openssh.com", typeof(HMacSha1)},
                 //{"hmac-ripemd160", typeof(HMacSha1)},
                 //{"hmac-ripemd160@openssh.com", typeof(HMacSha1)},

diff --git a/SshNet/Security/KeyExchange.cs b/SshNet/Security/KeyExchange.cs
@@ -111,7 +111,7 @@ from a in message.MacAlgorithmsClientToServer
                                            select a).FirstOrDefault();
             if (string.IsNullOrEmpty(clientHmacAlgorithmName))
             {
-                throw new SshConnectionException("Server HMAC algorithm not found", DisconnectReason.KeyExchangeFailed);
+                throw new SshConnectionException("Client HMAC algorithm not found", DisconnectReason.KeyExchangeFailed);
             }
 
             session.ConnectionInfo.CurrentClientHmacAlgorithm = clientHmacAlgorithmName;