X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsha1.h;h=f668116bc37944ca553fa06a0991f121bf16805d;hb=150fd376ac944f0fdc22c0df7beaa8dbd076061c;hp=7ec8456d20cee8cf633c51ef04617bfa1024cdf0;hpb=751a849fe04a9230a661e38429ff4d971f74bdbf;p=wimlib

diff --git a/src/sha1.h b/src/sha1.h
index 7ec8456d..f668116b 100644
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stddef.h>
 #include "string.h"
+#include "util.h"
 
 #define SHA1_HASH_SIZE 20
 
@@ -15,24 +16,39 @@ static inline bool is_empty_file_hash(const u8 hash[SHA1_HASH_SIZE])
 	return memcmp(hash, empty_file_sha1sum, SHA1_HASH_SIZE) == 0;
 }
 
-/* Compute SHA1 message digest for bytes read from STREAM.  The
-   resulting message digest number will be written into the 20 bytes
-   beginning at RESBLOCK.  */
-extern int sha1_stream(FILE * stream, void *resblock);
+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])
+{
+	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;
+}
+
+/* Prints a hash code field. */
+static inline void print_hash(const u8 hash[])
+{
+	print_byte_field(hash, SHA1_HASH_SIZE);
+}
+
+extern int sha1sum(const char *filename, void *md);
 
 #ifdef WITH_LIBCRYPTO
 #include <openssl/sha.h>
-static inline void *sha1_buffer(const char *buffer, size_t len, void *resblock)
+static inline void sha1_buffer(const void *buffer, size_t len, void *md)
 {
-	return SHA1(buffer, len, resblock);
+	SHA1(buffer, len, md);
 }
 #else
-/* Compute SHA1 message digest for LEN bytes beginning at BUFFER.  The
-   result is always in little endian byte order, so that a byte-wise
-   output yields to the wanted ASCII representation of the message
-   digest.  */
-extern void *sha1_buffer(const char *buffer, size_t len, void *resblock);
+extern void sha1_buffer(const void *buffer, size_t len, void *md);
 #endif
 
-
 #endif /* _WIMLIB_SHA1_H */