Finally fixed most of the problems with the new resource code.

[wimlib] / src / sha1.h

diff --git a/src/sha1.h b/src/sha1.h
index db524e6de60d5a579804ace47682423e73dc9d60..5c1436170f8b2b79b6beb3098dd44bf36d737002 100644 (file)
--- a/src/sha1.h
+++ b/src/sha1.h
@@ -32,16 +32,32 @@ 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 void *buffer, size_t len, void *md)
-{
-       SHA1(buffer, len, md);
-}
-#else
-extern void sha1_buffer(const void *buffer, size_t len, void *md);
-#endif
+#define sha1_buffer   SHA1
+#define sha1_init     SHA1_Init
+#define sha1_update   SHA1_Update
+#define sha1_final    SHA1_Final
+
+#else /* WITH_LIBCRYPTO */
+
+typedef struct {
+    u32 state[5];
+    u32 count[2];
+    u8  buffer[64];
+} SHA_CTX;
+
+extern void sha1_buffer(const u8 buffer[], size_t len, u8 hash[SHA1_HASH_SIZE]);
+extern void sha1_init(SHA_CTX *ctx);
+extern void sha1_update(SHA_CTX *ctx, const u8 data[], size_t len);
+extern void sha1_final(u8 hash[SHA1_HASH_SIZE], SHA_CTX *ctx);
+
+#endif /* !WITH_LIBCRYPTO */
+
+extern int sha1sum(const char *filename, u8 hash[SHA1_HASH_SIZE]);
+
+
 
 #endif /* _WIMLIB_SHA1_H */