From e5173e62d719d78cc0f782f013af17381ef52aec Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Mon, 19 Jun 2023 11:31:34 +0900 Subject: [PATCH] util/blake3: Add blake3_hash typedef. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is more ergonomic than unsigned char hash[BLAKE3_OUT_LEN]. Reviewed-by: Daniel Schürmann Part-of: --- src/util/mesa-blake3.c | 3 +-- src/util/mesa-blake3.h | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/mesa-blake3.c b/src/util/mesa-blake3.c index 7c4accb2507..83fc459c262 100644 --- a/src/util/mesa-blake3.c +++ b/src/util/mesa-blake3.c @@ -34,8 +34,7 @@ void _mesa_blake3_hex_to_blake3(unsigned char *buf, const char *hex) mesa_hex_to_bytes(buf, hex, BLAKE3_OUT_LEN); } -void _mesa_blake3_compute(const void *data, size_t size, - unsigned char result[BLAKE3_OUT_LEN]) +void _mesa_blake3_compute(const void *data, size_t size, blake3_hash result) { struct mesa_blake3 ctx; _mesa_blake3_init(&ctx); diff --git a/src/util/mesa-blake3.h b/src/util/mesa-blake3.h index 181d7221c86..a0b53fd29f8 100644 --- a/src/util/mesa-blake3.h +++ b/src/util/mesa-blake3.h @@ -31,6 +31,8 @@ extern "C" { #define mesa_blake3 blake3_hasher +typedef uint8_t blake3_hash[BLAKE3_OUT_LEN]; + static inline void _mesa_blake3_init(struct mesa_blake3 *ctx) { @@ -44,7 +46,7 @@ _mesa_blake3_update(struct mesa_blake3 *ctx, const void *data, size_t size) } static inline void -_mesa_blake3_final(struct mesa_blake3 *ctx, unsigned char result[BLAKE3_OUT_LEN]) +_mesa_blake3_final(struct mesa_blake3 *ctx, blake3_hash result) { blake3_hasher_finalize(ctx, result, BLAKE3_OUT_LEN); } @@ -56,7 +58,7 @@ void _mesa_blake3_hex_to_blake3(unsigned char *buf, const char *hex); void -_mesa_blake3_compute(const void *data, size_t size, unsigned char result[BLAKE3_OUT_LEN]); +_mesa_blake3_compute(const void *data, size_t size, blake3_hash result); #ifdef __cplusplus } /* extern C */