X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fsha1.h;h=05650e06d4a5bca0f541bf2b6b11485cf7bed293;hb=0a72460f9274f11689986f6b79ea42e512dd9213;hp=1f7c50f70b35112457eda3b8b6bed01897b3a2d6;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;p=wimlib

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 1f7c50f7..05650e06 100644
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -1,15 +1,25 @@
+/*
+ * sha1.h
+ *
+ * The author dedicates this file to the public domain.
+ * You can do whatever you want with this file.
+ */
+
 #ifndef _WIMLIB_SHA1_H
 #define _WIMLIB_SHA1_H
 
+#include <string.h>
+
 #include "wimlib/types.h"
 #include "wimlib/util.h"
 
-#include <string.h>
-
 #define SHA1_HASH_SIZE 20
 
 extern const u8 zero_hash[SHA1_HASH_SIZE];
 
+extern void
+sprint_hash(const u8 hash[SHA1_HASH_SIZE], tchar strbuf[SHA1_HASH_SIZE * 2 + 1]);
+
 static inline void
 copy_hash(u8 dest[SHA1_HASH_SIZE], const u8 src[SHA1_HASH_SIZE])
 {
@@ -22,65 +32,52 @@ 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])
-{
-	return memcmp(h1, h2, SHA1_HASH_SIZE) == 0;
-}
-
 static inline int
-hashes_cmp(const u8 h1[SHA1_HASH_SIZE],
-			     const u8 h2[SHA1_HASH_SIZE])
+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)
+static inline bool
+hashes_equal(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
 {
-	print_byte_field(hash, SHA1_HASH_SIZE, out);
+	return !hashes_cmp(h1, h2);
 }
 
 static inline bool
-is_zero_hash(const u8 hash[SHA1_HASH_SIZE])
+is_zero_hash(const u8 *hash)
 {
-	if (hash)
-		for (u8 i = 0; i < SHA1_HASH_SIZE / 4; i++)
-			if (((const u32*)hash)[i])
-				return false;
-	return true;
+	return (hash == zero_hash || hashes_equal(hash, zero_hash));
 }
 
 static inline void
 zero_out_hash(u8 hash[SHA1_HASH_SIZE])
 {
-	memset(hash, 0, SHA1_HASH_SIZE);
+	copy_hash(hash, zero_hash);
 }
 
-
 #ifdef WITH_LIBCRYPTO
 
 #include <openssl/sha.h>
+
+#define sha1_init     SHA1_Init
+#define sha1_update   SHA1_Update
+#define sha1_final    SHA1_Final
+
 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
 
 #else /* WITH_LIBCRYPTO */
 
 typedef struct {
+	u64 bytecount;
 	u32 state[5];
-	u32 count[2];
 	u8 buffer[64];
 } SHA_CTX;
 
-extern void
-sha1_buffer(const void *buffer, size_t len, u8 hash[SHA1_HASH_SIZE]);
-
 extern void
 sha1_init(SHA_CTX *ctx);
 
@@ -90,6 +87,9 @@ sha1_update(SHA_CTX *ctx, const void *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 */
 
 #endif /* _WIMLIB_SHA1_H */