Reverted RsaSha256 workaround as per SSH.NET v2023 upgrade (sshnet/SSH.NET#825 (comment))

Author: DamianSuess

src/VsLinuxDebugger/Core/Security/RsaSha256DigitalSignature.cs

@@ -6,6 +6,7 @@
 
 namespace VsLinuxDebugger.Core.Security
 {
+  /*
   /// <summary>
   /// Based on https://github.com/sshnet/SSH.NET/blob/1d5d58e17c68a2f319c51e7f938ce6e964498bcc/src/Renci.SshNet/Security/Cryptography/RsaDigitalSignature.cs#L12
   ///
@@ -62,4 +63,5 @@ protected override byte[] Hash(byte[] input)
       return _hash.ComputeHash(input);
     }
   }
+  */
 }

src/VsLinuxDebugger/Core/Security/RsaSha256Util.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using Renci.SshNet;
@@ -14,6 +15,7 @@ namespace VsLinuxDebugger.Core.Security
   /// </summary>
   public static class RsaSha256Util
   {
+    /*
     /// <summary>RSA SHA2 256.</summary>
     public const string RSA_SHA2_256 = "rsa-sha2-256";
 
@@ -26,12 +28,14 @@ public static class RsaSha256Util
     /// <exception cref="ArgumentNullException">Argument Null Exception.</exception>
     public static void ConvertToKeyWithSha256Signature(PrivateKeyFile keyFile)
     {
-      var oldKeyHostAlgorithm = keyFile.HostKey as KeyHostAlgorithm;
+      //// var oldKeyHostAlgorithm = keyFile.HostKey as KeyHostAlgorithm;
+      var oldKeyHostAlgorithm = keyFile.HostKeyAlgorithms.First();
       if (oldKeyHostAlgorithm == null)
       {
         throw new ArgumentNullException(nameof(oldKeyHostAlgorithm));
       }
 
+      //// var x = new KeyHostAlgorithm("name", key: null, digitalSignature: new RsaDigitalSignature(null));
       var oldRsaKey = oldKeyHostAlgorithm.Key as RsaKey;
       if (oldRsaKey == null)
       {
@@ -59,5 +63,6 @@ private static void UpdatePrivateKeyFile(PrivateKeyFile keyFile, RsaWithSha256Si
       var keyField = typeof(PrivateKeyFile).GetField("_key", BindingFlags.NonPublic | BindingFlags.Instance);
       keyField.SetValue(keyFile, key);
     }
+    */
   }
 }

src/VsLinuxDebugger/Core/Security/RsaWithSha256SignatureKey.cs

@@ -4,6 +4,7 @@
 
 namespace VsLinuxDebugger.Core.Security
 {
+  /*
   /// <summary>RSA With SHA256 Signature Key.</summary>
   public class RsaWithSha256SignatureKey : RsaKey
   {
@@ -28,4 +29,5 @@ public override string ToString()
       return RsaSha256Util.RSA_SHA2_256;
     }
   }
+  */
 }

src/VsLinuxDebugger/Core/SshTool.cs

@@ -4,8 +4,10 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
 using Renci.SshNet;
 using Renci.SshNet.Common;
+using Renci.SshNet.Security;
 using SharpCompress.Common;
 using SharpCompress.Writers;
 using VsLinuxDebugger.Core.Security;
@@ -157,7 +159,7 @@ public async Task CleanFolderAsync(string path)
     public async Task<bool> ConnectAsync()
     {
       PrivateKeyFile keyFile = null;
-      ConnectionInfo conn = null;
+      ConnectionInfo connInfo = null;
       try
       {
         if (_info.PrivateKeyEnabled)
@@ -169,12 +171,13 @@ public async Task<bool> ConnectAsync()
           else
             keyFile = new PrivateKeyFile(_info.PrivateKeyPath, _info.PrivateKeyPassword);
 
+          /**
           // adds rsa-sha2-256
           RsaSha256Util.ConvertToKeyWithSha256Signature(keyFile);
           var authenticationMethodRsa = new PrivateKeyAuthenticationMethod(_info.UserName, keyFile);
-          conn = new ConnectionInfo(_info.Host, _info.Port, _info.UserName, authenticationMethodRsa);
-          RsaSha256Util.SetupConnection(conn);
-
+          connInfo = new ConnectionInfo(_info.Host, _info.Port, _info.UserName, authenticationMethodRsa);
+          RsaSha256Util.SetupConnection(connInfo);
+          */
         }
       }
       catch (Exception ex)
@@ -187,10 +190,9 @@ public async Task<bool> ConnectAsync()
       try
       {
         Logger.Output($"SSH connecting...");
-        if (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
-          _ssh = new SshClient(conn);
-        else
-          _ssh = new SshClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
+        _ssh = (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
+          ? new SshClient(_info.Host, _info.Port, _info.UserName, keyFile)
+          : new SshClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
 
         await Task.Run(() => _ssh.Connect());
       }
@@ -202,20 +204,18 @@ public async Task<bool> ConnectAsync()
 
       try
       {
-        if (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
-          _sftp = new SftpClient(conn);
-        else
-          _sftp = new SftpClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
+        _sftp = (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
+          ? new SftpClient(connInfo)
+          : new SftpClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
 
         _sftp.Connect();
 
       }
       catch (Exception)
       {
-        if (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
-          _scp = new ScpClient(conn);
-        else
-          _scp = new ScpClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
+        _scp = (_info.PrivateKeyEnabled && File.Exists(_info.PrivateKeyPath))
+          ? new ScpClient(connInfo)
+          : new ScpClient(_info.Host, _info.Port, _info.UserName, _info.UserPass);
 
         _scp.Connect();
       }

src/VsLinuxDebugger/VsLinuxDebugger.csproj

@@ -104,7 +104,7 @@
       <Version>0.30.1</Version>
     </PackageReference>
     <PackageReference Include="SSH.NET">
-      <Version>2020.0.2</Version>
+      <Version>2023.0.1</Version>
     </PackageReference>
     <PackageReference Include="System.Text.Json">
       <Version>6.0.2</Version>