diff --git a/SshNet.Keygen.Sample/SshNet.Keygen.Sample.csproj b/SshNet.Keygen.Sample/SshNet.Keygen.Sample.csproj index d2c9e12..ad9aab7 100644 --- a/SshNet.Keygen.Sample/SshNet.Keygen.Sample.csproj +++ b/SshNet.Keygen.Sample/SshNet.Keygen.Sample.csproj @@ -8,7 +8,7 @@ - + diff --git a/SshNet.Keygen/Extensions/BinaryWriterExtension.cs b/SshNet.Keygen/Extensions/BinaryWriterExtension.cs index 19ba9a9..cea7522 100644 --- a/SshNet.Keygen/Extensions/BinaryWriterExtension.cs +++ b/SshNet.Keygen/Extensions/BinaryWriterExtension.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Text; -using Renci.SshNet.Common; +using System.Numerics; namespace SshNet.Keygen.Extensions { diff --git a/SshNet.Keygen/Extensions/ByteExtension.cs b/SshNet.Keygen/Extensions/ByteExtension.cs index 20a457d..55b6814 100644 --- a/SshNet.Keygen/Extensions/ByteExtension.cs +++ b/SshNet.Keygen/Extensions/ByteExtension.cs @@ -1,5 +1,5 @@ using System; -using Renci.SshNet.Common; +using System.Numerics; namespace SshNet.Keygen.Extensions { diff --git a/SshNet.Keygen/SshKeyEncryption/Bcrypt.cs b/SshNet.Keygen/SshKeyEncryption/Bcrypt.cs index d2f6a7d..36e21a2 100644 --- a/SshNet.Keygen/SshKeyEncryption/Bcrypt.cs +++ b/SshNet.Keygen/SshKeyEncryption/Bcrypt.cs @@ -1,7 +1,7 @@ -// +// // Copyright (c) 2006 Damien Miller // Copyright (c) 2010 Ryan D. Emerle -// +// // Permission to use, copy, modify, and distribute this software for any // purpose with or without fee is hereby granted, provided that the above // copyright notice and this permission notice appear in all copies. @@ -18,7 +18,6 @@ using System.Diagnostics; using System.Security.Cryptography; using System.Text; -using Renci.SshNet.Abstractions; namespace SshNet.Keygen.SshKeyEncryption { @@ -846,7 +845,7 @@ public void Hash(byte[] hpass, byte[] hsalt, byte[] output) } /// - /// Applies the Bcrypt kdf to derive a key and iv from the passphrase, + /// Applies the Bcrypt kdf to derive a key and iv from the passphrase, /// the key/iv are returned in the output variable. /// Ported from the SSHJ library. https://github.com/hierynomus/sshj /// @@ -856,7 +855,7 @@ public void Hash(byte[] hpass, byte[] hsalt, byte[] output) /// public void Pbkdf(byte[] password, byte[] salt, int rounds, byte[] output) { - using (var sha512 = new Security.Cryptography.SHA512()) + using (var sha512 = SHA512.Create()) { int nblocks = (output.Length + 31) / 32; byte[] hpass = sha512.ComputeHash(password); diff --git a/SshNet.Keygen/SshNet.Keygen.csproj b/SshNet.Keygen/SshNet.Keygen.csproj index 9f9c954..3fedf60 100644 --- a/SshNet.Keygen/SshNet.Keygen.csproj +++ b/SshNet.Keygen/SshNet.Keygen.csproj @@ -5,7 +5,7 @@ 9 enable SshNet.Keygen - 2024.0.0.2 + 2024.2.0.0 $(Version) ssh;scp;sftp SSH.NET Extension to generate and export Authentication Keys in OpenSSH and PuTTY Format. @@ -23,12 +23,11 @@ Chaos.Nacl\%(RecursiveDir)%(Filename)%(Extension) - - + - + \ No newline at end of file