From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH 2/2] hex: drop sha1_to_hex()
Date: Mon, 11 Nov 2019 15:18:05 +0100 [thread overview]
Message-ID: <20191111141805.GK4348@szeder.dev> (raw)
In-Reply-To: <20191111090418.GB12545@sigill.intra.peff.net>
On Mon, Nov 11, 2019 at 04:04:18AM -0500, Jeff King wrote:
> There's only a single caller left of sha1_to_hex(), since everybody now
> uses oid_to_hex() instead. This case is in the sha1dc wrapper, where we
> print a hex sha1 when we find a collision. This one will always be sha1,
> regardless of the current hash algorithm, so we can't use oid_to_hex()
Nit: s/oid_to_hex/hash_to_hex/
We can't use oid_to_hex() because we don't have a 'struct object_id'
in the first place, as sha1dc only ever deals with 20 unsigned chars.
> here. In practice we'd probably not be running sha1 at all if it isn't
> the current algorithm, but it's possible we might still occasionally
> need to compute a sha1 in a post-sha256 world.
>
> Since sha1_to_hex() is just a wrapper for hash_to_hex_algop(), let's
> call that ourselves. There's value in getting rid of the sha1-specific
> wrapper to de-clutter the global namespace, and to make sure nobody uses
> it (and as with sha1_to_hex_r() in the previous patch, we'll drop the
> coccinelle transformations, too).
> diff --git a/sha1dc_git.c b/sha1dc_git.c
> index e0cc9d988c..5c300e812e 100644
> --- a/sha1dc_git.c
> +++ b/sha1dc_git.c
> @@ -19,7 +19,7 @@ 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",
> - sha1_to_hex(hash));
> + hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
> }
>
> /*
> --
> 2.24.0.739.gb5632e4929
next prev parent reply other threads:[~2019-11-11 14:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 9:03 [PATCH 0/2] getting rid of sha1_to_hex() Jeff King
2019-11-11 9:04 ` [PATCH 1/2] hex: drop sha1_to_hex_r() Jeff King
2019-11-11 18:30 ` Johannes Schindelin
2019-11-11 9:04 ` [PATCH 2/2] hex: drop sha1_to_hex() Jeff King
2019-11-11 14:18 ` SZEDER Gábor [this message]
2019-11-11 14:29 ` Jeff King
2019-11-12 4:13 ` Junio C Hamano
2019-11-12 10:57 ` Jeff King
2019-11-12 11:44 ` SZEDER Gábor
2019-11-12 12:12 ` Jeff King
2019-11-12 11:49 ` Junio C Hamano
2019-11-12 12:15 ` Jeff King
2019-11-13 1:09 ` Junio C Hamano
2019-11-13 1:15 ` Jeff King
2019-11-11 9:09 ` [PATCH 0/2] getting rid of sha1_to_hex() Junio C Hamano
2019-11-11 9:21 ` Jeff King
2019-11-11 23:53 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111141805.GK4348@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).