sha256: do not artificially restrict buffer length to be < 2^32

* lib/sha256.h (struct sha256_ctx) [buflen]: Change type from
uint32_t to size_t.
* lib/sha256.c (sha256_conclude_ctx): Change type of a local
to match.

diff --git a/ChangeLog b/ChangeLog
index 9aea4e6b33c29e9c53a92ff6f63a17f2388cf653..a72b682a086198d2dc8fb38f9099259f6b9ca964 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-05-26  Jim Meyering  <meyering@redhat.com>
 
+       sha256: do not artificially restrict buffer length to be < 2^32
+       * lib/sha256.h (struct sha256_ctx) [buflen]: Change type from
+       uint32_t to size_t.
+       * lib/sha256.c (sha256_conclude_ctx): Change type of a local
+       to match.
+
        avoid unaligned access errors, e.g., on sparc
        * lib/sha512.c (sha512_conclude_ctx): Use set_uint64 rather than
        direct access through a possibly-unaligned uint64* pointer.

diff --git a/lib/sha256.c b/lib/sha256.c
index a1362caec8c20d53ab08f81765f27e3074ab68e0..0ad9444351fbff98706303bdb41a48e99a441732 100644 (file)
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -126,7 +126,7 @@ static void
 sha256_conclude_ctx (struct sha256_ctx *ctx)
 {
   /* Take yet unprocessed bytes into account.  */
-  uint32_t bytes = ctx->buflen;
+  size_t bytes = ctx->buflen;
   size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4;
 
   /* Now count remaining bytes.  */

diff --git a/lib/sha256.h b/lib/sha256.h
index c35d6c1fe335f3587c0a53f08843b04eefeb2edb..3aa1ce97bd5802b643e6c2136205a6d8d00d189a 100644 (file)
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -27,7 +27,7 @@ struct sha256_ctx
   uint32_t state[8];
 
   uint32_t total[2];
-  uint32_t buflen;
+  size_t buflen;
   uint32_t buffer[32];
 };