diff --git a/src/util/meson.build b/src/util/meson.build index ed746734b87..06066ab8aa1 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -95,7 +95,6 @@ files_mesa_util = files( 'u_qsort.h', 'rwlock.c', 'rwlock.h', - 'sha1/sha1.c', 'sha1/sha1.h', 'ralloc.c', 'ralloc.h', diff --git a/src/util/sha1/README b/src/util/sha1/README deleted file mode 100644 index 445d23716a3..00000000000 --- a/src/util/sha1/README +++ /dev/null @@ -1,62 +0,0 @@ -This local copy of a SHA1 implementation based on the sources below. - -Why: - - Some libraries suffer from race condition and other issues. For example see -commit ade3108bb5b0 ("util: Fix race condition on libgcrypt initialization"). - - - Fold the handling and detection of _eight_ implementations at configure -stage and _seven_ different codepaths. - - - Have a single, uniform, code used by developers, testers and users. - - - Avoid conflicts when using software which ships with it's own SHA1 library. -The latter of which conflicting with the one mesa is build against. - - - -Source: -The SHA1 implementation is copied verbatim from the following links. -At the time of checkout HEAD is 1.25 and 1.24 respectively. - -http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/lib/libc/hash/sha1.c?rev=HEAD -http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/include/sha1.h?rev=HEAD - - -Notes: - - The files should not have any local changes. If there are any they should be -clearly documented below and one should aim to upstream them where possible. - - - Files will be periodically syncronised with the respective upstream sources. -Updates will be made regularly, but since the code is _not_ aimed as a -cryptography solution any issues found should not be considered security ones. - - -Local changes: - - Removed __bounded__ attribute qualifiers. Unavailable on platforms targeted -by Mesa. Upstream status: TBD (N/A ?) - - - Pick the sha1.h header from the current folder, by using "" over <> in the -include directive. Upstream status: TBD - - - Remove unused function prototypes - SHA1End, SHA1File, SHA1FileChunk and -SHA1Data. Upstream status: TBD - - - Use stdint.h integer types - u_int{8,16,32}_t -> uint{8,16,32}_t and -u_int -> uint32_t, change header include. Upstream status: TBD - - - Revert sha1.c rev 1.26 change (introduce DEF_WEAK). -Upstream status: TBD (N/A ?) - - - Add stdint.h include in sha1.h for uint*_t types. Upstream status: TBD - - - Add stddef.h include in sha1.h for size_t type. Upstream status: TBD - - - Use memset over explicit_bzero, since memset_s once isn't widely available. -Upstream status: TBD (N/A ?) - - - Manually expand __BEGIN_DECLS/__END_DECLS and make sure that they include -the struct declaration. -Upstream status: TBD - - - Add non-typedef struct name. -Upstream status: TBD diff --git a/src/util/sha1/sha1.c b/src/util/sha1/sha1.c deleted file mode 100644 index 10db80a2375..00000000000 --- a/src/util/sha1/sha1.c +++ /dev/null @@ -1,182 +0,0 @@ -/* $OpenBSD: sha1.c,v 1.26 2015/09/11 09:18:27 guenther Exp $ */ - -/* - * SHA-1 in C - * By Steve Reid - * 100% Public Domain - * - * Test Vectors (from FIPS PUB 180-1) - * "abc" - * A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D - * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" - * 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 - * A million repetitions of "a" - * 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F - */ - -#include -#include -#include "u_endian.h" -#include "macros.h" -#include "sha1.h" - -#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -/* - * blk0() and blk() perform the initial expand. - * I got the idea of expanding during the round function from SSLeay - */ -#if UTIL_ARCH_LITTLE_ENDIAN -# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ - |(rol(block->l[i],8)&0x00FF00FF)) -#else -# define blk0(i) block->l[i] -#endif -#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ - ^block->l[(i+2)&15]^block->l[i&15],1)) - -/* - * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1 - */ -#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30); -#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); -#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); -#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); - -typedef union { - uint8_t c[64]; - uint32_t l[16]; -} CHAR64LONG16; - -/* - * Hash a single 512-bit block. This is the core of the algorithm. - */ -static void -SHA1Transform(uint32_t state[5], const uint8_t buffer[SHA1_BLOCK_LENGTH]) -{ - uint32_t a, b, c, d, e; - uint8_t workspace[SHA1_BLOCK_LENGTH]; - CHAR64LONG16 *block = (CHAR64LONG16 *)workspace; - - (void)memcpy(block, buffer, SHA1_BLOCK_LENGTH); - - /* Copy context->state[] to working vars */ - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - - /* 4 rounds of 20 operations each. Loop unrolled. */ - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - - /* Add the working vars back into context.state[] */ - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; - - /* Wipe variables */ - a = b = c = d = e = 0; -} - - -/* - * SHA1Init - Initialize new context - */ -void -SHA1Init(SHA1_CTX *context) -{ - - /* SHA1 initialization constants */ - context->count = 0; - context->state[0] = 0x67452301; - context->state[1] = 0xEFCDAB89; - context->state[2] = 0x98BADCFE; - context->state[3] = 0x10325476; - context->state[4] = 0xC3D2E1F0; -} - - -/* - * Run your data through this. - */ -void -SHA1Update(SHA1_CTX *context, const uint8_t *data, size_t len) -{ - size_t i, j; - - j = (size_t)((context->count >> 3) & 63); - context->count += (len << 3); - if ((j + len) > 63) { - (void)memcpy(&context->buffer[j], data, (i = 64-j)); - SHA1Transform(context->state, context->buffer); - for ( ; i + 63 < len; i += 64) { - assume(len >= 64); - SHA1Transform(context->state, (uint8_t *)&data[i]); - } - j = 0; - } else { - i = 0; - } - (void)memcpy(&context->buffer[j], &data[i], len - i); -} - - -/* - * Add padding and return the message digest. - */ -static void -SHA1Pad(SHA1_CTX *context) -{ - uint8_t finalcount[8]; - uint32_t i; - - for (i = 0; i < 8; i++) { - finalcount[i] = (uint8_t)((context->count >> - ((7 - (i & 7)) * 8)) & 255); /* Endian independent */ - } - SHA1Update(context, (uint8_t *)"\200", 1); - while ((context->count & 504) != 448) - SHA1Update(context, (uint8_t *)"\0", 1); - SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ -} - -void -SHA1Final(uint8_t digest[SHA1_DIGEST_LENGTH], SHA1_CTX *context) -{ - uint32_t i; - - SHA1Pad(context); - for (i = 0; i < SHA1_DIGEST_LENGTH_INTERNAL; i++) { - digest[i] = (uint8_t) - ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); - } - - /* Fill the rest of the hash with zeros. */ - memset(digest + SHA1_DIGEST_LENGTH_INTERNAL, 0, - SHA1_DIGEST_LENGTH - SHA1_DIGEST_LENGTH_INTERNAL); - - memset(context, 0, sizeof(*context)); -} diff --git a/src/util/sha1/sha1.h b/src/util/sha1/sha1.h index 3157a8acb1f..02e060f34ed 100644 --- a/src/util/sha1/sha1.h +++ b/src/util/sha1/sha1.h @@ -1,20 +1,19 @@ -/* $OpenBSD: sha1.h,v 1.24 2012/12/05 23:19:57 deraadt Exp $ */ - -/* - * SHA-1 in C - * By Steve Reid - * 100% Public Domain +/* Copyright 2025 Advanced Micro Devices, Inc. + * SPDX-License-Identifier: MIT */ #ifndef _SHA1_H #define _SHA1_H -#include -#include +/* This is not SHA1. This is BLAKE3 exposed as SHA1 functions due to + * transitional and historic reasons. + * + * TODO: Remove this and use _mesa_blake3_* functions everywhere. + * All remnants of SHA1 should be removed from Mesa except build_id. + */ + #include "util/mesa-blake3.h" -#define SHA1_BLOCK_LENGTH 64 -#define SHA1_DIGEST_LENGTH_INTERNAL 20 #define SHA1_DIGEST_LENGTH BLAKE3_KEY_LEN #define SHA1_DIGEST_STRING_LENGTH BLAKE3_HEX_LEN @@ -23,28 +22,26 @@ extern "C" { #endif typedef struct _SHA1_CTX { - uint32_t state[5]; - uint64_t count; - uint8_t buffer[SHA1_BLOCK_LENGTH]; + blake3_hasher hasher; } SHA1_CTX; -void SHA1Init(SHA1_CTX *); -void SHA1Update(SHA1_CTX *, const uint8_t *, size_t); -void SHA1Final(uint8_t [SHA1_DIGEST_LENGTH], SHA1_CTX *); +static inline void +SHA1Init(SHA1_CTX *context) +{ + _mesa_blake3_init(&context->hasher); +} -#define HTONDIGEST(x) do { \ - x[0] = htonl(x[0]); \ - x[1] = htonl(x[1]); \ - x[2] = htonl(x[2]); \ - x[3] = htonl(x[3]); \ - x[4] = htonl(x[4]); } while (0) +static inline void +SHA1Update(SHA1_CTX *context, const uint8_t *data, size_t len) +{ + _mesa_blake3_update(&context->hasher, data, len); +} -#define NTOHDIGEST(x) do { \ - x[0] = ntohl(x[0]); \ - x[1] = ntohl(x[1]); \ - x[2] = ntohl(x[2]); \ - x[3] = ntohl(x[3]); \ - x[4] = ntohl(x[4]); } while (0) +static inline void +SHA1Final(uint8_t digest[SHA1_DIGEST_LENGTH], SHA1_CTX *context) +{ + _mesa_blake3_final(&context->hasher, digest); +} #ifdef __cplusplus } diff --git a/src/util/tests/mesa-sha1_test.cpp b/src/util/tests/mesa-sha1_test.cpp index c918eac872c..313954c07da 100644 --- a/src/util/tests/mesa-sha1_test.cpp +++ b/src/util/tests/mesa-sha1_test.cpp @@ -33,9 +33,9 @@ struct Params { }; static const Params test_data[] = { - {"Mesa Rocks! 273", "7fb99737373d65a73f049cdabc01e73aa6bc60f3"}, - {"Mesa Rocks! 300", "b2180263e37d3bed6a4be0afe41b1a82ebbcf4c3"}, - {"Mesa Rocks! 583", "7fb9734108a62503e8a149c1051facd7fb112d05"}, + {"Mesa Rocks! 273", "dee075fc6fc8b4e55570d8038c629db8f29d6ec68cf962d2938e972c80342f0d"}, + {"Mesa Rocks! 300", "82661e51d2a48fbb9b5758bc3d64e7fd5da14a48cc5fdb44fdc903ddfbcc1f3c"}, + {"Mesa Rocks! 583", "42f5982e2ef3c5e388c50ee1070e7fd07e93bd44fa0dc3ea62e0892337c89ad8"}, }; class MesaSHA1TestFixture : public testing::TestWithParam {};