diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2012-09-20 21:20:06 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2012-09-20 21:20:06 +0200 |
| commit | d5a173c74fcaa3d9380c22c71d3817bb48d78f3a (patch) | |
| tree | be1d174b8025f001ef2a8bbf9068ac035a97c727 /testsuite/pbkdf2-test.c | |
| parent | 4404dc6db87ae1649ab6463d15a904eee767484d (diff) | |
| download | nettle-d5a173c74fcaa3d9380c22c71d3817bb48d78f3a.tar.gz | |
Argument reorder for pbkdf2.
Diffstat (limited to 'testsuite/pbkdf2-test.c')
| -rw-r--r-- | testsuite/pbkdf2-test.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/testsuite/pbkdf2-test.c b/testsuite/pbkdf2-test.c index 0ac8ba3c..6ef58328 100644 --- a/testsuite/pbkdf2-test.c +++ b/testsuite/pbkdf2-test.c @@ -3,10 +3,11 @@ #include "sha.h" #include "pbkdf2.h" -#define PBKDF2_TEST(ctx, size, update, digest, slen, s, c, expect) \ +/* NOTE: The salt argument is expected to expand to length, data */ +#define PBKDF2_TEST(ctx, update, digest, size, c, salt, expect) \ do { \ dk[expect->length] = 17; \ - PBKDF2 (ctx, size, update, digest, expect->length, dk, c, slen, s); \ + PBKDF2 (ctx, update, digest, size, c, salt, expect->length, dk); \ ASSERT(MEMEQ (expect->length, dk, expect->data)); \ ASSERT(dk[expect->length] == 17); \ } while (0) @@ -24,34 +25,34 @@ test_main (void) hmac_sha1_set_key (&sha1ctx, 8, "password"); - PBKDF2_TEST(&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 4, "salt", 1, - SHEX("0c60c80f961f0e71f3a9b524af6012062fe037a6")); + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 1, LDATA("salt"), + SHEX("0c60c80f961f0e71f3a9b524af6012062fe037a6")); - PBKDF2_TEST (&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 4, "salt", 2, + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 2, LDATA("salt"), SHEX("ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957")); - PBKDF2_TEST (&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 4, "salt", 4096, + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 4096, LDATA("salt"), SHEX("4b007901b765489abead49d926f721d065a429c1")); #if 0 /* too slow */ - PBKDF2_TEST (&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 4, "salt", 16777216, + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 16777216, LDATA("salt"), SHEX("eefe3d61cd4da4e4e9945b3d6ba2158c2634e984")); #endif hmac_sha1_set_key (&sha1ctx, 24, "passwordPASSWORDpassword"); - PBKDF2_TEST (&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 36, "saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096, + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 4096, LDATA("saltSALTsaltSALTsaltSALTsaltSALTsalt"), SHEX("3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038")); hmac_sha1_set_key (&sha1ctx, 9, "pass\0word"); - PBKDF2_TEST (&sha1ctx, SHA1_DIGEST_SIZE, hmac_sha1_update, hmac_sha1_digest, - 5, "sa\0lt", 4096, + PBKDF2_TEST (&sha1ctx, hmac_sha1_update, hmac_sha1_digest, SHA1_DIGEST_SIZE, + 4096, LDATA("sa\0lt"), SHEX("56fa6aa75548099dcc37d7f03425e0c3")); /* PBKDF2-HMAC-SHA-256 test vectors confirmed with another @@ -59,15 +60,13 @@ test_main (void) hmac_sha256_set_key (&sha256ctx, 6, "passwd"); - PBKDF2_TEST (&sha256ctx, SHA256_DIGEST_SIZE, - hmac_sha256_update, hmac_sha256_digest, - 4, "salt", 1, + PBKDF2_TEST (&sha256ctx, hmac_sha256_update, hmac_sha256_digest, + SHA256_DIGEST_SIZE, 1, LDATA("salt"), SHEX("55ac046e56e3089fec1691c22544b605")); hmac_sha256_set_key (&sha256ctx, 8, "Password"); - PBKDF2_TEST (&sha256ctx, SHA256_DIGEST_SIZE, - hmac_sha256_update, hmac_sha256_digest, - 4, "NaCl", 80000, + PBKDF2_TEST (&sha256ctx, hmac_sha256_update, hmac_sha256_digest, + SHA256_DIGEST_SIZE, 80000, LDATA("NaCl"), SHEX("4ddcd8f60b98be21830cee5ef22701f9")); } |