From 8ea4c3659a63fa4c5a1b85e2e6650ea2c3a4b91b Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 16 May 2026 12:11:02 +0200 Subject: Add "reserved" parameter to a few more functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- librecrypt_settings_prefix.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'librecrypt_settings_prefix.c') diff --git a/librecrypt_settings_prefix.c b/librecrypt_settings_prefix.c index 0d78c23..df1c56a 100644 --- a/librecrypt_settings_prefix.c +++ b/librecrypt_settings_prefix.c @@ -4,13 +4,15 @@ size_t -librecrypt_settings_prefix(const char *hash, size_t *hashsize_out) +librecrypt_settings_prefix(const char *hash, size_t *hashsize_out, void *reserved) { size_t i, len, ret = 0u; size_t last_offset = 0u; const struct algorithm *algo; uintmax_t hashsize; + (void) reserved; + /* Find last algorithm, and beginning of result */ for (i = 0u; hash[i]; i++) { if (hash[i] == LIBRECRYPT_HASH_COMPOSITION_DELIMITER) @@ -60,21 +62,21 @@ out: #define CHECK_NULL(PREFIX, SUFFIX)\ do {\ - EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, NULL) == sizeof(PREFIX) - 1u);\ - EXPECT(librecrypt_settings_prefix(PREFIX, NULL) == sizeof(PREFIX) - 1u); \ + EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, NULL, NULL) == sizeof(PREFIX) - 1u);\ + EXPECT(librecrypt_settings_prefix(PREFIX, NULL, NULL) == sizeof(PREFIX) - 1u); \ } while (0) #define CHECK_ZERO(PREFIX, SUFFIX)\ do {\ size_t hashsize = 99999u;\ - EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, &hashsize) == sizeof(PREFIX) - 1u);\ + EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, &hashsize, NULL) == sizeof(PREFIX) - 1u);\ EXPECT(hashsize == 0u);\ } while (0) #define CHECK_HASH(PREFIX, SUFFIX, HASH)\ do {\ size_t hashsize = 99999u;\ - EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, &hashsize) == sizeof(PREFIX) - 1u);\ + EXPECT(librecrypt_settings_prefix(PREFIX SUFFIX, &hashsize, NULL) == sizeof(PREFIX) - 1u);\ EXPECT(hashsize == HASH##u);\ } while (0) @@ -167,8 +169,8 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) assert(hash); memcpy(hash, data, size); hash[size] = '\0'; - r = librecrypt_settings_prefix(hash, &(size_t){0u}); - EXPECT(librecrypt_settings_prefix(hash, NULL) == r); + r = librecrypt_settings_prefix(hash, &(size_t){0u}, NULL); + EXPECT(librecrypt_settings_prefix(hash, NULL, NULL) == r); free(hash); return 0; } -- cgit v1.2.3-70-g09d2