Merge branch 'cb/avoid-colliding-with-netbsd-hmac'

gitster · gitster · commit b9bcd76a9a53 · 2020-05-08T14:25:09.000-07:00
The &lt;stdlib.h&gt; header on NetBSD brings in its own definition of
hmac() function (eek), which conflicts with our own and unrelated
function with the same name.  Our function has been renamed to work
around the issue.

* cb/avoid-colliding-with-netbsd-hmac:
  builtin/receive-pack: avoid generic function name hmac()
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
@@ -418,7 +418,7 @@ static int copy_to_sideband(int in, int out, void *arg)
 	return 0;
 }
 
-static void hmac(unsigned char *out,
+static void hmac_hash(unsigned char *out,
 		      const char *key_in, size_t key_len,
 		      const char *text, size_t text_len)
 {
@@ -463,10 +463,10 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
 	unsigned char hash[GIT_MAX_RAWSZ];
 
 	strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
-	hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
+	hmac_hash(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
 	strbuf_release(&buf);
 
-	/* RFC 2104 5. HMAC-SHA1-80 */
+	/* RFC 2104 5. HMAC-SHA1 or HMAC-SHA256 */
 	strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash));
 	return strbuf_detach(&buf, NULL);
 }

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ static int copy_to_sideband(int in, int out, void *arg)`
`418`	`418`	`return 0;`
`419`	`419`	`}`
`420`	`420`
`421`		`-static void hmac(unsigned char *out,`
	`421`	`+static void hmac_hash(unsigned char *out,`
`422`	`422`	`const char *key_in, size_t key_len,`
`423`	`423`	`const char *text, size_t text_len)`
`424`	`424`	`{`
`@@ -463,10 +463,10 @@ static char prepare_push_cert_nonce(const char path, timestamp_t stamp)`
`463`	`463`	`unsigned char hash[GIT_MAX_RAWSZ];`
`464`	`464`
`465`	`465`	`strbuf_addf(&buf, "%s:%"PRItime, path, stamp);`
`466`		`- hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));`
	`466`	`+ hmac_hash(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));`
`467`	`467`	`strbuf_release(&buf);`
`468`	`468`
`469`		`- /* RFC 2104 5. HMAC-SHA1-80 */`
	`469`	`+ /* RFC 2104 5. HMAC-SHA1 or HMAC-SHA256 */`
`470`	`470`	`strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash));`
`471`	`471`	`return strbuf_detach(&buf, NULL);`
`472`	`472`	`}`