X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsha1.h;h=3f500b23b43b01e82fbeb7a1732e7f30e9af1fcb;hp=c44b9f40f76ce46cd78d7c12eec3c86a17d28498;hb=ca8727cf22a445adc20eb1f8b7a12b8eededc32d;hpb=774e09230145ee2d8ba58868573213da84a348eb

diff --git a/src/sha1.h b/src/sha1.h
index c44b9f40..3f500b23 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -4,43 +4,56 @@
 #include "config.h"
 #include <stdio.h>
 #include <stddef.h>
-#include "string.h"
+#include <string.h>
 #include "util.h"
 
 #define SHA1_HASH_SIZE 20
 
-static inline void copy_hash(u8 dest[SHA1_HASH_SIZE],
-			     const u8 src[SHA1_HASH_SIZE])
+extern const u8 zero_hash[SHA1_HASH_SIZE];
+
+static inline void
+copy_hash(u8 dest[SHA1_HASH_SIZE], const u8 src[SHA1_HASH_SIZE])
 {
 	memcpy(dest, src, SHA1_HASH_SIZE);
 }
 
-static inline void random_hash(u8 hash[SHA1_HASH_SIZE])
+static inline void
+random_hash(u8 hash[SHA1_HASH_SIZE])
 {
 	randomize_byte_array(hash, SHA1_HASH_SIZE);
 }
 
-static inline bool hashes_equal(const u8 h1[SHA1_HASH_SIZE],
-				const u8 h2[SHA1_HASH_SIZE])
+static inline bool
+hashes_equal(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
 {
 	return memcmp(h1, h2, SHA1_HASH_SIZE) == 0;
 }
 
-/* Prints a hash code field. */
-static inline void print_hash(const u8 hash[SHA1_HASH_SIZE])
+static inline int
+hashes_cmp(const u8 h1[SHA1_HASH_SIZE],
+			     const u8 h2[SHA1_HASH_SIZE])
+{
+	return memcmp(h1, h2, SHA1_HASH_SIZE);
+}
+
+static inline void
+print_hash(const u8 hash[SHA1_HASH_SIZE], FILE *out)
 {
-	print_byte_field(hash, SHA1_HASH_SIZE);
+	print_byte_field(hash, SHA1_HASH_SIZE, out);
 }
 
-static inline bool is_zero_hash(const u8 hash[SHA1_HASH_SIZE])
+static inline bool
+is_zero_hash(const u8 hash[SHA1_HASH_SIZE])
 {
-	for (u8 i = 0; i < SHA1_HASH_SIZE / 4; i++)
-		if (((u32*)hash)[i])
-			return false;
+	if (hash)
+		for (u8 i = 0; i < SHA1_HASH_SIZE / 4; i++)
+			if (((const u32*)hash)[i])
+				return false;
 	return true;
 }
 
-static void zero_hash(u8 hash[SHA1_HASH_SIZE])
+static inline void
+zero_out_hash(u8 hash[SHA1_HASH_SIZE])
 {
 	memset(hash, 0, SHA1_HASH_SIZE);
 }
@@ -49,7 +62,11 @@ static void zero_hash(u8 hash[SHA1_HASH_SIZE])
 #ifdef WITH_LIBCRYPTO
 
 #include <openssl/sha.h>
-#define sha1_buffer   SHA1
+static inline void
+sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE])
+{
+	SHA1(buffer, len, hash);
+}
 #define sha1_init     SHA1_Init
 #define sha1_update   SHA1_Update
 #define sha1_final    SHA1_Final
@@ -57,20 +74,23 @@ static void zero_hash(u8 hash[SHA1_HASH_SIZE])
 #else /* WITH_LIBCRYPTO */
 
 typedef struct {
-    u32 state[5];
-    u32 count[2];
-    u8  buffer[64];
+	u32 state[5];
+	u32 count[2];
+	u8 buffer[64];
 } SHA_CTX;
 
-extern void sha1_buffer(const u8 buffer[], size_t len, u8 hash[SHA1_HASH_SIZE]);
-extern void sha1_init(SHA_CTX *ctx);
-extern void sha1_update(SHA_CTX *ctx, const u8 data[], size_t len);
-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]);
 
-#endif /* !WITH_LIBCRYPTO */
+extern void
+sha1_init(SHA_CTX *ctx);
 
-extern int sha1sum(const char *filename, u8 hash[SHA1_HASH_SIZE]);
+extern void
+sha1_update(SHA_CTX *ctx, const void *data, size_t len);
 
+extern void
+sha1_final(u8 hash[SHA1_HASH_SIZE], SHA_CTX *ctx);
 
+#endif /* !WITH_LIBCRYPTO */
 
 #endif /* _WIMLIB_SHA1_H */