From: Niels Möller <nisse@lysator.liu.se>
Date: Fri, 26 Apr 2013 12:47:42 +0000 (+0200)
Subject: Use size_t for pbkdf2.
X-Git-Tag: nettle_3.0_release_20140607~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95ce5d75e2ca8441b4b1be9559f206698297e853;p=thirdparty%2Fnettle.git

Use size_t for pbkdf2.
---

diff --git a/pbkdf2-hmac-sha1.c b/pbkdf2-hmac-sha1.c
index 91855037..acbc1200 100644
--- a/pbkdf2-hmac-sha1.c
+++ b/pbkdf2-hmac-sha1.c
@@ -32,10 +32,10 @@
 #include "hmac.h"
 
 void
-pbkdf2_hmac_sha1 (unsigned key_length, const uint8_t *key,
+pbkdf2_hmac_sha1 (size_t key_length, const uint8_t *key,
 		  unsigned iterations,
-		  unsigned salt_length, const uint8_t *salt,
-		  unsigned length, uint8_t *dst)
+		  size_t salt_length, const uint8_t *salt,
+		  size_t length, uint8_t *dst)
 {
   struct hmac_sha1_ctx sha1ctx;
 
diff --git a/pbkdf2-hmac-sha256.c b/pbkdf2-hmac-sha256.c
index 448f676d..e2318b05 100644
--- a/pbkdf2-hmac-sha256.c
+++ b/pbkdf2-hmac-sha256.c
@@ -32,10 +32,10 @@
 #include "hmac.h"
 
 void
-pbkdf2_hmac_sha256 (unsigned key_length, const uint8_t *key,
-		  unsigned iterations,
-		  unsigned salt_length, const uint8_t *salt,
-		  unsigned length, uint8_t *dst)
+pbkdf2_hmac_sha256 (size_t key_length, const uint8_t *key,
+		    unsigned iterations,
+		    size_t salt_length, const uint8_t *salt,
+		    size_t length, uint8_t *dst)
 {
   struct hmac_sha256_ctx sha256ctx;
 
diff --git a/pbkdf2.c b/pbkdf2.c
index 10e6bc20..9a4e33a5 100644
--- a/pbkdf2.c
+++ b/pbkdf2.c
@@ -41,9 +41,9 @@ void
 pbkdf2 (void *mac_ctx,
 	nettle_hash_update_func *update,
 	nettle_hash_digest_func *digest,
-	unsigned digest_size, unsigned iterations,
-	unsigned salt_length, const uint8_t *salt,
-	unsigned length, uint8_t *dst)
+	size_t digest_size, unsigned iterations,
+	size_t salt_length, const uint8_t *salt,
+	size_t length, uint8_t *dst)
 {
   TMP_DECL(U, uint8_t, NETTLE_MAX_HASH_DIGEST_SIZE);
   TMP_DECL(T, uint8_t, NETTLE_MAX_HASH_DIGEST_SIZE);
diff --git a/pbkdf2.h b/pbkdf2.h
index 41192e8a..1a47c543 100644
--- a/pbkdf2.h
+++ b/pbkdf2.h
@@ -42,9 +42,9 @@ void
 pbkdf2 (void *mac_ctx,
 	nettle_hash_update_func *update,
 	nettle_hash_digest_func *digest,
-	unsigned digest_size, unsigned iterations,
-	unsigned salt_length, const uint8_t *salt,
-	unsigned length, uint8_t *dst);
+	size_t digest_size, unsigned iterations,
+	size_t salt_length, const uint8_t *salt,
+	size_t length, uint8_t *dst);
 
 #define PBKDF2(ctx, update, digest, digest_size,			\
 	       iterations, salt_length, salt, length, dst)		\
@@ -59,16 +59,16 @@ pbkdf2 (void *mac_ctx,
 /* PBKDF2 with specific PRFs. */
 
 void
-pbkdf2_hmac_sha1 (unsigned key_length, const uint8_t *key,
+pbkdf2_hmac_sha1 (size_t key_length, const uint8_t *key,
 		  unsigned iterations,
-		  unsigned salt_length, const uint8_t *salt,
-		  unsigned length, uint8_t *dst);
+		  size_t salt_length, const uint8_t *salt,
+		  size_t length, uint8_t *dst);
 
 void
-pbkdf2_hmac_sha256 (unsigned key_length, const uint8_t *key,
+pbkdf2_hmac_sha256 (size_t key_length, const uint8_t *key,
 		    unsigned iterations,
-		    unsigned salt_length, const uint8_t *salt,
-		    unsigned length, uint8_t *dst);
+		    size_t salt_length, const uint8_t *salt,
+		    size_t length, uint8_t *dst);
 
 #ifdef __cplusplus
 }