Refactor headers

[wimlib] / src / sha1.c

diff --git a/src/sha1.c b/src/sha1.c
index 6fb18c4d10983462a002cd752dc42c2a74ae27b8..f989005a2ffcb7b17c7a294cefc4e30d46ad3fca 100644 (file)
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -23,10 +23,12 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "util.h"
-#include "wimlib.h"
-#include "sha1.h"
-#include "endianness.h"
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib/sha1.h"
+
 #include <string.h>
 
 /* The SHA1 support in wimlib can use an external libcrypto (part of openssl) or
@@ -210,47 +212,3 @@ sha1_buffer(const void *buffer, size_t len, u8 md[SHA1_HASH_SIZE])
 }
 
 #endif /* !WITH_LIBCRYPTO */
-
-static int
-sha1_stream(FILE *fp, u8 md[SHA1_HASH_SIZE])
-{
-       char buf[BUFFER_SIZE];
-       size_t bytes_read;
-       SHA_CTX ctx;
-       sha1_init(&ctx);
-       while (1) {
-               bytes_read = fread(buf, 1, sizeof(buf), fp);
-               sha1_update(&ctx, buf, bytes_read);
-               if (bytes_read < sizeof(buf)) {
-                       if (ferror(fp))
-                               return WIMLIB_ERR_READ;
-                       break;
-               }
-       }
-       sha1_final(md, &ctx);
-       return 0;
-
-}
-
-/* Calculates the SHA1 message digest of a file.  @md must point to a buffer of
- * length 20 bytes into which the message digest is written. */
-int
-sha1sum(const tchar *filename, u8 md[SHA1_HASH_SIZE])
-{
-       FILE *fp;
-       int ret;
-
-       fp = tfopen(filename, T("rb"));
-       if (!fp) {
-               ERROR_WITH_ERRNO("Cannot open the file `%"TS"' for reading",
-                                filename);
-               return WIMLIB_ERR_OPEN;
-       }
-       ret = sha1_stream(fp, md);
-       if (ret != 0) {
-               ERROR_WITH_ERRNO("Error calculating SHA1 message digest of "
-                                "`%"TS"'", filename);
-       }
-       fclose(fp);
-       return ret;
-}