From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b --- third_party/git/sha1dc_git.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 third_party/git/sha1dc_git.c (limited to 'third_party/git/sha1dc_git.c') diff --git a/third_party/git/sha1dc_git.c b/third_party/git/sha1dc_git.c deleted file mode 100644 index 5c300e812e0a..000000000000 --- a/third_party/git/sha1dc_git.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "cache.h" - -#ifdef DC_SHA1_EXTERNAL -/* - * Same as SHA1DCInit, but with default save_hash=0 - */ -void git_SHA1DCInit(SHA1_CTX *ctx) -{ - SHA1DCInit(ctx); - SHA1DCSetSafeHash(ctx, 0); -} -#endif - -/* - * Same as SHA1DCFinal, but convert collision attack case into a verbose die(). - */ -void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx) -{ - if (!SHA1DCFinal(hash, ctx)) - return; - die("SHA-1 appears to be part of a collision attack: %s", - hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1])); -} - -/* - * Same as SHA1DCUpdate, but adjust types to match git's usual interface. - */ -void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len) -{ - const char *data = vdata; - /* We expect an unsigned long, but sha1dc only takes an int */ - while (len > INT_MAX) { - SHA1DCUpdate(ctx, data, INT_MAX); - data += INT_MAX; - len -= INT_MAX; - } - SHA1DCUpdate(ctx, data, len); -} -- cgit 1.4.1