* 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
{
sha1_update_intel((int*)&context->state, data, len / 64);
size_t j = (context->count[0] >> 3) & 63;
- if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+ if ((context->count[0] += len << 3) < (len << 3))
+ context->count[1]++;
context->count[1] += (len >> 29);
}
#include <stdlib.h>
}
#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;
-}