X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fcrypto%2Fsha256%2Fsha256.c;h=d42b47b0a587c3df97b0e67f785800715cc12da8;hp=aed181e4978f21afd3f3a67379063319436bae50;hb=e05d1ff2e0b13516776c0a895c8aa47a8f838744;hpb=0d73f8ebb66d2613ecc0b87c6e608de59be110f6

diff --git a/ccan/crypto/sha256/sha256.c b/ccan/crypto/sha256/sha256.c
index aed181e4..d42b47b0 100644
--- a/ccan/crypto/sha256/sha256.c
+++ b/ccan/crypto/sha256/sha256.c
@@ -8,6 +8,7 @@
  */
 #include <ccan/crypto/sha256/sha256.h>
 #include <ccan/endian/endian.h>
+#include <ccan/compiler/compiler.h>
 #include <stdbool.h>
 #include <assert.h>
 #include <string.h>
@@ -17,16 +18,16 @@ static void invalidate_sha256(struct sha256_ctx *ctx)
 #ifdef CCAN_CRYPTO_SHA256_USE_OPENSSL
 	ctx->c.md_len = 0;
 #else
-	ctx->bytes = -1ULL;
+	ctx->bytes = (size_t)-1;
 #endif
 }
 
-static void check_sha256(struct sha256_ctx *ctx)
+static void check_sha256(struct sha256_ctx *ctx UNUSED)
 {
 #ifdef CCAN_CRYPTO_SHA256_USE_OPENSSL
 	assert(ctx->c.md_len != 0);
 #else
-	assert(ctx->bytes != -1ULL);
+	assert(ctx->bytes != (size_t)-1);
 #endif
 }
 
@@ -36,15 +37,10 @@ void sha256_init(struct sha256_ctx *ctx)
 	SHA256_Init(&ctx->c);
 }
 
-void sha256_update_arr(struct sha256_ctx *ctx, const void *p,
-		       size_t num, size_t size)
+void sha256_update(struct sha256_ctx *ctx, const void *p, size_t size)
 {
-	size_t total = num * size;
-
-	/* Don't overflow. */
-	assert(size == 0 || total / size == num);
 	check_sha256(ctx);
-	SHA256_Update(&ctx->c, p, total);
+	SHA256_Update(&ctx->c, p, size);
 }
 
 void sha256_done(struct sha256_ctx *ctx, struct sha256 *res)
@@ -171,7 +167,7 @@ static void Transform(uint32_t *s, const uint32_t *chunk)
 	s[7] += h;
 }
 
-static bool alignment_ok(const void *p, size_t n)
+static bool alignment_ok(const void *p UNUSED, size_t n UNUSED)
 {
 #if HAVE_UNALIGNED_ACCESS
 	return true;
@@ -186,7 +182,7 @@ static void add(struct sha256_ctx *ctx, const void *p, size_t len)
 	size_t bufsize = ctx->bytes % 64;
 
 	if (bufsize + len >= 64) {
-		// Fill the buffer, and process it.
+		/* Fill the buffer, and process it. */
 		memcpy(ctx->buf.u8 + bufsize, data, 64 - bufsize);
 		ctx->bytes += 64 - bufsize;
 		data += 64 - bufsize;
@@ -196,7 +192,7 @@ static void add(struct sha256_ctx *ctx, const void *p, size_t len)
 	}
 
 	while (len >= 64) {
-		// Process full chunks directly from the source.
+		/* Process full chunks directly from the source. */
 		if (alignment_ok(data, sizeof(uint32_t)))
 			Transform(ctx->s, (const uint32_t *)data);
 		else {
@@ -209,7 +205,7 @@ static void add(struct sha256_ctx *ctx, const void *p, size_t len)
 	}
 	    
 	if (len) {
-		// Fill the buffer with what remains.
+		/* Fill the buffer with what remains. */
 		memcpy(ctx->buf.u8 + bufsize, data, len);
 		ctx->bytes += len;
 	}
@@ -221,15 +217,10 @@ void sha256_init(struct sha256_ctx *ctx)
 	*ctx = init;
 }
 
-void sha256_update_arr(struct sha256_ctx *ctx, const void *p,
-		       size_t num, size_t size)
+void sha256_update(struct sha256_ctx *ctx, const void *p, size_t size)
 {
-	size_t total = num * size;
-
-	/* Don't overflow. */
-	assert(size == 0 || total / size == num);
 	check_sha256(ctx);
-	add(ctx, p, total);
+	add(ctx, p, size);
 }
 
 void sha256_done(struct sha256_ctx *ctx, struct sha256 *res)
@@ -238,9 +229,9 @@ void sha256_done(struct sha256_ctx *ctx, struct sha256 *res)
 	uint64_t sizedesc;
 	size_t i;
 
-	sizedesc = cpu_to_be64(ctx->bytes << 3);
+	sizedesc = cpu_to_be64((uint64_t)ctx->bytes << 3);
 	/* Add '1' bit to terminate, then all 0 bits, up to next block - 8. */
-	add(ctx, pad, 1 + ((119 - (ctx->bytes % 64)) % 64));
+	add(ctx, pad, 1 + ((128 - 8 - (ctx->bytes % 64) - 1) % 64));
 	/* Add number of bits of data (big endian) */
 	add(ctx, &sizedesc, 8);
 	for (i = 0; i < sizeof(ctx->s) / sizeof(ctx->s[0]); i++)
@@ -249,69 +240,69 @@ void sha256_done(struct sha256_ctx *ctx, struct sha256 *res)
 }
 #endif
 
-void sha256_arr(struct sha256 *sha, const void *p, size_t num, size_t size)
+void sha256(struct sha256 *sha, const void *p, size_t size)
 {
 	struct sha256_ctx ctx;
 
 	sha256_init(&ctx);
-	sha256_update_arr(&ctx, p, num, size);
+	sha256_update(&ctx, p, size);
 	sha256_done(&ctx, sha);
 }
 	
 void sha256_u8(struct sha256_ctx *ctx, uint8_t v)
 {
-	sha256_update_arr(ctx, &v, sizeof(v), 1);
+	sha256_update(ctx, &v, sizeof(v));
 }
 
 void sha256_u16(struct sha256_ctx *ctx, uint16_t v)
 {
-	sha256_update_arr(ctx, &v, sizeof(v), 1);
+	sha256_update(ctx, &v, sizeof(v));
 }
 
 void sha256_u32(struct sha256_ctx *ctx, uint32_t v)
 {
-	sha256_update_arr(ctx, &v, sizeof(v), 1);
+	sha256_update(ctx, &v, sizeof(v));
 }
 
 void sha256_u64(struct sha256_ctx *ctx, uint64_t v)
 {
-	sha256_update_arr(ctx, &v, sizeof(v), 1);
+	sha256_update(ctx, &v, sizeof(v));
 }
 
 /* Add as little-endian */
 void sha256_le16(struct sha256_ctx *ctx, uint16_t v)
 {
 	leint16_t lev = cpu_to_le16(v);
-	sha256_update_arr(ctx, &lev, sizeof(lev), 1);
+	sha256_update(ctx, &lev, sizeof(lev));
 }
 	
 void sha256_le32(struct sha256_ctx *ctx, uint32_t v)
 {
 	leint32_t lev = cpu_to_le32(v);
-	sha256_update_arr(ctx, &lev, sizeof(lev), 1);
+	sha256_update(ctx, &lev, sizeof(lev));
 }
 	
 void sha256_le64(struct sha256_ctx *ctx, uint64_t v)
 {
 	leint64_t lev = cpu_to_le64(v);
-	sha256_update_arr(ctx, &lev, sizeof(lev), 1);
+	sha256_update(ctx, &lev, sizeof(lev));
 }
 
 /* Add as big-endian */
 void sha256_be16(struct sha256_ctx *ctx, uint16_t v)
 {
 	beint16_t bev = cpu_to_be16(v);
-	sha256_update_arr(ctx, &bev, sizeof(bev), 1);
+	sha256_update(ctx, &bev, sizeof(bev));
 }
 	
 void sha256_be32(struct sha256_ctx *ctx, uint32_t v)
 {
 	beint32_t bev = cpu_to_be32(v);
-	sha256_update_arr(ctx, &bev, sizeof(bev), 1);
+	sha256_update(ctx, &bev, sizeof(bev));
 }
 	
 void sha256_be64(struct sha256_ctx *ctx, uint64_t v)
 {
 	beint64_t bev = cpu_to_be64(v);
-	sha256_update_arr(ctx, &bev, sizeof(bev), 1);
+	sha256_update(ctx, &bev, sizeof(bev));
 }