Fix native binary interface

Author: eddymoulton

LibGit2Sharp/CertificateSsh.cs

@@ -25,6 +25,11 @@ protected CertificateSsh()
         /// </summary>
         public readonly byte[] HashSHA1;
 
+        /// <summary>
+        /// The SHA256 hash of the host. Meaningful if <see cref="HasSHA256"/> is true
+        /// </summary>
+        public readonly byte[] HashSHA256;
+
         /// <summary>
         /// True if we have the MD5 hostkey hash from the server
         /// </summary>
@@ -35,11 +40,17 @@ protected CertificateSsh()
         /// </summary>
         public readonly bool HasSHA1;
 
+        /// <summary>
+        /// True if we have the SHA256 hostkey hash from the server
+        /// </summary>
+        public readonly bool HasSHA256;
+
         internal unsafe CertificateSsh(git_certificate_ssh* cert)
         {
 
             HasMD5 = cert->type.HasFlag(GitCertificateSshType.MD5);
             HasSHA1 = cert->type.HasFlag(GitCertificateSshType.SHA1);
+            HasSHA256 = cert->type.HasFlag(GitCertificateSshType.SHA256);
 
             HashMD5 = new byte[16];
             for (var i = 0; i < HashMD5.Length; i++)
@@ -52,6 +63,12 @@ internal unsafe CertificateSsh(git_certificate_ssh* cert)
             {
                 HashSHA1[i] = cert->HashSHA1[i];
             }
+
+            HashSHA256 = new byte[32];
+            for (var i = 0; i < HashSHA256.Length; i++)
+            {
+                HashSHA256[i] = cert->HashSHA256[i];
+            }
         }
 
         internal unsafe IntPtr ToPointer()
@@ -65,6 +82,10 @@ internal unsafe IntPtr ToPointer()
             {
                 sshCertType |= GitCertificateSshType.SHA1;
             }
+            if (HasSHA256)
+            {
+                sshCertType |= GitCertificateSshType.SHA256;
+            }
 
             var gitCert = new git_certificate_ssh()
             {
@@ -88,6 +109,14 @@ internal unsafe IntPtr ToPointer()
                 }
             }
 
+            fixed (byte* p = &HashSHA256[0])
+            {
+                for (var i = 0; i < HashSHA256.Length; i++)
+                {
+                    gitCert.HashSHA256[i] = p[i];
+                }
+            }
+
             var ptr = Marshal.AllocHGlobal(Marshal.SizeOf(gitCert));
             Marshal.StructureToPtr(gitCert, ptr, false);
 

LibGit2Sharp/Core/GitCertificateSsh.cs

@@ -25,7 +25,7 @@ internal unsafe struct git_certificate_ssh
         public unsafe fixed byte HashSHA256[32];
 
         public int raw_type;
-        public char* hostkey;
+        public byte* hostkey;
         public UIntPtr hostkey_len;
     }
 }

LibGit2Sharp/Core/GitCertificateSshType.cs

@@ -7,5 +7,6 @@ internal enum GitCertificateSshType
     {
         MD5 = (1 << 0),
         SHA1 = (1 << 1),
+        SHA256 = (1 << 2),
     }
 }

LibGit2Sharp/Core/SshExtensions.cs

@@ -16,7 +16,7 @@ internal static extern int git_cred_ssh_key_new(
              [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string privatekey,
              [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string passphrase);
 
-        [DllImport(libgit2)]
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern int git_cred_ssh_key_memory_new(
               out IntPtr cred,
               [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username,