diff options
author | Niels Möller <nisse@lysator.liu.se> | 2017-08-27 20:45:21 +0200 |
---|---|---|
committer | Niels Möller <nisse@lysator.liu.se> | 2017-08-27 20:45:21 +0200 |
commit | f2da403135e2b2f641cf0f8219ad5b72083b7dfd (patch) | |
tree | e3df313301bd15c5009305e5b30501fb14e4758f /tools/nettle-pbkdf2.c | |
parent | 0bf64256ecf10af974c1970d87ffad19cbce7b51 (diff) | |
download | nettle-f2da403135e2b2f641cf0f8219ad5b72083b7dfd.tar.gz |
Change type of base16- and base64-encoded data from uint8_t to char.
Diffstat (limited to 'tools/nettle-pbkdf2.c')
-rw-r--r-- | tools/nettle-pbkdf2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/nettle-pbkdf2.c b/tools/nettle-pbkdf2.c index c9e4d11c..1f0a3015 100644 --- a/tools/nettle-pbkdf2.c +++ b/tools/nettle-pbkdf2.c @@ -73,7 +73,7 @@ main (int argc, char **argv) size_t password_length; uint8_t *output; size_t salt_length; - uint8_t *salt; + char *salt; int raw = 0; int hex_salt = 0; int c; @@ -141,7 +141,7 @@ main (int argc, char **argv) return EXIT_FAILURE; } - salt = (uint8_t *) strdup (argv[0]); + salt = strdup (argv[0]); salt_length = strlen(argv[0]); if (hex_salt) @@ -150,7 +150,7 @@ main (int argc, char **argv) base16_decode_init (&base16); if (!base16_decode_update (&base16, - &salt_length, salt, + &salt_length, (uint8_t *) salt, salt_length, salt) || !base16_decode_final (&base16)) die ("Invalid salt (expecting hex encoding).\n"); @@ -165,7 +165,7 @@ main (int argc, char **argv) output = xalloc (output_length); pbkdf2_hmac_sha256 (password_length, (const uint8_t *) password, - iterations, salt_length, salt, + iterations, salt_length, (const uint8_t*) salt, output_length, output); free (salt); |