From 069cf351125a12590426267b58e7ad34effadfd2 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 16 Dec 2020 12:06:33 -0800 Subject: [PATCH] Update libgit2 --- libgit2-sys/build.rs | 1 + libgit2-sys/lib.rs | 11 +++++++++++ libgit2-sys/libgit2 | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libgit2-sys/build.rs b/libgit2-sys/build.rs index 6f97db215d..76aa687cf6 100644 --- a/libgit2-sys/build.rs +++ b/libgit2-sys/build.rs @@ -78,6 +78,7 @@ fn main() { // when when COMPILE_PCRE8 is not defined, which is the default. add_c_files(&mut cfg, "libgit2/deps/pcre"); + cfg.file("libgit2/src/allocators/failalloc.c"); cfg.file("libgit2/src/allocators/stdalloc.c"); if windows { diff --git a/libgit2-sys/lib.rs b/libgit2-sys/lib.rs index 26f1cd0873..665a9c3332 100644 --- a/libgit2-sys/lib.rs +++ b/libgit2-sys/lib.rs @@ -456,6 +456,9 @@ pub struct git_cert_hostkey { pub hash_md5: [u8; 16], pub hash_sha1: [u8; 20], pub hash_sha256: [u8; 32], + pub raw_type: git_cert_ssh_raw_type_t, + pub hostkey: *const c_char, + pub hostkey_len: size_t, } #[repr(C)] @@ -473,6 +476,14 @@ git_enum! { } } +git_enum! { + pub enum git_cert_ssh_raw_type_t { + GIT_CERT_SSH_RAW_TYPE_UNKNOWN = 0, + GIT_CERT_SSH_RAW_TYPE_RSA = 1, + GIT_CERT_SSH_RAW_TYPE_DSS = 2, + } +} + git_enum! { pub enum git_diff_flag_t { GIT_DIFF_FLAG_BINARY = 1 << 0, diff --git a/libgit2-sys/libgit2 b/libgit2-sys/libgit2 index 7f4fa17862..530d37beb2 160000 --- a/libgit2-sys/libgit2 +++ b/libgit2-sys/libgit2 @@ -1 +1 @@ -Subproject commit 7f4fa178629d559c037a1f72f79f79af9c1ef8ce +Subproject commit 530d37beb2731a2073f5298242825a803815c37c