Skip to content

Export keys without a comment #63

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

Merged
darinkes merged 1 commit into from
Aug 14, 2026
Merged

Export keys without a comment #63

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
11 changes: 11 additions & 0 deletions SshNet.Keygen.Tests/TestKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,17 @@ public void TestNonAsciiCommentRoundTrips()
ClassicAssert.AreEqual(comment, ((KeyHostAlgorithm)reloaded.HostKeyAlgorithms.First()).Key.Comment);
}

[Test]
public void TestNullCommentExports()
{
var key = SshKey.Generate(new SshKeyGenerateInfo(SshKeyType.ED25519));
((KeyHostAlgorithm)key.HostKeyAlgorithms.First()).Key.Comment = null;

var reloaded = new PrivateKeyFile(key.ToOpenSshFormat().ToStream());
ClassicAssert.AreEqual("", ((KeyHostAlgorithm)reloaded.HostKeyAlgorithms.First()).Key.Comment);
Assert.DoesNotThrow((Action)(() => key.ToPuttyFormat(SshKeyFormat.PuTTYv3)));
}

[Test]
public void TestPuttyMacCoversUtf8Comment()
{
Expand Down
4 changes: 2 additions & 2 deletions SshNet.Keygen/Extensions/KeyExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private static string OpensshPrivateKeyData(this Key key, ISshKeyEncryption encr
throw new NotSupportedException($"Unsupported KeyType: {key}");
}
// comment
privWriter.EncodeBinary(key.Comment);
privWriter.EncodeBinary(key.Comment ?? "");

// private key padding (1, 2, 3, ...)
var pad = 0;
Expand Down Expand Up @@ -245,7 +245,7 @@ internal static string ToPuttyFormat(this Key key, ISshKeyEncryption encryption,
using var macWriter = new BinaryWriter(macStream);
macWriter.EncodeBinary(key.ToString()!);
macWriter.EncodeBinary(encryption.CipherName);
macWriter.EncodeBinary(key.Comment);
macWriter.EncodeBinary(key.Comment ?? "");
macWriter.EncodeBinary(pubStream);
macWriter.EncodeBinary(privStream);

Expand Down
Loading