From 35f2cdbb8e24a4a6569bdb1e187e1011814ce613 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sat, 18 Mar 2023 00:17:54 -0700 Subject: [PATCH] Rename sha1_buffer() to simply sha1() --- include/wimlib/sha1.h | 6 +++--- src/blob_table.c | 2 +- src/metadata_resource.c | 2 +- src/security.c | 4 ++-- src/sha1.c | 9 ++++----- src/write.c | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h index cd0bf01f..e8167faf 100644 --- a/include/wimlib/sha1.h +++ b/include/wimlib/sha1.h @@ -73,9 +73,9 @@ is_zero_hash(const u8 *hash) #define sha1_final SHA1_Final static inline void -sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE]) +sha1(const void *data, size_t len, u8 hash[SHA1_HASH_SIZE]) { - SHA1(buffer, len, hash); + SHA1(data, len, hash); } #else /* WITH_LIBCRYPTO */ @@ -96,7 +96,7 @@ extern void sha1_final(u8 hash[SHA1_HASH_SIZE], SHA_CTX *ctx); extern void -sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE]); +sha1(const void *data, size_t len, u8 hash[SHA1_HASH_SIZE]); #endif /* !WITH_LIBCRYPTO */ diff --git a/src/blob_table.c b/src/blob_table.c index 0554a7a9..5c26e894 100644 --- a/src/blob_table.c +++ b/src/blob_table.c @@ -1236,7 +1236,7 @@ new_blob_from_data_buffer(const void *buffer, size_t size, struct blob_descriptor *blob; void *buffer_copy; - sha1_buffer(buffer, size, hash); + sha1(buffer, size, hash); blob = lookup_blob(blob_table, hash); if (blob) diff --git a/src/metadata_resource.c b/src/metadata_resource.c index 4cd53032..19975e2e 100644 --- a/src/metadata_resource.c +++ b/src/metadata_resource.c @@ -85,7 +85,7 @@ read_metadata_resource(struct wim_image_metadata *imd) return ret; /* Checksum the metadata resource. */ - sha1_buffer(buf, metadata_blob->size, hash); + sha1(buf, metadata_blob->size, hash); if (!hashes_equal(metadata_blob->hash, hash)) { ERROR("Metadata resource is corrupted " "(invalid SHA-1 message digest)!"); diff --git a/src/security.c b/src/security.c index 85cfb5bc..714e1034 100644 --- a/src/security.c +++ b/src/security.c @@ -307,7 +307,7 @@ sd_set_add_sd(struct wim_sd_set *sd_set, const char *descriptor, size_t size) struct wim_security_data *sd; bool bret; - sha1_buffer(descriptor, size, hash); + sha1(descriptor, size, hash); security_id = lookup_sd(sd_set, hash); if (security_id >= 0) /* Identical descriptor already exists */ @@ -378,7 +378,7 @@ init_sd_set(struct wim_sd_set *sd_set, struct wim_security_data *sd) ret = WIMLIB_ERR_NOMEM; goto out_destroy_sd_set; } - sha1_buffer(sd->descriptors[i], sd->sizes[i], new->hash); + sha1(sd->descriptors[i], sd->sizes[i], new->hash); new->security_id = i; if (!insert_sd_node(sd_set, new)) FREE(new); /* Ignore duplicate security descriptor */ diff --git a/src/sha1.c b/src/sha1.c index c04f4471..58f60dd7 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -225,16 +225,15 @@ sha1_final(u8 md[20], SHA_CTX *ctx) store_be32_unaligned(cpu_to_be32(ctx->state[i]), &md[i * 4]); } -/* Calculate the SHA-1 message digest of the specified buffer. - * @len is the buffer length in bytes. */ +/* Calculate the SHA-1 message digest of the given data. */ void -sha1_buffer(const void *buffer, size_t len, u8 md[20]) +sha1(const void *data, size_t len, u8 hash[SHA1_HASH_SIZE]) { SHA_CTX ctx; sha1_init(&ctx); - sha1_update(&ctx, buffer, len); - sha1_final(md, &ctx); + sha1_update(&ctx, data, len); + sha1_final(hash, &ctx); } #endif /* !WITH_LIBCRYPTO */ diff --git a/src/write.c b/src/write.c index c2cbba5f..5c0c2130 100644 --- a/src/write.c +++ b/src/write.c @@ -1737,7 +1737,7 @@ write_wim_resource_from_buffer(const void *buf, } blob_set_is_located_in_attached_buffer(&blob, (void *)buf, buf_size); - sha1_buffer(buf, buf_size, blob.hash); + sha1(buf, buf_size, blob.hash); blob.unhashed = 0; blob.is_metadata = is_metadata; -- 2.43.0