X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsha1.c;h=f989005a2ffcb7b17c7a294cefc4e30d46ad3fca;hp=5af92568a4be3b20eb77cbfbc3694a95aaf5383b;hb=bbce7c1d2333071b7056b65ba75074c639a027eb;hpb=1530b6dab02a9e1e5faf81529ab502aee68d8cd2

diff --git a/src/sha1.c b/src/sha1.c
index 5af92568..f989005a 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -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
@@ -45,7 +47,8 @@ const u8 zero_hash[SHA1_HASH_SIZE] = {
 #ifndef WITH_LIBCRYPTO
 
 /*  Initialize new context */
-void sha1_init(SHA_CTX* context)
+void
+sha1_init(SHA_CTX* context)
 {
 	/* SHA1 initialization constants */
 	context->state[0] = 0x67452301;
@@ -57,17 +60,21 @@ void sha1_init(SHA_CTX* context)
 }
 
 #ifdef ENABLE_SSSE3_SHA1
-extern void sha1_update_intel(int *hash, const char* input, size_t num_blocks);
+extern void
+sha1_update_intel(int *hash, const void* input, size_t num_blocks);
 
-void sha1_update(SHA_CTX *context, const u8 data[], size_t len)
+void
+sha1_update(SHA_CTX *context, const void *data, size_t len)
 {
 	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>
-void ssse3_not_found()
+void
+ssse3_not_found()
 {
 	fprintf(stderr,
 "Cannot calculate SHA1 message digest: CPU does not support SSSE3\n"
@@ -99,7 +106,8 @@ void ssse3_not_found()
 #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
-static void sha1_transform(u32 state[5], const u8 buffer[64])
+static void
+sha1_transform(u32 state[5], const u8 buffer[64])
 {
 	u32 a, b, c, d, e;
 	typedef union {
@@ -149,7 +157,8 @@ static void sha1_transform(u32 state[5], const u8 buffer[64])
 	state[4] += e;
 }
 
-void sha1_update(SHA_CTX* context, const u8 data[], const size_t len)
+void
+sha1_update(SHA_CTX* context, const void *data, const size_t len)
 {
 	size_t i, j;
 
@@ -167,13 +176,14 @@ void sha1_update(SHA_CTX* context, const u8 data[], const size_t len)
 	} else  {
 		i = 0;
 	}
-	memcpy(&context->buffer[j], &data[i], len - i);
+	memcpy(&context->buffer[j], data + i, len - i);
 }
 
 #endif /* !ENABLE_SSSE3_SHA1 */
 
 /* Add padding and return the message digest. */
-void sha1_final(u8 md[SHA1_HASH_SIZE], SHA_CTX* context)
+void
+sha1_final(u8 md[SHA1_HASH_SIZE], SHA_CTX* context)
 {
 	u32 i;
 	u8  finalcount[8];
@@ -192,7 +202,8 @@ void sha1_final(u8 md[SHA1_HASH_SIZE], SHA_CTX* context)
 	}
 }
 
-void sha1_buffer(const u8 buffer[], size_t len, u8 md[SHA1_HASH_SIZE])
+void
+sha1_buffer(const void *buffer, size_t len, u8 md[SHA1_HASH_SIZE])
 {
 	SHA_CTX ctx;
 	sha1_init(&ctx);
@@ -201,45 +212,3 @@ void sha1_buffer(const u8 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 char *filename, u8 md[SHA1_HASH_SIZE])
-{
-	FILE *fp;
-	int ret;
-
-	fp = fopen(filename, "rb");
-	if (!fp) {
-		ERROR_WITH_ERRNO("Cannot open the file `%s' for reading",
-				 filename);
-		return WIMLIB_ERR_OPEN;
-	}
-	ret = sha1_stream(fp, md);
-	if (ret != 0) {
-		ERROR_WITH_ERRNO("Error calculating SHA1 message digest of "
-				 "`%s'", filename);
-	}
-	fclose(fp);
-	return ret;
-}