sha256/512: fix signedness errors

Fix signedness errors as part of -Werror cleanup.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/com32/libutil/sha256crypt.c b/com32/libutil/sha256crypt.c
index 2e94535..adc7b09 100644 (file)
--- a/com32/libutil/sha256crypt.c
+++ b/com32/libutil/sha256crypt.c
@@ -276,13 +276,13 @@ static const char sha256_salt_prefix[] = "$5$";
 static const char sha256_rounds_prefix[] = "rounds=";
 
 /* Maximum salt string length.  */
-#define SALT_LEN_MAX 16
+#define SALT_LEN_MAX 16U
 /* Default number of rounds if not explicitly specified.  */
-#define ROUNDS_DEFAULT 5000
+#define ROUNDS_DEFAULT 5000UL
 /* Minimum number of rounds.  */
-#define ROUNDS_MIN 1000
+#define ROUNDS_MIN 1000UL
 /* Maximum number of rounds.  */
-#define ROUNDS_MAX 999999999
+#define ROUNDS_MAX 999999999UL
 
 /* Table with characters for base64 transformation.  */
 static const char b64t[64] =
@@ -379,7 +379,7 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer,
 
     /* Take the binary representation of the length of the key and for every
        1 add the alternate sum, for every 0 the key.  */
-    for (cnt = key_len; cnt > 0; cnt >>= 1)
+    for (cnt = key_len; cnt; cnt >>= 1)
        if ((cnt & 1) != 0)
            sha256_process_bytes(alt_result, 32, &ctx);
        else
@@ -408,7 +408,7 @@ static char *sha256_crypt_r(const char *key, const char *salt, char *buffer,
     sha256_init_ctx(&alt_ctx);
 
     /* For every character in the password add the entire password.  */
-    for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
+    for (cnt = 0; cnt < (size_t)16 + alt_result[0]; ++cnt)
        sha256_process_bytes(salt, salt_len, &alt_ctx);
 
     /* Finish the digest.  */

diff --git a/com32/libutil/sha512crypt.c b/com32/libutil/sha512crypt.c
index df839af..9db9c0c 100644 (file)
--- a/com32/libutil/sha512crypt.c
+++ b/com32/libutil/sha512crypt.c
@@ -311,13 +311,13 @@ static const char sha512_salt_prefix[] = "$6$";
 static const char sha512_rounds_prefix[] = "rounds=";
 
 /* Maximum salt string length.  */
-#define SALT_LEN_MAX 16
+#define SALT_LEN_MAX 16U
 /* Default number of rounds if not explicitly specified.  */
-#define ROUNDS_DEFAULT 5000
+#define ROUNDS_DEFAULT 5000UL
 /* Minimum number of rounds.  */
-#define ROUNDS_MIN 1000
+#define ROUNDS_MIN 1000UL
 /* Maximum number of rounds.  */
-#define ROUNDS_MAX 999999999
+#define ROUNDS_MAX 999999999UL
 
 /* Table with characters for base64 transformation.  */
 static const char b64t[64] =
@@ -443,7 +443,7 @@ static char *sha512_crypt_r(const char *key, const char *salt, char *buffer,
     sha512_init_ctx(&alt_ctx);
 
     /* For every character in the password add the entire password.  */
-    for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
+    for (cnt = 0; cnt < (size_t)16 + alt_result[0]; ++cnt)
        sha512_process_bytes(salt, salt_len, &alt_ctx);
 
     /* Finish the digest.  */