X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fsha1.h;h=05650e06d4a5bca0f541bf2b6b11485cf7bed293;hp=76e6d5e1d7082136e7614e7f6b5e5ed678868f6c;hb=2fc33f535a398ea85964c0e483c5692821d775f3;hpb=30ba1eb06caca0b20a47d8dd75a117c82d730da7

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 76e6d5e1..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])
 {
@@ -34,18 +44,10 @@ hashes_equal(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
 	return !hashes_cmp(h1, h2);
 }
 
-static inline void
-print_hash(const u8 hash[SHA1_HASH_SIZE], FILE *out)
-{
-	print_byte_field(hash, SHA1_HASH_SIZE, out);
-}
-
 static inline bool
 is_zero_hash(const u8 *hash)
 {
-	if (!hash)
-		return true;
-	return hashes_equal(hash, zero_hash);
+	return (hash == zero_hash || hashes_equal(hash, zero_hash));
 }
 
 static inline void
@@ -57,26 +59,25 @@ zero_out_hash(u8 hash[SHA1_HASH_SIZE])
 #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);
 
@@ -86,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 */