Add and use SHA1_HASH_STRING_LEN constant

[wimlib] / include / wimlib / sha1.h

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index cd0bf01f9b3bcd4543cbe8a0ebbace8e831764ba..e1def3d9f2cb274c9bd282fe47bba9fdfc55447e 100644 (file)
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -37,8 +37,9 @@
 
 extern const u8 zero_hash[SHA1_HASH_SIZE];
 
+#define SHA1_HASH_STRING_LEN   (2 * SHA1_HASH_SIZE + 1)
 extern void
-sprint_hash(const u8 hash[SHA1_HASH_SIZE], tchar strbuf[SHA1_HASH_SIZE * 2 + 1]);
+sprint_hash(const u8 hash[SHA1_HASH_SIZE], tchar strbuf[SHA1_HASH_STRING_LEN]);
 
 static inline void
 copy_hash(u8 dest[SHA1_HASH_SIZE], const u8 src[SHA1_HASH_SIZE])
@@ -73,9 +74,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 +97,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 */