From a3c3ec8c5c2c1632294a58357a2b7fb1fd505929 Mon Sep 17 00:00:00 2001 From: Dimitrij Date: Thu, 20 Jun 2024 10:22:13 +0100 Subject: [PATCH] lib updates --- ExternalConnectors/ExternalConnectors.csproj | 4 ++-- ExternalConnectors/PuttyKeyFileGenerator.cs | 8 +++++--- mRemoteNG/Properties/AssemblyInfo.cs | 6 +++--- mRemoteNG/mRemoteNG.csproj | 4 ++-- mRemoteNGSpecs/mRemoteNGSpecs.csproj | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ExternalConnectors/ExternalConnectors.csproj b/ExternalConnectors/ExternalConnectors.csproj index 11ff73bd..aceb9d68 100644 --- a/ExternalConnectors/ExternalConnectors.csproj +++ b/ExternalConnectors/ExternalConnectors.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/ExternalConnectors/PuttyKeyFileGenerator.cs b/ExternalConnectors/PuttyKeyFileGenerator.cs index 49c7275b..4b3bbe11 100644 --- a/ExternalConnectors/PuttyKeyFileGenerator.cs +++ b/ExternalConnectors/PuttyKeyFileGenerator.cs @@ -15,7 +15,7 @@ public class PuttyKeyFileGenerator public static string ToPuttyPrivateKey(RSACryptoServiceProvider cryptoServiceProvider, string Comment = "imported-openssh-key") { var publicParameters = cryptoServiceProvider.ExportParameters(false); - byte[] publicBuffer = new byte[3 + keyType.Length + GetPrefixSize(publicParameters.Exponent) + publicParameters.Exponent.Length + GetPrefixSize(publicParameters.Modulus) + publicParameters.Modulus.Length + 1]; + byte[] publicBuffer = new byte[3 + keyType.Length + GetPrefixSize(publicParameters.Exponent) + publicParameters.Exponent!.Length + GetPrefixSize(publicParameters.Modulus) + publicParameters.Modulus!.Length + 1]; using (var bw = new BinaryWriter(new MemoryStream(publicBuffer))) { @@ -28,12 +28,12 @@ public class PuttyKeyFileGenerator var privateParameters = cryptoServiceProvider.ExportParameters(true); - byte[] privateBuffer = new byte[paddedPrefixSize + privateParameters.D.Length + paddedPrefixSize + privateParameters.P!.Length + paddedPrefixSize + privateParameters.Q.Length + paddedPrefixSize + privateParameters.InverseQ.Length]; + byte[] privateBuffer = new byte[paddedPrefixSize + privateParameters.D!.Length + paddedPrefixSize + privateParameters.P!.Length + paddedPrefixSize + privateParameters.Q!.Length + paddedPrefixSize + privateParameters.InverseQ!.Length]; using (var bw = new BinaryWriter(new MemoryStream(privateBuffer))) { PutPrefixed(bw, privateParameters.D, true); - PutPrefixed(bw, privateParameters.P!, true); + PutPrefixed(bw, privateParameters.P, true); PutPrefixed(bw, privateParameters.Q, true); PutPrefixed(bw, privateParameters.InverseQ, true); } @@ -89,6 +89,7 @@ public class PuttyKeyFileGenerator { return Regex.Matches(text, ".{1," + lineLength + "}").Cast().Select(m => m.Value).ToArray(); } + private static int GetPrefixSize(byte[]? bytes) { if (bytes is null) @@ -96,6 +97,7 @@ public class PuttyKeyFileGenerator return CheckIsNeddPadding(bytes) ? paddedPrefixSize : prefixSize; } + private static bool CheckIsNeddPadding(byte[] bytes) { if (bytes is null || bytes.Length == 0) diff --git a/mRemoteNG/Properties/AssemblyInfo.cs b/mRemoteNG/Properties/AssemblyInfo.cs index 2254c187..40d40af7 100644 --- a/mRemoteNG/Properties/AssemblyInfo.cs +++ b/mRemoteNG/Properties/AssemblyInfo.cs @@ -18,10 +18,10 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.77.3.1765")] -[assembly: AssemblyFileVersion("1.77.3.1765")] +[assembly: AssemblyVersion("1.77.3.1780")] +[assembly: AssemblyFileVersion("1.77.3.1780")] [assembly: NeutralResourcesLanguageAttribute("en-US")] -[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build 1765)")] +[assembly: AssemblyInformationalVersion("1.77.3 (Nightly Build 1780)")] // Logging [assembly: log4net.Config.XmlConfigurator(ConfigFile = "log4net.config")] diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index c05a723a..132673f9 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -90,7 +90,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/mRemoteNGSpecs/mRemoteNGSpecs.csproj b/mRemoteNGSpecs/mRemoteNGSpecs.csproj index 0467704e..cf3397a3 100644 --- a/mRemoteNGSpecs/mRemoteNGSpecs.csproj +++ b/mRemoteNGSpecs/mRemoteNGSpecs.csproj @@ -18,7 +18,7 @@ - +