Tidy up code

tetractic · Mar 21, 2022 · f4fb153 · f4fb153
1 parent b1b3114
commit f4fb153
Showing 1 changed file with 34 additions and 34 deletions.
diff --git a/SKSshAgent/Ssh/SshKey.cs b/SKSshAgent/Ssh/SshKey.cs
@@ -32,36 +32,6 @@ protected SshKey(SshKeyTypeInfo keyTypeInfo)
 
         public SshKeyTypeInfo KeyTypeInfo { get; }
 
-        public byte[] GetSha256Fingerprint()
-        {
-            var buffer = new ArrayBufferWriter<byte>();
-            var writer = new SshWireWriter(buffer);
-            WritePublicKeyTo(ref writer);
-            writer.Flush();
-            return SHA256.HashData(buffer.WrittenSpan);
-        }
-
-        public byte[] GetMd5Fingerprint()
-        {
-            var buffer = new ArrayBufferWriter<byte>();
-            var writer = new SshWireWriter(buffer);
-            WritePublicKeyTo(ref writer);
-            writer.Flush();
-            return MD5.HashData(buffer.WrittenSpan);
-        }
-
-        public virtual string GetOpenSshKeyAuthorization(string comment)
-        {
-            var buffer = new ArrayBufferWriter<byte>();
-            var writer = new SshWireWriter(buffer);
-            WritePublicKeyTo(ref writer);
-            writer.Flush();
-
-            string base64Blob = Convert.ToBase64String(buffer.WrittenSpan);
-
-            return $"{KeyTypeInfo.Name} {base64Blob} {comment}";
-        }
-
         /// <exception cref="InvalidDataException"/>
         /// <exception cref="SshWireContentException"/>
         /// <exception cref="NotSupportedException"/>
@@ -188,10 +158,6 @@ public static SshKey ReadPrivateKey(ref SshWireReader reader)
             };
         }
 
-        public abstract void WritePublicKeyTo(ref SshWireWriter writer);
-
-        public abstract void WritePrivateKeyTo(ref SshWireWriter writer);
-
         public char[] FormatOpenSshPublicKey(string comment)
         {
             var buffer = new ArrayBufferWriter<byte>();
@@ -268,6 +234,40 @@ public char[] FormatOpenSshPrivateKey(string comment)
             return PemEncoding.Write(_openSshPrivateKeyLabel, buffer.WrittenSpan);
         }
 
+        public abstract void WritePublicKeyTo(ref SshWireWriter writer);
+
+        public abstract void WritePrivateKeyTo(ref SshWireWriter writer);
+
+        public byte[] GetSha256Fingerprint()
+        {
+            var buffer = new ArrayBufferWriter<byte>();
+            var writer = new SshWireWriter(buffer);
+            WritePublicKeyTo(ref writer);
+            writer.Flush();
+            return SHA256.HashData(buffer.WrittenSpan);
+        }
+
+        public byte[] GetMd5Fingerprint()
+        {
+            var buffer = new ArrayBufferWriter<byte>();
+            var writer = new SshWireWriter(buffer);
+            WritePublicKeyTo(ref writer);
+            writer.Flush();
+            return MD5.HashData(buffer.WrittenSpan);
+        }
+
+        public virtual string GetOpenSshKeyAuthorization(string comment)
+        {
+            var buffer = new ArrayBufferWriter<byte>();
+            var writer = new SshWireWriter(buffer);
+            WritePublicKeyTo(ref writer);
+            writer.Flush();
+
+            string base64Blob = Convert.ToBase64String(buffer.WrittenSpan);
+
+            return $"{KeyTypeInfo.Name} {base64Blob} {comment}";
+        }
+
         public abstract bool Equals(SshKey? other, bool publicOnly);
     }
 }