Fix ED25519 Support with SSH.NET 2024.2.0

Closes #17
darinkes · Dec 3, 2024 · 193efa3 · 193efa3
1 parent ce992ff
commit 193efa3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/SshNet.Keygen/Extensions/KeyExtension.cs b/SshNet.Keygen/Extensions/KeyExtension.cs
@@ -109,7 +109,10 @@ private static string OpensshPrivateKeyData(this Key key, ISshKeyEncryption encr
                 case "ssh-ed25519":
                     var ed25519 = (ED25519Key)key;
                     privWriter.EncodeBinary(ed25519.PublicKey);
-                    privWriter.EncodeBinary(ed25519.PrivateKey);
+                    var privateKey = new byte[ed25519.PrivateKey.Length + ed25519.PublicKey.Length];
+                    Buffer.BlockCopy(ed25519.PrivateKey, 0, privateKey, 0, ed25519.PrivateKey.Length);
+                    Buffer.BlockCopy(ed25519.PublicKey, 0, privateKey, ed25519.PrivateKey.Length, ed25519.PublicKey.Length);
+                    privWriter.EncodeBinary(privateKey);
                     break;
                 case "ssh-rsa":
                     var rsa = (RsaKey)key;
@@ -200,7 +203,10 @@ internal static string ToPuttyFormat(this Key key, ISshKeyEncryption encryption,
             {
                 case "ssh-ed25519":
                     var ed25519 = (ED25519Key)key;
-                    privWriter.EncodeBinary(ed25519.PrivateKey);
+                    var privateKey = new byte[ed25519.PrivateKey.Length + ed25519.PublicKey.Length];
+                    Buffer.BlockCopy(ed25519.PrivateKey, 0, privateKey, 0, ed25519.PrivateKey.Length);
+                    Buffer.BlockCopy(ed25519.PublicKey, 0, privateKey, ed25519.PrivateKey.Length, ed25519.PublicKey.Length);
+                    privWriter.EncodeBinary(privateKey);
                     break;
                 case "ssh-rsa":
                     var rsa = (RsaKey)key;

diff --git a/SshNet.Keygen/SshNet.Keygen.csproj b/SshNet.Keygen/SshNet.Keygen.csproj
@@ -5,7 +5,7 @@
         <LangVersion>9</LangVersion>
         <Nullable>enable</Nullable>
         <PackageId>SshNet.Keygen</PackageId>
-        <Version>2024.2.0.0</Version>
+        <Version>2024.2.0.1</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>