Rename sha1_buffer() to simply sha1()

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index cd0bf01f9b3bcd4543cbe8a0ebbace8e831764ba..e8167faf02eb654b674dccb62611556e2f1e998b 100644 (file)
--- 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 0554a7a942e96897679cf65026734a101cc5cdc7..5c26e894aa9219d53c3da7957f50906b4672955c 100644 (file)
--- 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 4cd53032cbbca435f3a0c3b824acc61fe8303e16..19975e2e368921466aa9cd9eb9b648ad3f504850 100644 (file)
--- 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 85cfb5bc6ce968f85671672577bd0c3984a69e41..714e1034a9f2dc539d15160742141affd3f5122b 100644 (file)
--- 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 c04f447116fd30020f6ec09d5d345552582edff2..58f60dd7c829b2f24b3e976a252026cc7d118e12 100644 (file)
--- 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 c2cbba5fc5f53b79a8ddc370d6a4796199b17f36..5c0c21308838a04b7ab706196685becae13d7fcd 100644 (file)
--- 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;