inode.c: cleanup

[wimlib] / include / wimlib / sha1.h

diff --git a/include/wimlib/sha1.h b/include/wimlib/sha1.h
index 4a19a93c71d6f98e592049fd707145a9a084cff7..2a6d6a32cca8f437661e154ca91d11cfd045af7f 100644 (file)
--- a/include/wimlib/sha1.h
+++ b/include/wimlib/sha1.h
@@ -1,3 +1,10 @@
+/*
+ * 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
 
@@ -55,26 +62,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 +90,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 */