X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fsha1.h;h=933444ac78bc25e6d792a28dd16147fa46b71228;hp=4a19a93c71d6f98e592049fd707145a9a084cff7;hb=19ce03addb8071555d951a965fa0bd7e3ae7224b;hpb=4a0639235f5f6e28ce9c9cbd21edc71199f85d09

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 4a19a93c..933444ac 100644
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -55,26 +55,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);
 
@@ -84,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 */