WIP: ED25519 Keys

Exploring what needs to be done to make it Work.

1st Step Parse OPENSSH Key Format

Author: darinkes

src/Renci.SshNet.NET35/Renci.SshNet.NET35.csproj

@@ -701,6 +701,9 @@
     <Compile Include="..\Renci.SshNet\Security\Cryptography\EcdsaKey.cs">
       <Link>Security\Cryptography\EcdsaKey.cs</Link>
     </Compile>
+    <Compile Include="..\Renci.SshNet\Security\Cryptography\OpenSSHKey.cs">
+      <Link>Security\Cryptography\OpenSSHKey.cs</Link>
+    </Compile>
     <Compile Include="..\Renci.SshNet\Security\Cryptography\RsaDigitalSignature.cs">
       <Link>Security\Cryptography\RsaDigitalSignature.cs</Link>
     </Compile>

src/Renci.SshNet.Tests/Classes/PrivateKeyFileTest.cs

@@ -385,6 +385,28 @@ public void Test_PrivateKey_ECDSA521_Encrypted()
             }
         }
 
+        [TestMethod]
+        [Owner("darinkes")]
+        [TestCategory("PrivateKey")]
+        public void Test_PrivateKey_ED25519()
+        {
+            using (var stream = GetData("Key.ED25519.txt"))
+            {
+                new PrivateKeyFile(stream, "12345");
+            }
+        }
+
+        [TestMethod]
+        [Owner("darinkes")]
+        [TestCategory("PrivateKey")]
+        public void Test_PrivateKey_ED25519_Encrypted()
+        {
+            using (var stream = GetData("Key.ED25519.Encrypted.txt"))
+            {
+                new PrivateKeyFile(stream, "12345");
+            }
+        }
+
         /// <summary>
         ///A test for Dispose
         ///</summary>

src/Renci.SshNet.Tests/Data/Key.ED25519.Encrypted.txt

@@ -0,0 +1,8 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCziVlGog
+eUxEUKJcduOqCCAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBZfAisK02MKZeSy
+MGo9lxq7Otgg1ll2Qhp+ySacRk2CAAAAoDc5MjTED1jcIotaaqc6DcnADwVnPf/4iC9BM2
++2C+6uKXuYGOuqb16kFHn8yYAkABX2mtQo1GmJt5lPriMkJ1qNfZ6gg1jgXVrFru8zHSfY
+Gr9tniFSkdnrP/XHaEkQwEPptUlRF1eG+3hOO1D1vW0SliXBfg1DWd/Yew55kljzmtgxsg
+J2dfTYZF5L6xblNjM6mr5NItdhUsVB4XsYWo4=
+-----END OPENSSH PRIVATE KEY-----

src/Renci.SshNet.Tests/Data/Key.ED25519.txt

@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACCCsGI6AEHghOMbGIhtsRX59CjoqwkCgDMLgOqGByvrPAAAAKDryTjh68k4
+4QAAAAtzc2gtZWQyNTUxOQAAACCCsGI6AEHghOMbGIhtsRX59CjoqwkCgDMLgOqGByvrPA
+AAAECcZJX7mXgmBR60wXj51bhpkw21jDt95z4VBbXHEjbgMYKwYjoAQeCE4xsYiG2xFfn0
+KOirCQKAMwuA6oYHK+s8AAAAFnNyaW5rZXNAV0lOREVWLVNSSU5LRVMBAgMEBQYH
+-----END OPENSSH PRIVATE KEY-----

src/Renci.SshNet.Tests/Renci.SshNet.Tests.csproj

@@ -717,6 +717,12 @@
     <EmbeddedResource Include="Data\Key.ECDSA384.Encrypted.txt" />
     <EmbeddedResource Include="Data\Key.ECDSA521.Encrypted.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Key.ED25519.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\Key.ED25519.Encrypted.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Renci.SshNet/PrivateKeyFile.cs

@@ -203,6 +203,10 @@ private void Open(Stream privateKey, string passPhrase)
                     HostKey = new KeyHostAlgorithm(_key.ToString(), _key);
                     break;
 #endif
+                case "OPENSSH":
+                    _key = new OpenSSHKey(decryptedData);
+                    HostKey = new KeyHostAlgorithm(_key.ToString(), _key);
+                    break;
                 case "SSH2 ENCRYPTED":
                     var reader = new SshDataReader(decryptedData);
                     var magicNumber = reader.ReadUInt32();

src/Renci.SshNet/Renci.SshNet.csproj

@@ -170,6 +170,7 @@
     <Compile Include="RemotePathTransformation.cs" />
     <Compile Include="Security\Cryptography\EcdsaDigitalSignature.cs" />
     <Compile Include="Security\Cryptography\EcdsaKey.cs" />
+    <Compile Include="Security\Cryptography\OpenSSHKey.cs" />
     <Compile Include="Security\Cryptography\HMACMD5.cs" />
     <Compile Include="Security\Cryptography\HMACSHA1.cs" />
     <Compile Include="Security\Cryptography\HMACSHA256.cs" />

src/Renci.SshNet/Security/Cryptography/OpenSSHKey.cs

@@ -0,0 +1,135 @@
+using System;
+using System.IO;
+using System.Text;
+using Renci.SshNet.Common;
+using Renci.SshNet.Security.Cryptography;
+
+namespace Renci.SshNet.Security
+{
+    /// <summary>
+    /// Contains OpenSSH private and public key
+    /// </summary>
+    public class OpenSSHKey : Key, IDisposable
+    {
+        /// <summary>
+        /// Gets the Key String.
+        /// </summary>
+        public override string ToString()
+        {
+            // ToDo: return extraced Key String
+            return base.ToString();
+        }
+
+        /// <summary>
+        /// Gets the length of the key.
+        /// </summary>
+        /// <value>
+        /// The length of the key.
+        /// </value>
+        public override int KeyLength
+        {
+            get
+            {
+                // ToDo: actual KeySize;
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets the digital signature.
+        /// </summary>
+        protected override DigitalSignature DigitalSignature
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the public.
+        /// </summary>
+        /// <value>
+        /// The public.
+        /// </value>
+        public override BigInteger[] Public
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        const string AUTH_MAGIC = "openssh-key-v1";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSSHKey"/> class.
+        /// </summary>
+        public OpenSSHKey()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenSSHKey"/> class.
+        /// </summary>
+        /// <param name="data">DER encoded private key data.</param>
+        public OpenSSHKey(byte[] data)
+        {
+            //throw new SshException("Unsupported Format: " + BitConverter.ToString(data));
+
+            // https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key
+            using (var br = new BinaryReader(new MemoryStream(data), Encoding.ASCII))
+            {
+                var magic = Encoding.ASCII.GetString(br.ReadBytes(AUTH_MAGIC.Length));
+                if (magic != AUTH_MAGIC)
+                    throw new SshException("Unsupported Format: " + magic);
+                br.ReadByte(); // AUTH_MAGIC is 0 terminated string
+                Console.WriteLine("Len: " + BitConverter.ToString(br.ReadBytes(4)));
+                Console.WriteLine("String: " + Encoding.ASCII.GetString(br.ReadBytes(4)));
+            }
+        }
+
+        #region IDisposable Members
+
+        private bool _isDisposed;
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources
+        /// </summary>
+        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing)
+            {
+                _isDisposed = true;
+            }
+        }
+
+        /// <summary>
+        /// Releases unmanaged resources and performs other cleanup operations before the
+        /// <see cref="DsaKey"/> is reclaimed by garbage collection.
+        /// </summary>
+        ~OpenSSHKey()
+        {
+            Dispose(false);
+        }
+
+        #endregion
+    }
+}