sha256.h: correct definition on SHA224_DIGEST_SIZE

* lib/sha256.h (SHA224_DIGEST_SIZE): Define to 28, not 24.
Reported by Paulie Pena IV <paulie4@gmail.com>.
Define as 224 / 8, rather than as a literal.
(SHA256_DIGEST_SIZE): Define as 256/8 rather than equivalent literal.
* lib/sha512.h (SHA384_DIGEST_SIZE): Likewise, define as equiv: 384/8.
(SHA512_DIGEST_SIZE): Likewise, define as equivalent quotient: 512/8.

diff --git a/ChangeLog b/ChangeLog
index 792a1ef932465a1955b5ceea681f5aecb10772a1..e3d13f1841d78b3a6f7fdc39a74e0863f6195fce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-31  Jim Meyering  <meyering@redhat.com>
+
+       sha256.h: correct definition of SHA224_DIGEST_SIZE
+       * lib/sha256.h (SHA224_DIGEST_SIZE): Define to 28, not 24.
+       Reported by Paulie Pena IV <paulie4@gmail.com>.
+       Define as 224 / 8, rather than as a literal.
+       (SHA256_DIGEST_SIZE): Define as 256/8 rather than equivalent literal.
+       * lib/sha512.h (SHA384_DIGEST_SIZE): Likewise, define as equiv: 384/8.
+       (SHA512_DIGEST_SIZE): Likewise, define as equivalent quotient: 512/8.
+
 2008-07-31  Bruno Haible  <bruno@clisp.org>
 
        * lib/regex_internal.h (BITSET_WORD_BITS): Make first conditional work

diff --git a/lib/sha256.h b/lib/sha256.h
index 3aa1ce97bd5802b643e6c2136205a6d8d00d189a..a63b2015d80c85069cbd46a1b78ff1a6940659b7 100644 (file)
--- a/lib/sha256.h
+++ b/lib/sha256.h
@@ -31,8 +31,8 @@ struct sha256_ctx
   uint32_t buffer[32];
 };
 
-enum { SHA224_DIGEST_SIZE = 24 };
-enum { SHA256_DIGEST_SIZE = 32 };
+enum { SHA224_DIGEST_SIZE = 224 / 8 };
+enum { SHA256_DIGEST_SIZE = 256 / 8 };
 
 /* Initialize structure containing state of computation. */
 extern void sha256_init_ctx (struct sha256_ctx *ctx);

diff --git a/lib/sha512.h b/lib/sha512.h
index 84fe5591f04deea4113c760c749b8fb746c59786..ed12d545c2119ad05d134f2eb7db519620ae85d9 100644 (file)
--- a/lib/sha512.h
+++ b/lib/sha512.h
@@ -32,8 +32,8 @@ struct sha512_ctx
   u64 buffer[32];
 };
 
-enum { SHA384_DIGEST_SIZE = 48 };
-enum { SHA512_DIGEST_SIZE = 64 };
+enum { SHA384_DIGEST_SIZE = 384 / 8 };
+enum { SHA512_DIGEST_SIZE = 512 / 8 };
 
 /* Initialize structure containing state of computation. */
 extern void sha512_init_ctx (struct sha512_ctx *ctx);