Use SSH.NET 2023 Release

darinkes · Nov 29, 2023 · 65c27c7 · 65c27c7
1 parent 92d23e6
commit 65c27c7
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 32 deletions.
diff --git a/.github/workflows/dotnet-ubuntu.yml b/.github/workflows/dotnet-ubuntu.yml
@@ -18,10 +18,10 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --no-build --verbosity normal
diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml
@@ -18,10 +18,10 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.x
+        dotnet-version: 7.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --no-build --verbosity normal
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "SSH.NET"]
-	path = SSH.NET
-	url = https://github.com/darinkes/SSH.NET-1.git

diff --git a/README.md b/README.md
@@ -11,13 +11,9 @@ SshNet.PuttyKeyFile
 ## Status
 WIP
 
-Currently builds it's own fork of [SSH.NET](https://github.com/sshnet/SSH.NET) to be able to automatically test them.
-
-Needs this Branch: https://github.com/darinkes/SSH.NET-1/tree/agent_auth
-
 ## .NET Frameworks
 
-* .NET 4.0
+* .NET 4.6
 * netstandard 2.0
 
 ## Keys
@@ -39,4 +35,4 @@ var key = new PuttyKeyFile("my-key.ppk");
 using var client = new SshClient("ssh.foo.com", "root", key);
 client.Connect();
 Console.WriteLine(client.RunCommand("hostname").Result);
-```
+```
diff --git a/SSH.NET b/SSH.NET
diff --git a/SshNet.PuttyKeyFile.Sample/SshNet.PuttyKeyFile.Sample.csproj b/SshNet.PuttyKeyFile.Sample/SshNet.PuttyKeyFile.Sample.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net40;net5.0</TargetFrameworks>
-        <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net5.0</TargetFramework>
+        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net462;net7.0</TargetFrameworks>
+        <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net7.0</TargetFramework>
         <OutputType>exe</OutputType>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
@@ -18,4 +18,4 @@
     <ItemGroup>
       <ProjectReference Include="..\SshNet.PuttyKeyFile\SshNet.PuttyKeyFile.csproj" />
     </ItemGroup>
-</Project>
+</Project>
diff --git a/SshNet.PuttyKeyFile.Tests/PuttyKeyFileTest.cs b/SshNet.PuttyKeyFile.Tests/PuttyKeyFileTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using NUnit.Framework;
 using Renci.SshNet.Security;
@@ -21,9 +22,9 @@ public void Setup()
 
             var keyFile = new PuttyKeyFile(keyStream, pass);
 
-            Assert.IsInstanceOf<TKey>(((KeyHostAlgorithm) keyFile.HostKey).Key);
-            Assert.AreEqual(keyLength, ((KeyHostAlgorithm) keyFile.HostKey).Key.KeyLength);
-            Assert.AreEqual(comment, ((KeyHostAlgorithm) keyFile.HostKey).Key.Comment);
+            Assert.IsInstanceOf<TKey>(((KeyHostAlgorithm) keyFile.HostKeyAlgorithms.First()).Key);
+            Assert.AreEqual(keyLength, ((KeyHostAlgorithm) keyFile.HostKeyAlgorithms.First()).Key.KeyLength);
+            Assert.AreEqual(comment, ((KeyHostAlgorithm) keyFile.HostKeyAlgorithms.First()).Key.Comment);
         }
 
         [Test]

diff --git a/SshNet.PuttyKeyFile.Tests/SshNet.PuttyKeyFile.Tests.csproj b/SshNet.PuttyKeyFile.Tests/SshNet.PuttyKeyFile.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net40;net5.0</TargetFrameworks>
-        <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net5.0</TargetFramework>
+        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net462;net7.0</TargetFrameworks>
+        <TargetFramework Condition="'$(OS)' != 'Windows_NT'">net7.0</TargetFramework>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -21,4 +21,4 @@
     <ItemGroup>
       <ProjectReference Include="..\SshNet.PuttyKeyFile\SshNet.PuttyKeyFile.csproj" />
     </ItemGroup>
-</Project>
+</Project>
diff --git a/SshNet.PuttyKeyFile/PuttyKeyFile.cs b/SshNet.PuttyKeyFile/PuttyKeyFile.cs
@@ -14,7 +14,7 @@
 
 namespace SshNet.PuttyKeyFile
 {
-    public class PuttyKeyFile : IPrivateKeyFile
+    public class PuttyKeyFile : IPrivateKeySource
     {
         private static readonly Regex PuttyPrivateKeyRegex = new(
             @"^PuTTY-User-Key-File-(?<fileVersion>[0-9]+): *(?<keyType>[^\r\n]+)(\r|\n)+" +
@@ -27,7 +27,11 @@ public class PuttyKeyFile : IPrivateKeyFile
             @"Private-(?<macOrHash>(MAC|Hash)): *(?<hashData>[a-zA-Z0-9/+=]+)",
             RegexOptions.Compiled | RegexOptions.Multiline);
 
-        public HostAlgorithm HostKey { get; private set; } = null!;
+        private readonly List<HostAlgorithm> _hostAlgorithms = new();
+
+        public IReadOnlyCollection<HostAlgorithm> HostKeyAlgorithms => _hostAlgorithms;
+
+        public Key Key { get; private set; }
 
         public PuttyKeyFile(Stream privateKey)
         {
@@ -183,7 +187,9 @@ private void Open(Stream privateKey, string? passPhrase)
             }
 
             parsedKey.Comment = comment;
-            HostKey = new KeyHostAlgorithm(parsedKey.ToString(), parsedKey);
+
+            Key = parsedKey;
+            _hostAlgorithms.Add(new KeyHostAlgorithm(parsedKey.ToString(), parsedKey));
         }
 
         private static byte[] GetCipherKey(string? passphrase, int length)

diff --git a/SshNet.PuttyKeyFile/SshNet.PuttyKeyFile.csproj b/SshNet.PuttyKeyFile/SshNet.PuttyKeyFile.csproj
@@ -1,17 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net40;netstandard2.0</TargetFrameworks>
+        <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net462;netstandard2.0</TargetFrameworks>
         <TargetFramework Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFramework>
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="SshNet.Security.Cryptography" Version="[1.3.0]" />
+        <PackageReference Include="SSH.NET" Version="2023.0.0" />
     </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\SSH.NET\src\Renci.SshNet\Renci.SshNet.csproj" />
-    </ItemGroup>
-</Project>
+</Project>