@matheusbsbs / matheus-bagliano / commits / b19f3fe9dd
Fork 0

hex: drop sha1_to_hex()

There's only a single caller left of sha1_to_hex(), since everybody that has an object name in "unsigned char[]" now uses hash_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 hash_to_hex() 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). The sha1_to_hex() function is mentioned in a comment; we can easily swap that out for oid_to_hex() to give a better example. Also update the comment that was left stale when we added "struct object_id *" as a way to name an object and added functions to convert it to hex. The function is also mentioned in some test vectors in t4100, but that's not runnable code, so there's no point in trying to clean it up. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Nov 11, 2019 at 04:04 UTC b19f3fe9dd1a0c00fb8b30df9896912727f2eea2
4 files changed +5 -24
cache.h
+4 -3
@@ -1451,7 +1451,8 @@ int get_oid_hex(const char *hex, struct object_id *sha1);
1451 int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
1452
1453 /*
1454 - * Convert a binary hash to its hex equivalent. The `_r` variant is reentrant,
1454 + * Convert a binary hash in "unsigned char []" or an object name in
1455 + * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant,
1456 * and writes the NUL-terminated output to the buffer `out`, which must be at
1457 * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for
1458 * convenience.
@@ -1459,12 +1460,12 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
1460 * The non-`_r` variant returns a static buffer, but uses a ring of 4
1461 * buffers, making it safe to make multiple calls for a single statement, like:
1462 *
1462 - * printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
1463 + * printf("%s -> %s", hash_to_hex(one), hash_to_hex(two));
1464 + * printf("%s -> %s", oid_to_hex(one), oid_to_hex(two));
1465 */
1466 char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *);
1467 char *oid_to_hex_r(char *out, const struct object_id *oid);
1468 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *); /* static buffer result! */
1467 -char *sha1_to_hex(const unsigned char *sha1); /* same static buffer */
1469 char *hash_to_hex(const unsigned char *hash); /* same static buffer */
1470 char *oid_to_hex(const struct object_id *oid); /* same static buffer */
1471
contrib/coccinelle/object_id.cocci
-15
@@ -10,21 +10,6 @@ struct object_id *OIDPTR;
10 - is_null_sha1(OIDPTR->hash)
11 + is_null_oid(OIDPTR)
12
13 -@@
14 -struct object_id OID;
15 -@@
16 -- sha1_to_hex(OID.hash)
17 -+ oid_to_hex(&OID)
18 -
19 -@@
20 -identifier f != oid_to_hex;
21 -struct object_id *OIDPTR;
22 -@@
23 - f(...) {<...
24 -- sha1_to_hex(OIDPTR->hash)
25 -+ oid_to_hex(OIDPTR)
26 - ...>}
27 -
13 @@
14 struct object_id OID;
15 @@
hex.c
-5
@@ -103,11 +103,6 @@ char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *a
103 return hash_to_hex_algop_r(hexbuffer[bufno], hash, algop);
104 }
105
106 -char *sha1_to_hex(const unsigned char *sha1)
107 -{
108 - return hash_to_hex_algop(sha1, &hash_algos[GIT_HASH_SHA1]);
109 -}
110 -
106 char *hash_to_hex(const unsigned char *hash)
107 {
108 return hash_to_hex_algop(hash, the_hash_algo);
sha1dc_git.c
+1 -1
@@ -19,7 +19,7 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
19 if (!SHA1DCFinal(hash, ctx))
20 return;
21 die("SHA-1 appears to be part of a collision attack: %s",
22 - sha1_to_hex(hash));
22 + hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
23 }
24
25 /*