Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSH.NET Update 2024.2.0 #16

Merged
merged 1 commit into from
Dec 2, 2024
Merged

SSH.NET Update 2024.2.0 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SshNet.Keygen.Sample/SshNet.Keygen.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SSH.NET" Version="2024.0.0" />
<PackageReference Include="SSH.NET" Version="2024.2.0" />
<ProjectReference Include="..\SshNet.Keygen\SshNet.Keygen.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion SshNet.Keygen/Extensions/BinaryWriterExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.IO;
using System.Text;
using Renci.SshNet.Common;
using System.Numerics;

namespace SshNet.Keygen.Extensions
{
Expand Down
2 changes: 1 addition & 1 deletion SshNet.Keygen/Extensions/ByteExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using Renci.SshNet.Common;
using System.Numerics;

namespace SshNet.Keygen.Extensions
{
Expand Down
9 changes: 4 additions & 5 deletions SshNet.Keygen/SshKeyEncryption/Bcrypt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//
//
// Copyright (c) 2006 Damien Miller <[email protected]>
// 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.
Expand All @@ -18,7 +18,6 @@
using System.Diagnostics;
using System.Security.Cryptography;
using System.Text;
using Renci.SshNet.Abstractions;

namespace SshNet.Keygen.SshKeyEncryption
{
Expand Down Expand Up @@ -846,7 +845,7 @@ public void Hash(byte[] hpass, byte[] hsalt, byte[] output)
}

/// <summary>
/// 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
/// </summary>
Expand All @@ -856,7 +855,7 @@ public void Hash(byte[] hpass, byte[] hsalt, byte[] output)
/// <param name="output"></param>
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);
Expand Down
7 changes: 3 additions & 4 deletions SshNet.Keygen/SshNet.Keygen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<LangVersion>9</LangVersion>
<Nullable>enable</Nullable>
<PackageId>SshNet.Keygen</PackageId>
<Version>2024.0.0.2</Version>
<Version>2024.2.0.0</Version>
<PackageVersion>$(Version)</PackageVersion>
<PackageTags>ssh;scp;sftp</PackageTags>
<Description>SSH.NET Extension to generate and export Authentication Keys in OpenSSH and PuTTY Format.</Description>
Expand All @@ -23,12 +23,11 @@
<Link>Chaos.Nacl\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>

<PackageReference Include="SSH.NET" Version="[2023.0.1,)" />
<PackageReference Include="SshNet.Security.Cryptography" Version="[1.3.0]" />
<PackageReference Include="SSH.NET" Version="[2024.2.0,)" />
<PackageReference Include="Konscious.Security.Cryptography.Argon2" Version="1.3.0"/>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'net48' ">
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
</ItemGroup>
</Project>
</Project>
Loading