From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4C3AE1F466 for ; Mon, 13 Jan 2020 12:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728894AbgAMMsA (ORCPT ); Mon, 13 Jan 2020 07:48:00 -0500 Received: from injection.crustytoothpaste.net ([192.241.140.119]:37770 "EHLO injection.crustytoothpaste.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726523AbgAMMr7 (ORCPT ); Mon, 13 Jan 2020 07:47:59 -0500 Received: from camp.crustytoothpaste.net (unknown [IPv6:2001:470:b978:101:b610:a2f0:36c1:12e3]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by injection.crustytoothpaste.net (Postfix) with ESMTPSA id EE4A160735 for ; Mon, 13 Jan 2020 12:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=crustytoothpaste.net; s=default; t=1578919678; bh=DUqdwcICGBPCOYMfOp0EfV46lQ5+wAqGRVSnBnoiMKE=; h=From:To:Subject:Date:In-Reply-To:References:From:Reply-To:Subject: Date:To:CC:Resent-Date:Resent-From:Resent-To:Resent-Cc:In-Reply-To: References:Content-Type:Content-Disposition; b=nM/hJcPmYw0rtT1jfQ1j63zo+NT+0fs3k94aH/l6Oalr6Lv3aMhhoUiMKagdFJmjb 6dLlBptPRApXwb7IIEGmeCTqsWdV/EBkfjDK1N4nK4OZDgZ5QSieDxvZrtkLn5Ltn2 3Q5b+6uAoEASQ+P4o8WS2aiVRCoPqhpUnSetbkrWHFhm2J8WGN4GfPgffWZrRvG9QF 440bVssIqfcg8jzdecMtjUjINR08gMjowQsTitR+hvIQfgDvR6efky+Mpdy+IAieHs k/HEhxhGuwSWKzdIML02J/b9GTN8gCYqApMElLmiTl4bkuTKEX3PUGss8CDdnjYlh+ izS/JfbMmBxW/28HiwhIKDajsLSxyzXTOV+b0Uhgv0L3VRnew8nxtjSaylIMzWNEGb Q/9Y8uxAHSBD5gstLPM1gZJypqt+2rWrUCEl7JhsSZ9R7SF0cDgMFw6GSvuRCu8l6e CCXIs0iuCN1Jo2eBEr42iNm/ZFfZF7HQzx8N2qiD0wzyhtJHLMB From: "brian m. carlson" To: Subject: [RFC PATCH 01/22] hex: introduce parsing variants taking hash algorithms Date: Mon, 13 Jan 2020 12:47:08 +0000 Message-Id: <20200113124729.3684846-2-sandals@crustytoothpaste.net> X-Mailer: git-send-email 2.25.0.rc2.338.g21a285fb81 In-Reply-To: <20200113124729.3684846-1-sandals@crustytoothpaste.net> References: <20200113124729.3684846-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Introduce variants of get_oid_hex and parse_oid_hex that parse an arbitrary hash algorithm, implementing internal functions to avoid duplication. These functions can be used in the transport code to parse refs properly. Signed-off-by: brian m. carlson --- cache.h | 7 +++++++ hex.c | 35 +++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/cache.h b/cache.h index cbfaead23a..493d57febe 100644 --- a/cache.h +++ b/cache.h @@ -1480,6 +1480,9 @@ int set_disambiguate_hint_config(const char *var, const char *value); int get_sha1_hex(const char *hex, unsigned char *sha1); int get_oid_hex(const char *hex, struct object_id *sha1); +/* Like get_oid_hex, but for an arbitrary hash algorithm. */ +int get_oid_hex_algop(const char *hex, struct object_id *oid, const struct git_hash_algo *algop); + /* * Read `len` pairs of hexadecimal digits from `hex` and write the * values to `binary` as `len` bytes. Return 0 on success, or -1 if @@ -1515,6 +1518,10 @@ char *oid_to_hex(const struct object_id *oid); /* same static buffer */ */ int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); +/* Like parse_oid_hex, but for an arbitrary hash algorithm. */ +int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end, + const struct git_hash_algo *algo); + /* * This reads short-hand syntax that not only evaluates to a commit * object name, but also can act as if the end user spelled the name diff --git a/hex.c b/hex.c index fd7f00c43f..10e24dc2e4 100644 --- a/hex.c +++ b/hex.c @@ -47,30 +47,49 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len) return 0; } -int get_sha1_hex(const char *hex, unsigned char *sha1) +static int get_hash_hex_algop(const char *hex, unsigned char *hash, + const struct git_hash_algo *algop) { int i; - for (i = 0; i < the_hash_algo->rawsz; i++) { + for (i = 0; i < algop->rawsz; i++) { int val = hex2chr(hex); if (val < 0) return -1; - *sha1++ = val; + *hash++ = val; hex += 2; } return 0; } +int get_sha1_hex(const char *hex, unsigned char *sha1) +{ + return get_hash_hex_algop(hex, sha1, the_hash_algo); +} + +int get_oid_hex_algop(const char *hex, struct object_id *oid, + const struct git_hash_algo *algop) +{ + return get_hash_hex_algop(hex, oid->hash, algop); +} + int get_oid_hex(const char *hex, struct object_id *oid) { - return get_sha1_hex(hex, oid->hash); + return get_oid_hex_algop(hex, oid, the_hash_algo); +} + +int parse_oid_hex_algop(const char *hex, struct object_id *oid, + const char **end, + const struct git_hash_algo *algop) +{ + int ret = get_hash_hex_algop(hex, oid->hash, algop); + if (!ret) + *end = hex + algop->hexsz; + return ret; } int parse_oid_hex(const char *hex, struct object_id *oid, const char **end) { - int ret = get_oid_hex(hex, oid); - if (!ret) - *end = hex + the_hash_algo->hexsz; - return ret; + return parse_oid_hex_algop(hex, oid, end, the_hash_algo); } char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,