Re-visit SHA-1 code

[wimlib] / include / wimlib / sha1.h

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 1f7c50f70b35112457eda3b8b6bed01897b3a2d6..933444ac78bc25e6d792a28dd16147fa46b71228 100644 (file)
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -22,17 +22,16 @@ 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 int
+hashes_cmp(const u8 h1[SHA1_HASH_SIZE], const u8 h2[SHA1_HASH_SIZE])
 {
-       return memcmp(h1, h2, SHA1_HASH_SIZE) == 0;
+       return memcmp(h1, h2, SHA1_HASH_SIZE);
 }
 
-static inline int
-hashes_cmp(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);
+       return !hashes_cmp(h1, h2);
 }
 
 static inline void
@@ -42,45 +41,39 @@ print_hash(const u8 hash[SHA1_HASH_SIZE], FILE *out)
 }
 
 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 +83,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 */