Add structure representing hash algorithm

Since in the future we want to support an additional hash algorithm, add
a structure that represents a hash algorithm and all the data that must
go along with it.  Add a constant to allow easy enumeration of hash
algorithms.  Implement function typedefs to create an abstract API that
can be used by any hash algorithm, and wrappers for the existing SHA1
functions that conform to this API.

Expose a value for hex size as well as binary size.  While one will
always be twice the other, the two values are both used extremely
commonly throughout the codebase and providing both leads to improved

Don't include an entry in the hash algorithm structure for the null
object ID.  As this value is all zeros, any suitably sized all-zero
object ID can be used, and there's no need to store a given one on a
per-hash basis.

The current hash function transition plan envisions a time when we will
accept input from the user that might be in SHA-1 or in the NewHash
format.  Since we cannot know which the user has provided, add a
constant representing the unknown algorithm to allow us to indicate that
we must look the correct value up.  Provide dummy API functions that die
in this case.

Finally, include git-compat-util.h in hash.h so that the required types
are available.  This aids people using automated tools their editors.

Signed-off-by: brian m. carlson <>
Signed-off-by: Junio C Hamano <>
This commit is contained in:
brian m. carlson 2017-11-12 21:28:52 +00:00 committed by Junio C Hamano
parent abade65b79
commit f50e766b7b
2 changed files with 115 additions and 0 deletions

View File

@ -1,6 +1,8 @@
#ifndef HASH_H
#define HASH_H
#include "git-compat-util.h"
#if defined(SHA1_PPC)
#include "ppc/sha1.h"
#elif defined(SHA1_APPLE)
@ -13,4 +15,59 @@
#include "block-sha1/sha1.h"
* Note that these constants are suitable for indexing the hash_algos array and
* comparing against each other, but are otherwise arbitrary, so they should not
* be exposed to the user or serialized to disk. To know whether a
* git_hash_algo struct points to some usable hash function, test the format_id
* field for being non-zero. Use the name field for user-visible situations and
* the format_id field for fixed-length fields on disk.
/* An unknown hash function. */
/* SHA-1 */
#define GIT_HASH_SHA1 1
/* Number of algorithms supported (including unknown). */
typedef void (*git_hash_init_fn)(void *ctx);
typedef void (*git_hash_update_fn)(void *ctx, const void *in, size_t len);
typedef void (*git_hash_final_fn)(unsigned char *hash, void *ctx);
struct git_hash_algo {
* The name of the algorithm, as appears in the config file and in
* messages.
const char *name;
/* A four-byte version identifier, used in pack indices. */
uint32_t format_id;
/* The size of a hash context (e.g. git_SHA_CTX). */
size_t ctxsz;
/* The length of the hash in binary. */
size_t rawsz;
/* The length of the hash in hex characters. */
size_t hexsz;
/* The hash initialization function. */
git_hash_init_fn init_fn;
/* The hash update function. */
git_hash_update_fn update_fn;
/* The hash finalization function. */
git_hash_final_fn final_fn;
/* The OID of the empty tree. */
const struct object_id *empty_tree;
/* The OID of the empty blob. */
const struct object_id *empty_blob;
extern const struct git_hash_algo hash_algos[GIT_HASH_NALGOS];

View File

@ -39,6 +39,64 @@ const struct object_id empty_blob_oid = {
static void git_hash_sha1_init(void *ctx)
git_SHA1_Init((git_SHA_CTX *)ctx);
static void git_hash_sha1_update(void *ctx, const void *data, size_t len)
git_SHA1_Update((git_SHA_CTX *)ctx, data, len);
static void git_hash_sha1_final(unsigned char *hash, void *ctx)
git_SHA1_Final(hash, (git_SHA_CTX *)ctx);
static void git_hash_unknown_init(void *ctx)
die("trying to init unknown hash");
static void git_hash_unknown_update(void *ctx, const void *data, size_t len)
die("trying to update unknown hash");
static void git_hash_unknown_final(unsigned char *hash, void *ctx)
die("trying to finalize unknown hash");
const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
/* "sha1", big-endian */
* This is meant to hold a *small* number of objects that you would
* want read_sha1_file() to be able to return, but yet you do not want