From 34b3a642e9e3e884a9fcd7d6dca760b728994baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 3 Sep 2016 20:10:28 +0200
Subject: [PATCH] Fix some warnigns for nettle-hash and nettle-pbkdf.

---
 ChangeLog             |  6 ++++--
 tools/nettle-hash.c   |  2 +-
 tools/nettle-pbkdf2.c | 15 ++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a52f14d5..6f846c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,9 +15,10 @@
 	keys. Overlooked in 2016-08-16 change.
 
 	* testsuite/yarrow-test.c (test_main): Fix pointer
-	signednesss warning.
+	signednesss warnings.
 	* testsuite/sexp-format-test.c (test_main): Likewise.
 	* testsuite/rsa-encrypt-test.c (test_main): Likewise.
+	* tools/nettle-lfib-stream.c (main): Likewise.
 
 	* testsuite/testutils.c (test_armor): Change ascii argument to
 	const char *.
@@ -25,7 +26,8 @@
 	argument to test_armor.
 	* testsuite/base64-test.c (test_main): Likewise.
 
-	* tools/nettle-lfib-stream.c (main): Fix pointer signedness warning.
+	* tools/nettle-pbkdf2.c (main): Fix some pointer signedness warning.
+	* tools/nettle-hash.c (hash_file): Likewise.
 
 2016-08-29  Niels Möller  <nisse@lysator.liu.se>
 
diff --git a/tools/nettle-hash.c b/tools/nettle-hash.c
index b669a6ee..fc991ee9 100644
--- a/tools/nettle-hash.c
+++ b/tools/nettle-hash.c
@@ -79,7 +79,7 @@ hash_file(const struct nettle_hash *hash, void *ctx, FILE *f)
 {
   for (;;)
     {
-      char buffer[BUFSIZE];
+      uint8_t buffer[BUFSIZE];
       size_t res = fread(buffer, 1, sizeof(buffer), f);
       if (ferror(f))
 	return 0;
diff --git a/tools/nettle-pbkdf2.c b/tools/nettle-pbkdf2.c
index 16040c38..e2e8c782 100644
--- a/tools/nettle-pbkdf2.c
+++ b/tools/nettle-pbkdf2.c
@@ -71,9 +71,9 @@ main (int argc, char **argv)
   unsigned output_length = DEFAULT_LENGTH;
   char password[MAX_PASSWORD];
   size_t password_length;
-  char *output;
+  uint8_t *output;
   size_t salt_length;
-  char *salt;
+  uint8_t *salt;
   int raw = 0;
   int hex_salt = 0;
   int c;
@@ -141,8 +141,8 @@ main (int argc, char **argv)
       return EXIT_FAILURE;
     }
 
-  salt = strdup (argv[0]);
-  salt_length = strlen(salt);
+  salt = (uint8_t *) strdup (argv[0]);
+  salt_length = strlen(argv[0]);
   
   if (hex_salt)
     {
@@ -150,8 +150,8 @@ main (int argc, char **argv)
 
       base16_decode_init (&base16);
       if (!base16_decode_update (&base16,
-				 &salt_length,
-				 salt, salt_length, salt)
+				 &salt_length, salt, 
+				 salt_length, salt)
 	  || !base16_decode_final (&base16))
 	die ("Invalid salt (expecting hex encoding).\n");
     }
@@ -164,7 +164,8 @@ main (int argc, char **argv)
     die ("Reading password input failed: %s.\n", strerror (errno));
 
   output = xalloc (output_length);
-  pbkdf2_hmac_sha256 (password_length, password, iterations, salt_length, salt,
+  pbkdf2_hmac_sha256 (password_length, (const uint8_t *) password, 
+		      iterations, salt_length, salt,
 		      output_length, output);
 
   free (salt);
-- 
GitLab