diff --git a/test/default/pwhash.c b/test/default/pwhash.c index 25842c0c..05bbc78b 100644 --- a/test/default/pwhash.c +++ b/test/default/pwhash.c @@ -6,77 +6,78 @@ #define OPSLIMIT 3 #define MEMLIMIT 5000000 -static void tv(void) +static void +tv(void) { static struct { - const char *passwd_hex; - size_t passwdlen; - const char *salt_hex; - size_t outlen; - unsigned long long opslimit; - size_t memlimit; - unsigned int lanes; + const char * passwd_hex; + size_t passwdlen; + const char * salt_hex; + size_t outlen; + unsigned long long opslimit; + size_t memlimit; + unsigned int lanes; } tests[] = { - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 5, 7256678, 1 }, - { "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed" - "9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0" - "0cc2890277f0fd3c622115772f7048adaebed86e", - 86, - "f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d", - 250, 4, 7849083, 1 }, - { "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3" - "b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392" - "be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0" - "441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491" - "5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746" - "711f58c8c392016b2fdfc09c64f0f6b6ab7b", - 183, - "3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194", - 249, 3, 7994791, 1 }, - { "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3" - "b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64" - "51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53" - "f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6" - "9bb078ed1f0d31e7f9b8062409f37f19f8550aae", - 152, - "eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", - 5, 4, 1397645, 1 }, - { "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82" - "ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d" - "43ced68642bfb8bbbdd0f50b30118f5e", - 82, - "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258", - 190, 3, 1432947, 1 }, - { "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba" - "9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82" - "61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe" - "02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e" - "089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f", - 156, - "039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6", - 178, 3, 4886999, 1 }, - { "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1" - "7b", - 34, - "44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb", - 231, 1, 1631659, 1 }, - { "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f" - "7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63" - "d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c" - "496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6" - "76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30" - "1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d" - "55a3b4169f22cccb0745a2689407ea1901a0a766eb99", - 220, - "3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf", - 167, 3, 1784128, 1 }, - }; + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 5, 7256678, 1 }, + { "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed" + "9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0" + "0cc2890277f0fd3c622115772f7048adaebed86e", + 86, + "f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d", + 250, 4, 7849083, 1 }, + { "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3" + "b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392" + "be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0" + "441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491" + "5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746" + "711f58c8c392016b2fdfc09c64f0f6b6ab7b", + 183, + "3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194", + 249, 3, 7994791, 1 }, + { "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3" + "b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64" + "51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53" + "f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6" + "9bb078ed1f0d31e7f9b8062409f37f19f8550aae", + 152, + "eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", 5, + 4, 1397645, 1 }, + { "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82" + "ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d" + "43ced68642bfb8bbbdd0f50b30118f5e", + 82, + "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258", + 190, 3, 1432947, 1 }, + { "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba" + "9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82" + "61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe" + "02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e" + "089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f", + 156, + "039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6", + 178, 3, 4886999, 1 }, + { "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1" + "7b", + 34, + "44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb", + 231, 1, 1631659, 1 }, + { "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f" + "7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63" + "d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c" + "496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6" + "76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30" + "1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d" + "55a3b4169f22cccb0745a2689407ea1901a0a766eb99", + 220, + "3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf", + 167, 3, 1784128, 1 }, + }; char passwd[256]; unsigned char salt[crypto_pwhash_SALTBYTES]; unsigned char out[256]; @@ -89,11 +90,12 @@ static void tv(void) NULL, NULL); sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex, strlen(tests[i].salt_hex), NULL, NULL, NULL); - if (crypto_pwhash(out, (unsigned long long) tests[i].outlen, - passwd, tests[i].passwdlen, - (const unsigned char *) salt, tests[i].opslimit, - tests[i].memlimit, crypto_pwhash_alg_default()) != 0) { - printf("[tv] pwhash failure (maybe intentional): [%u]\n", (unsigned int) i); + if (crypto_pwhash(out, (unsigned long long) tests[i].outlen, passwd, + tests[i].passwdlen, (const unsigned char *) salt, + tests[i].opslimit, tests[i].memlimit, + crypto_pwhash_alg_default()) != 0) { + printf("[tv] pwhash failure (maybe intentional): [%u]\n", + (unsigned int) i); continue; } sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen); @@ -101,32 +103,33 @@ static void tv(void) } while (++i < (sizeof tests) / (sizeof tests[0])); } -static void tv2(void) +static void +tv2(void) { static struct { - const char *passwd_hex; - size_t passwdlen; - const char *salt_hex; - size_t outlen; - unsigned long long opslimit; - size_t memlimit; - unsigned int lanes; + const char * passwd_hex; + size_t passwdlen; + const char * salt_hex; + size_t outlen; + unsigned long long opslimit; + size_t memlimit; + unsigned int lanes; } tests[] = { - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 4, 1397645, 1 }, - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 3, 1397645, 1 }, - }; + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 4, 1397645, 1 }, + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 3, 1397645, 1 }, + }; char passwd[256]; unsigned char salt[crypto_pwhash_SALTBYTES]; unsigned char out[256]; @@ -134,15 +137,15 @@ static void tv2(void) size_t i = 0U; do { - sodium_hex2bin((unsigned char *)passwd, sizeof passwd, + sodium_hex2bin((unsigned char *) passwd, sizeof passwd, tests[i].passwd_hex, strlen(tests[i].passwd_hex), NULL, NULL, NULL); sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex, strlen(tests[i].salt_hex), NULL, NULL, NULL); - if (crypto_pwhash(out, (unsigned long long) tests[i].outlen, - passwd, tests[i].passwdlen, - (const unsigned char *) salt, tests[i].opslimit, - tests[i].memlimit, crypto_pwhash_alg_default()) != 0) { + if (crypto_pwhash(out, (unsigned long long) tests[i].outlen, passwd, + tests[i].passwdlen, (const unsigned char *) salt, + tests[i].opslimit, tests[i].memlimit, + crypto_pwhash_alg_default()) != 0) { printf("[tv2] pwhash failure: [%u]\n", (unsigned int) i); continue; } @@ -150,50 +153,55 @@ static void tv2(void) printf("%s\n", out_hex); } while (++i < (sizeof tests) / (sizeof tests[0])); - if (crypto_pwhash(out, sizeof out, "password", strlen("password"), - salt, 3, 1ULL << 12, 0) != -1) { + if (crypto_pwhash(out, sizeof out, "password", strlen("password"), salt, 3, + 1ULL << 12, 0) != -1) { printf("[tv2] pwhash should have failed (0)\n"); } - if (crypto_pwhash(out, sizeof out, "password", strlen("password"), - salt, 3, 1, crypto_pwhash_alg_default()) != -1) { + if (crypto_pwhash(out, sizeof out, "password", strlen("password"), salt, 3, + 1, crypto_pwhash_alg_default()) != -1) { printf("[tv2] pwhash should have failed (1)\n"); } - if (crypto_pwhash(out, sizeof out, "password", strlen("password"), - salt, 3, 1ULL << 12, crypto_pwhash_alg_default()) != -1) { + if (crypto_pwhash(out, sizeof out, "password", strlen("password"), salt, 3, + 1ULL << 12, crypto_pwhash_alg_default()) != -1) { printf("[tv2] pwhash should have failed (2)\n"); } - if (crypto_pwhash(out, sizeof out, "password", strlen("password"), - salt, 2, 1ULL << 12, crypto_pwhash_alg_default()) != -1) { + if (crypto_pwhash(out, sizeof out, "password", strlen("password"), salt, 2, + 1ULL << 12, crypto_pwhash_alg_default()) != -1) { printf("[tv2] pwhash should have failed (3)\n"); } - if (crypto_pwhash(out, 15, "password", strlen("password"), - salt, 3, 1ULL << 12, crypto_pwhash_alg_default()) != -1) { + if (crypto_pwhash(out, 15, "password", strlen("password"), salt, 3, + 1ULL << 12, crypto_pwhash_alg_default()) != -1) { printf("[tv2] pwhash with a short output length should have failed\n"); } - if (crypto_pwhash(out, sizeof out, "password", 0x100000000ULL, - salt, 3, 1ULL << 12, crypto_pwhash_alg_default()) != -1) { + if (crypto_pwhash(out, sizeof out, "password", 0x100000000ULL, salt, 3, + 1ULL << 12, crypto_pwhash_alg_default()) != -1) { printf("[tv2] pwhash with a long password length should have failed\n"); } } -static void tv3(void) +static void +tv3(void) { static struct { const char *passwd; const char *out; } tests[] = { { "", - "$argon2i$v=19$m=4096,t=1,p=1$X1NhbHQAAAAAAAAAAAAAAA$bWh++MKN1OiFHKgIWTLvIi1iHicmHH7+Fv3K88ifFfI" }, + "$argon2i$v=19$m=4096,t=1,p=1$X1NhbHQAAAAAAAAAAAAAAA$bWh++" + "MKN1OiFHKgIWTLvIi1iHicmHH7+Fv3K88ifFfI" }, { "", - "$argon2i$v=19$m=2048,t=4,p=1$SWkxaUhpY21ISDcrRnYzSw$Mbg/Eck1kpZir5T9io7C64cpffdTBaORgyriLQFgQj8" }, + "$argon2i$v=19$m=2048,t=4,p=1$SWkxaUhpY21ISDcrRnYzSw$Mbg/" + "Eck1kpZir5T9io7C64cpffdTBaORgyriLQFgQj8" }, { "^T5H$JYt39n%K*j:W]!1s?vg!:jGi]Ax?..l7[p0v:1jHTpla9;]bUN;?bWyCbtqg ", - "$argon2i$v=19$m=4096,t=3,p=2$X1NhbHQAAAAAAAAAAAAAAA$z/QMiU4lQxGsYNc/+K/bizwsA1P11UG2dj/7+aILJ4I" }, + "$argon2i$v=19$m=4096,t=3,p=2$X1NhbHQAAAAAAAAAAAAAAA$z/QMiU4lQxGsYNc/" + "+K/bizwsA1P11UG2dj/7+aILJ4I" }, { "K3S=KyH#)36_?]LxeR8QNKw6X=gFbxai$C%29V*", - "$argon2i$v=19$m=4096,t=3,p=1$X1NhbHQAAAAAAAAAAAAAAA$fu2Wsecyt+yPnBvSvYN16oP5ozRmkp0ixJ1YL19V3Uo" } + "$argon2i$v=19$m=4096,t=3,p=1$X1NhbHQAAAAAAAAAAAAAAA$fu2Wsecyt+" + "yPnBvSvYN16oP5ozRmkp0ixJ1YL19V3Uo" } }; - char *out; - char *passwd; - size_t i = 0U; + char *out; + char *passwd; + size_t i = 0U; do { out = (char *) sodium_malloc(strlen(tests[i].out) + 1U); @@ -202,9 +210,9 @@ static void tv3(void) passwd = (char *) sodium_malloc(strlen(tests[i].passwd) + 1U); assert(passwd != NULL); memcpy(passwd, tests[i].passwd, strlen(tests[i].passwd) + 1U); - if (crypto_pwhash_str_verify - (out, passwd, strlen(passwd)) != 0) { - printf("[tv3] pwhash_str failure (maybe intentional): [%u]\n", (unsigned int) i); + if (crypto_pwhash_str_verify(out, passwd, strlen(passwd)) != 0) { + printf("[tv3] pwhash_str failure (maybe intentional): [%u]\n", + (unsigned int) i); continue; } sodium_free(out); @@ -212,7 +220,8 @@ static void tv3(void) } while (++i < (sizeof tests) / (sizeof tests[0])); } -int main(void) +int +main(void) { char *str_out; char *str_out2; @@ -222,17 +231,17 @@ int main(void) tv(); tv2(); tv3(); - salt = (char *) sodium_malloc(crypto_pwhash_SALTBYTES); - str_out = (char *) sodium_malloc(crypto_pwhash_STRBYTES); + salt = (char *) sodium_malloc(crypto_pwhash_SALTBYTES); + str_out = (char *) sodium_malloc(crypto_pwhash_STRBYTES); str_out2 = (char *) sodium_malloc(crypto_pwhash_STRBYTES); memcpy(salt, ">A 16-bytes salt", crypto_pwhash_SALTBYTES); - if (crypto_pwhash_str(str_out, passwd, strlen(passwd), - OPSLIMIT, MEMLIMIT) != 0) { + if (crypto_pwhash_str(str_out, passwd, strlen(passwd), OPSLIMIT, + MEMLIMIT) != 0) { printf("pwhash_str failure\n"); return 1; } - if (crypto_pwhash_str(str_out2, passwd, strlen(passwd), - OPSLIMIT, MEMLIMIT) != 0) { + if (crypto_pwhash_str(str_out2, passwd, strlen(passwd), OPSLIMIT, + MEMLIMIT) != 0) { printf("pwhash_str(2) failure\n"); return 1; } @@ -255,13 +264,13 @@ int main(void) str_out[14]--; assert(str_out[crypto_pwhash_STRBYTES - 1U] == 0); - if (crypto_pwhash_str(str_out2, passwd, 0x100000000ULL, - OPSLIMIT, MEMLIMIT) != -1) { + if (crypto_pwhash_str(str_out2, passwd, 0x100000000ULL, OPSLIMIT, + MEMLIMIT) != -1) { printf("pwhash_str() with a large password should have failed\n"); return 1; } - if (crypto_pwhash_str(str_out2, passwd, strlen(passwd), - 1, MEMLIMIT) != -1) { + if (crypto_pwhash_str(str_out2, passwd, strlen(passwd), 1, MEMLIMIT) != + -1) { printf("pwhash_str() with a small opslimit should have failed\n"); return 1; } @@ -300,24 +309,28 @@ int main(void) "password", strlen("password")) != -1) { printf("pwhash_str_verify(invalid(6)) failure\n"); } - if (crypto_pwhash_str_verify("$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" - "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", - "password", strlen("password")) != 0) { + if (crypto_pwhash_str_verify( + "$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" + "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", + "password", strlen("password")) != 0) { printf("pwhash_str_verify(valid(7)) failure\n"); } - if (crypto_pwhash_str_verify("$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" - "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", - "passwore", strlen("passwore")) != -1) { + if (crypto_pwhash_str_verify( + "$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" + "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", + "passwore", strlen("passwore")) != -1) { printf("pwhash_str_verify(invalid(7)) failure\n"); } - if (crypto_pwhash_str_verify("$Argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" - "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", - "password", strlen("password")) != -1) { + if (crypto_pwhash_str_verify( + "$Argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" + "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", + "password", strlen("password")) != -1) { printf("pwhash_str_verify(invalid(8)) failure\n"); } - if (crypto_pwhash_str_verify("$argon2i$v=1$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" - "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", - "password", strlen("password")) != -1) { + if (crypto_pwhash_str_verify( + "$argon2i$v=1$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw" + "$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M", + "password", strlen("password")) != -1) { printf("pwhash_str_verify(invalid(9)) failure\n"); } assert(crypto_pwhash_bytes_min() > 0U); @@ -350,12 +363,18 @@ int main(void) assert(crypto_pwhash_opslimit_max() == crypto_pwhash_OPSLIMIT_MAX); assert(crypto_pwhash_memlimit_min() == crypto_pwhash_MEMLIMIT_MIN); assert(crypto_pwhash_memlimit_max() == crypto_pwhash_MEMLIMIT_MAX); - assert(crypto_pwhash_opslimit_interactive() == crypto_pwhash_OPSLIMIT_INTERACTIVE); - assert(crypto_pwhash_memlimit_interactive() == crypto_pwhash_MEMLIMIT_INTERACTIVE); - assert(crypto_pwhash_opslimit_moderate() == crypto_pwhash_OPSLIMIT_MODERATE); - assert(crypto_pwhash_memlimit_moderate() == crypto_pwhash_MEMLIMIT_MODERATE); - assert(crypto_pwhash_opslimit_sensitive() == crypto_pwhash_OPSLIMIT_SENSITIVE); - assert(crypto_pwhash_memlimit_sensitive() == crypto_pwhash_MEMLIMIT_SENSITIVE); + assert(crypto_pwhash_opslimit_interactive() == + crypto_pwhash_OPSLIMIT_INTERACTIVE); + assert(crypto_pwhash_memlimit_interactive() == + crypto_pwhash_MEMLIMIT_INTERACTIVE); + assert(crypto_pwhash_opslimit_moderate() == + crypto_pwhash_OPSLIMIT_MODERATE); + assert(crypto_pwhash_memlimit_moderate() == + crypto_pwhash_MEMLIMIT_MODERATE); + assert(crypto_pwhash_opslimit_sensitive() == + crypto_pwhash_OPSLIMIT_SENSITIVE); + assert(crypto_pwhash_memlimit_sensitive() == + crypto_pwhash_MEMLIMIT_SENSITIVE); assert(crypto_pwhash_argon2i_bytes_min() == crypto_pwhash_bytes_min()); assert(crypto_pwhash_argon2i_bytes_max() == crypto_pwhash_bytes_max()); @@ -363,11 +382,16 @@ int main(void) assert(crypto_pwhash_argon2i_passwd_max() == crypto_pwhash_passwd_max()); assert(crypto_pwhash_argon2i_saltbytes() == crypto_pwhash_saltbytes()); assert(crypto_pwhash_argon2i_strbytes() == crypto_pwhash_strbytes()); - assert(strcmp(crypto_pwhash_argon2i_strprefix(), crypto_pwhash_strprefix()) == 0); - assert(crypto_pwhash_argon2i_opslimit_min() == crypto_pwhash_opslimit_min()); - assert(crypto_pwhash_argon2i_opslimit_max() == crypto_pwhash_opslimit_max()); - assert(crypto_pwhash_argon2i_memlimit_min() == crypto_pwhash_memlimit_min()); - assert(crypto_pwhash_argon2i_memlimit_max() == crypto_pwhash_memlimit_max()); + assert(strcmp(crypto_pwhash_argon2i_strprefix(), + crypto_pwhash_strprefix()) == 0); + assert(crypto_pwhash_argon2i_opslimit_min() == + crypto_pwhash_opslimit_min()); + assert(crypto_pwhash_argon2i_opslimit_max() == + crypto_pwhash_opslimit_max()); + assert(crypto_pwhash_argon2i_memlimit_min() == + crypto_pwhash_memlimit_min()); + assert(crypto_pwhash_argon2i_memlimit_max() == + crypto_pwhash_memlimit_max()); assert(crypto_pwhash_argon2i_opslimit_interactive() == crypto_pwhash_opslimit_interactive()); assert(crypto_pwhash_argon2i_opslimit_moderate() == @@ -380,7 +404,8 @@ int main(void) crypto_pwhash_memlimit_moderate()); assert(crypto_pwhash_argon2i_memlimit_sensitive() == crypto_pwhash_memlimit_sensitive()); - assert(crypto_pwhash_alg_argon2i13() == crypto_pwhash_argon2i_alg_argon2i13()); + assert(crypto_pwhash_alg_argon2i13() == + crypto_pwhash_argon2i_alg_argon2i13()); assert(crypto_pwhash_alg_argon2i13() == crypto_pwhash_ALG_ARGON2I13); assert(crypto_pwhash_alg_argon2i13() == crypto_pwhash_alg_default()); diff --git a/test/default/pwhash_scrypt.c b/test/default/pwhash_scrypt.c index 84cf92b9..02bf2bd4 100644 --- a/test/default/pwhash_scrypt.c +++ b/test/default/pwhash_scrypt.c @@ -6,89 +6,90 @@ #define OPSLIMIT 1000000 #define MEMLIMIT 10000000 -static void tv(void) +static void +tv(void) { static struct { - const char *passwd_hex; - size_t passwdlen; - const char *salt_hex; - size_t outlen; - unsigned long long opslimit; - size_t memlimit; + const char * passwd_hex; + size_t passwdlen; + const char * salt_hex; + size_t outlen; + unsigned long long opslimit; + size_t memlimit; } tests[] = { - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 481326, 7256678 }, - { "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed" - "9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0" - "0cc2890277f0fd3c622115772f7048adaebed86e", - 86, - "f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d", - 250, 535778, 7849083 }, - { "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3" - "b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392" - "be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0" - "441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491" - "5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746" - "711f58c8c392016b2fdfc09c64f0f6b6ab7b", - 183, - "3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194", - 249, 311757, 7994791 }, - { "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3" - "b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64" - "51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53" - "f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6" - "9bb078ed1f0d31e7f9b8062409f37f19f8550aae", - 152, - "eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", - 5, 643464, 1397645 }, - { "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82" - "ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d" - "43ced68642bfb8bbbdd0f50b30118f5e", - 82, - "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258", - 190, 758010, 5432947 }, - { "1845e375479537e9dd4f4486d5c91ac72775d66605eeb11a787b78a7745f1fd005" - "2d526c67235dbae1b2a4d575a74cb551c8e9096c593a497aee74ba3047d911358e" - "de57bc27c9ea1829824348daaab606217cc931dcb6627787bd6e4e5854f0e8", - 97, - "3ee91a805aa62cfbe8dce29a2d9a44373a5006f4a4ce24022aca9cecb29d1473", - 212, 233177, 13101817 }, - { "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba" - "9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82" - "61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe" - "02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e" - "089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f", - 156, - "039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6", - 178, 234753, 4886999 }, - { "8f3a06e2fd8711350a517bb12e31f3d3423e8dc0bb14aac8240fca0995938d59bb" - "37bd0a7dfc9c9cc0705684b46612e8c8b1d6655fb0f9887562bb9899791a0250d1" - "320f945eda48cdc20c233f40a5bb0a7e3ac5ad7250ce684f68fc0b8c9633bfd75a" - "ad116525af7bdcdbbdb4e00ab163fd4df08f243f12557e", - 122, - "90631f686a8c3dbc0703ffa353bc1fdf35774568ac62406f98a13ed8f47595fd", - 55, 695191, 15738350 }, - { "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1" - "7b", - 34, - "44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb", - 231, 78652, 6631659 }, - { "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f" - "7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63" - "d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c" - "496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6" - "76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30" - "1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d" - "55a3b4169f22cccb0745a2689407ea1901a0a766eb99", - 220, - "3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf", - 167, 717248, 10784179 }, - }; + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 481326, 7256678 }, + { "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed" + "9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0" + "0cc2890277f0fd3c622115772f7048adaebed86e", + 86, + "f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d", + 250, 535778, 7849083 }, + { "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3" + "b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392" + "be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0" + "441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491" + "5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746" + "711f58c8c392016b2fdfc09c64f0f6b6ab7b", + 183, + "3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194", + 249, 311757, 7994791 }, + { "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3" + "b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64" + "51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53" + "f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6" + "9bb078ed1f0d31e7f9b8062409f37f19f8550aae", + 152, + "eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", 5, + 643464, 1397645 }, + { "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82" + "ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d" + "43ced68642bfb8bbbdd0f50b30118f5e", + 82, + "39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258", + 190, 758010, 5432947 }, + { "1845e375479537e9dd4f4486d5c91ac72775d66605eeb11a787b78a7745f1fd005" + "2d526c67235dbae1b2a4d575a74cb551c8e9096c593a497aee74ba3047d911358e" + "de57bc27c9ea1829824348daaab606217cc931dcb6627787bd6e4e5854f0e8", + 97, + "3ee91a805aa62cfbe8dce29a2d9a44373a5006f4a4ce24022aca9cecb29d1473", + 212, 233177, 13101817 }, + { "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba" + "9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82" + "61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe" + "02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e" + "089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f", + 156, + "039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6", + 178, 234753, 4886999 }, + { "8f3a06e2fd8711350a517bb12e31f3d3423e8dc0bb14aac8240fca0995938d59bb" + "37bd0a7dfc9c9cc0705684b46612e8c8b1d6655fb0f9887562bb9899791a0250d1" + "320f945eda48cdc20c233f40a5bb0a7e3ac5ad7250ce684f68fc0b8c9633bfd75a" + "ad116525af7bdcdbbdb4e00ab163fd4df08f243f12557e", + 122, + "90631f686a8c3dbc0703ffa353bc1fdf35774568ac62406f98a13ed8f47595fd", + 55, 695191, 15738350 }, + { "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1" + "7b", + 34, + "44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb", + 231, 78652, 6631659 }, + { "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f" + "7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63" + "d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c" + "496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6" + "76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30" + "1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d" + "55a3b4169f22cccb0745a2689407ea1901a0a766eb99", + 220, + "3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf", + 167, 717248, 10784179 }, + }; char passwd[256]; unsigned char salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES]; unsigned char out[256]; @@ -102,10 +103,9 @@ static void tv(void) sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex, strlen(tests[i].salt_hex), NULL, NULL, NULL); if (crypto_pwhash_scryptsalsa208sha256( - out, (unsigned long long) tests[i].outlen, - passwd, tests[i].passwdlen, - (const unsigned char *) salt, tests[i].opslimit, - tests[i].memlimit) != 0) { + out, (unsigned long long) tests[i].outlen, passwd, + tests[i].passwdlen, (const unsigned char *) salt, + tests[i].opslimit, tests[i].memlimit) != 0) { printf("pwhash failure\n"); } sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen); @@ -113,31 +113,32 @@ static void tv(void) } while (++i < (sizeof tests) / (sizeof tests[0])); } -static void tv2(void) +static void +tv2(void) { static struct { - const char *passwd_hex; - size_t passwdlen; - const char *salt_hex; - size_t outlen; - unsigned long long opslimit; - size_t memlimit; + const char * passwd_hex; + size_t passwdlen; + const char * salt_hex; + size_t outlen; + unsigned long long opslimit; + size_t memlimit; } tests[] = { - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 64, 1397645 }, - { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" - "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" - "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" - "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", - 127, - "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", - 155, 32768, 1397645 }, - }; + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 64, 1397645 }, + { "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0" + "65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d" + "a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5" + "8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6", + 127, + "5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2", + 155, 32768, 1397645 }, + }; char passwd[256]; unsigned char salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES]; unsigned char out[256]; @@ -145,16 +146,15 @@ static void tv2(void) size_t i = 0U; do { - sodium_hex2bin((unsigned char *)passwd, sizeof passwd, + sodium_hex2bin((unsigned char *) passwd, sizeof passwd, tests[i].passwd_hex, strlen(tests[i].passwd_hex), NULL, NULL, NULL); sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex, strlen(tests[i].salt_hex), NULL, NULL, NULL); if (crypto_pwhash_scryptsalsa208sha256( - out, (unsigned long long) tests[i].outlen, - passwd, tests[i].passwdlen, - (const unsigned char *) salt, tests[i].opslimit, - tests[i].memlimit) != 0) { + out, (unsigned long long) tests[i].outlen, passwd, + tests[i].passwdlen, (const unsigned char *) salt, + tests[i].opslimit, tests[i].memlimit) != 0) { printf("pwhash failure\n"); } sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen); @@ -162,111 +162,109 @@ static void tv2(void) } while (++i < (sizeof tests) / (sizeof tests[0])); } -static void tv3(void) +static void +tv3(void) { static struct { const char *passwd; const char *out; } tests[] = { - { "^T5H$JYt39n%K*j:W]!1s?vg!:jGi]Ax?..l7[p0v:1jHTpla9;]bUN;?bWyCbtqg " - "nrDFal+Jxl3,2`#^tFSu%v_+7iYse8-cCkNf!tD=KrW)", - "$7$B6....1....75gBMAGwfFWZqBdyF3WdTQnWdUsuTiWjG1fF9c1jiSD$tc8RoB3." - "Em3/zNgMLWo2u00oGIoTyJv4fl3Fl8Tix72" }, - { "bl72h6#y<':MFRZ>B IA1=NRkCKS%W8`1I.2uQxJN0g)N N aTt^4K!Iw5r " - "H6;crDsv^a55j9tsk'/GqweZn;cdk6+F_St6:#*=?ZCD_lw>.", - "$7$A6....3....Iahc6qM0.UQJHVgE4h9oa1/" - "4OWlWLm9CCtfguvz6bQD$QnXCo3M7nIqtry2WKsUZ5gQ.mY0wAlJu." - "WUhtE8vF66" }, - { "Py " - ">e.5b+tLo@rL`dC2k@eJ&4eVl!W=JJ4+k&mAt@gt',FS1JjqKW3aq21:]^kna`" - "mde7kVkN5NrpKUptu)@4*b&?BE_sJMG1=&@`3GBCV]Wg7xwgo7x3El", - "$7$96..../....f6bEusKt79kK4wdYN0ki2nw4bJQ7P3rN6k3BSigsK/" - "D$Dsvuw7vXj5xijmrb/NOhdgoyK/OiSIYv88cEtl9Cik7" }, - { "2vj;Um]FKOL27oam(:Uo8+UmSTvb1FD*h?jk_,S=;RDgF-$Fjk?]9yvfxe@fN^!NN(" - "Cuml?+2Raa", - "$7$86....I....7XwIxLtCx4VphmFeUa6OGuGJrFaIaYzDiLNu/" - "tyUPhD$U3q5GCEqCWxMwh.YQHDJrlg7FIZgViv9pcXE3h1vg61" }, - { "CT=[9uUoGav,J`kU+348tA50ue#sL:ABZ3QgF+r[#vh:tTOiL>s8tv%,Jeo]jH/" - "_4^i(*jD-_ku[9Ko[=86 06V", - "$7$A6....2....R3.bjH6YS9wz9z8Jsj.3weGQ3J80ZZElGw2oVux1TP6$" - "i5u6lFzXDHaIgYEICinLD6WNaovbiXP8SnLrDRdKgA9" }, - { "J#wNn`hDgOpTHNI.w^1a70%f,.9V_m038H_JIJQln`vdWnn/" - "rmILR?9H5g(+`;@H(2VosN9Fgk[WEjaBr'yB9Q19-imNa04[Mk5kvGcSn-TV", - "$7$B6....1....Dj1y.4mF1J9XmT/6IDskYdCLaPFJTq9xcCwXQ1DpT92$92/" - "hYfZLRq1nTLyIz.uc/dC6wLqwnsoqpkadrCXusm6" }, - { "j4BS38Asa;p)[K+9TY!3YDjQw+!qJb]>pP :_.9`dxM9k [eR7Y!yL-3)sNs[R,j_/^ " - "TH=5ny'15>6UXWcQW^6D%XCsO[vN[%ReA-`tV1vW(Nt*0KVK#]45P_A", - "$7$B6....1....D/" - "eyk8N5y6Z8YVQEsw521cTx.9zzLuK7YDs1KMMh.o4$alfW8ZbsUWnXc." - "vqon2zoljVk24Tt1.IsCuo2KurvS2" }, - { "K3S=KyH#)36_?]LxeR8QNKw6X=gFb'ai$C%29V* " - "tyh^Wo$TN-#Q4qkmtTCf0LLb.^E$0uykkP", - "$7$B6....1....CuBuU97xgAage8whp/" - "JNKobo0TFbsORGVbfcQIefyP8$aqalP." - "XofGViB8EPLONqHma8vs1xc9uTIMYh9CgE.S8" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "^T5H$JYt39n%K*j:W]!1s?vg!:jGi]Ax?..l7[p0v:1jHTpla9;]bUN;?bWyCbtqg " + "nrDFal+Jxl3,2`#^tFSu%v_+7iYse8-cCkNf!tD=KrW)", + "$7$B6....1....75gBMAGwfFWZqBdyF3WdTQnWdUsuTiWjG1fF9c1jiSD$tc8RoB3." + "Em3/zNgMLWo2u00oGIoTyJv4fl3Fl8Tix72" }, + { "bl72h6#y<':MFRZ>B IA1=NRkCKS%W8`1I.2uQxJN0g)N N aTt^4K!Iw5r " + "H6;crDsv^a55j9tsk'/GqweZn;cdk6+F_St6:#*=?ZCD_lw>.", + "$7$A6....3....Iahc6qM0.UQJHVgE4h9oa1/" + "4OWlWLm9CCtfguvz6bQD$QnXCo3M7nIqtry2WKsUZ5gQ.mY0wAlJu." + "WUhtE8vF66" }, + { "Py " + ">e.5b+tLo@rL`dC2k@eJ&4eVl!W=JJ4+k&mAt@gt',FS1JjqKW3aq21:]^kna`" + "mde7kVkN5NrpKUptu)@4*b&?BE_sJMG1=&@`3GBCV]Wg7xwgo7x3El", + "$7$96..../....f6bEusKt79kK4wdYN0ki2nw4bJQ7P3rN6k3BSigsK/" + "D$Dsvuw7vXj5xijmrb/NOhdgoyK/OiSIYv88cEtl9Cik7" }, + { "2vj;Um]FKOL27oam(:Uo8+UmSTvb1FD*h?jk_,S=;RDgF-$Fjk?]9yvfxe@fN^!NN(" + "Cuml?+2Raa", + "$7$86....I....7XwIxLtCx4VphmFeUa6OGuGJrFaIaYzDiLNu/" + "tyUPhD$U3q5GCEqCWxMwh.YQHDJrlg7FIZgViv9pcXE3h1vg61" }, + { "CT=[9uUoGav,J`kU+348tA50ue#sL:ABZ3QgF+r[#vh:tTOiL>s8tv%,Jeo]jH/" + "_4^i(*jD-_ku[9Ko[=86 06V", + "$7$A6....2....R3.bjH6YS9wz9z8Jsj.3weGQ3J80ZZElGw2oVux1TP6$" + "i5u6lFzXDHaIgYEICinLD6WNaovbiXP8SnLrDRdKgA9" }, + { "J#wNn`hDgOpTHNI.w^1a70%f,.9V_m038H_JIJQln`vdWnn/" + "rmILR?9H5g(+`;@H(2VosN9Fgk[WEjaBr'yB9Q19-imNa04[Mk5kvGcSn-TV", + "$7$B6....1....Dj1y.4mF1J9XmT/6IDskYdCLaPFJTq9xcCwXQ1DpT92$92/" + "hYfZLRq1nTLyIz.uc/dC6wLqwnsoqpkadrCXusm6" }, + { "j4BS38Asa;p)[K+9TY!3YDjQw+!qJb]>pP :_.9`dxM9k [eR7Y!yL-3)sNs[R,j_/^ " + "TH=5ny'15>6UXWcQW^6D%XCsO[vN[%ReA-`tV1vW(Nt*0KVK#]45P_A", + "$7$B6....1....D/" + "eyk8N5y6Z8YVQEsw521cTx.9zzLuK7YDs1KMMh.o4$alfW8ZbsUWnXc." + "vqon2zoljVk24Tt1.IsCuo2KurvS2" }, + { "K3S=KyH#)36_?]LxeR8QNKw6X=gFb'ai$C%29V* " + "tyh^Wo$TN-#Q4qkmtTCf0LLb.^E$0uykkP", + "$7$B6....1....CuBuU97xgAage8whp/" + "JNKobo0TFbsORGVbfcQIefyP8$aqalP." + "XofGViB8EPLONqHma8vs1xc9uTIMYh9CgE.S8" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - /* Invalid pwhash strings */ + /* Invalid pwhash strings */ - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1....$TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$.6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A.....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6.........TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i44269$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AH" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx54269" }, - { "Y0!?iQa9M%5ekffW(`", - "$7^A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$!6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A!....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....!....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "", - "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7fA6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4#" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$AX....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1!...TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$" }, - { "Y0!?iQa9M%5ekffW(`", - "" }, - { "Y0!?iQa9M%5ekffW(`", - "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" - "" }, - }; - char *out; - char *passwd; + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1....$TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$.6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A.....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6.........TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i44269$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AH" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx54269" }, + { "Y0!?iQa9M%5ekffW(`", + "$7^A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$!6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A!....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....!....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "", + "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7fA6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4#" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$AX....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1!...TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" }, + { "Y0!?iQa9M%5ekffW(`", "$7$A6....1" }, + { "Y0!?iQa9M%5ekffW(`", "$7$" }, + { "Y0!?iQa9M%5ekffW(`", "" }, + { "Y0!?iQa9M%5ekffW(`", + "$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$" + "" }, + }; + char * out; + char * passwd; size_t i = 0U; do { @@ -276,31 +274,31 @@ static void tv3(void) passwd = (char *) sodium_malloc(strlen(tests[i].passwd) + 1U); assert(passwd != NULL); memcpy(passwd, tests[i].passwd, strlen(tests[i].passwd) + 1U); - if (crypto_pwhash_scryptsalsa208sha256_str_verify - (out, passwd, strlen(passwd)) != 0) { - printf("pwhash_str failure: [%u]\n", (unsigned int)i); + if (crypto_pwhash_scryptsalsa208sha256_str_verify( + out, passwd, strlen(passwd)) != 0) { + printf("pwhash_str failure: [%u]\n", (unsigned int) i); } sodium_free(out); sodium_free(passwd); } while (++i < (sizeof tests) / (sizeof tests[0])); } -int main(void) +int +main(void) { - char *str_out; - char *str_out2; - char *salt; + char * str_out; + char * str_out2; + char * salt; const char *passwd = "Correct Horse Battery Staple"; tv(); tv2(); tv3(); - salt = (char *) - sodium_malloc(crypto_pwhash_scryptsalsa208sha256_SALTBYTES); - str_out = (char *) - sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES); - str_out2 = (char *) - sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES); + salt = (char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_SALTBYTES); + str_out = + (char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES); + str_out2 = + (char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES); memcpy(salt, "[<~A 32-bytes salt for scrypt~>]", crypto_pwhash_scryptsalsa208sha256_SALTBYTES); if (crypto_pwhash_scryptsalsa208sha256_str(str_out, passwd, strlen(passwd), @@ -323,16 +321,18 @@ int main(void) printf("pwhash_str_verify failure\n"); } str_out[14]++; - if (crypto_pwhash_scryptsalsa208sha256_str_verify( - str_out, passwd, strlen(passwd)) == 0) { + if (crypto_pwhash_scryptsalsa208sha256_str_verify(str_out, passwd, + strlen(passwd)) == 0) { printf("pwhash_str_verify(2) failure\n"); } str_out[14]--; assert(str_out[crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U] == 0); assert(crypto_pwhash_scryptsalsa208sha256_bytes_min() > 0U); - assert(crypto_pwhash_scryptsalsa208sha256_bytes_max() > crypto_pwhash_scryptsalsa208sha256_bytes_min()); - assert(crypto_pwhash_scryptsalsa208sha256_passwd_max() > crypto_pwhash_scryptsalsa208sha256_passwd_min()); + assert(crypto_pwhash_scryptsalsa208sha256_bytes_max() > + crypto_pwhash_scryptsalsa208sha256_bytes_min()); + assert(crypto_pwhash_scryptsalsa208sha256_passwd_max() > + crypto_pwhash_scryptsalsa208sha256_passwd_min()); assert(crypto_pwhash_scryptsalsa208sha256_saltbytes() > 0U); assert(crypto_pwhash_scryptsalsa208sha256_strbytes() > 1U); assert(crypto_pwhash_scryptsalsa208sha256_strbytes() > diff --git a/test/default/pwhash_scrypt_ll.c b/test/default/pwhash_scrypt_ll.c index d51ba6e3..3fc80dd5 100644 --- a/test/default/pwhash_scrypt_ll.c +++ b/test/default/pwhash_scrypt_ll.c @@ -5,36 +5,37 @@ /* Tarsnap test vectors, see: https://www.tarsnap.com/scrypt/scrypt.pdf */ static const char *password1 = ""; -static const char *salt1 = ""; -static uint64_t N1 = 16U; -static uint32_t r1 = 1U; -static uint32_t p1 = 1U; +static const char *salt1 = ""; +static uint64_t N1 = 16U; +static uint32_t r1 = 1U; +static uint32_t p1 = 1U; static const char *password2 = "password"; -static const char *salt2 = "NaCl"; -static uint64_t N2 = 1024U; -static uint32_t r2 = 8U; -static uint32_t p2 = 16U; +static const char *salt2 = "NaCl"; +static uint64_t N2 = 1024U; +static uint32_t r2 = 8U; +static uint32_t p2 = 16U; static const char *password3 = "pleaseletmein"; -static const char *salt3 = "SodiumChloride"; -static uint64_t N3 = 16384U; -static uint32_t r3 = 8U; -static uint32_t p3 = 1U; +static const char *salt3 = "SodiumChloride"; +static uint64_t N3 = 16384U; +static uint32_t r3 = 8U; +static uint32_t p3 = 1U; -static void test_vector(const char *password, const char *salt, uint64_t N, - uint32_t r, uint32_t p) +static void +test_vector(const char *password, const char *salt, uint64_t N, uint32_t r, + uint32_t p) { uint8_t data[64]; - size_t i; - size_t olen = (sizeof data / sizeof data[0]); - size_t passwordLength = strlen(password); - size_t saltLenght = strlen(salt); - int lineitems = 0; - int lineitemsLimit = 15; + size_t i; + size_t olen = (sizeof data / sizeof data[0]); + size_t passwordLength = strlen(password); + size_t saltLenght = strlen(salt); + int lineitems = 0; + int lineitemsLimit = 15; if (crypto_pwhash_scryptsalsa208sha256_ll( - (const uint8_t *)password, passwordLength, (const uint8_t *)salt, + (const uint8_t *) password, passwordLength, (const uint8_t *) salt, saltLenght, N, r, p, data, olen) != 0) { printf("pwhash_scryptsalsa208sha256_ll([%s],[%s]) failure\n", password, salt); @@ -42,8 +43,8 @@ static void test_vector(const char *password, const char *salt, uint64_t N, } printf("scrypt('%s', '%s', %lu, %lu, %lu, %lu) =\n", password, salt, - (unsigned long)N, (unsigned long)r, (unsigned long)p, - (unsigned long)olen); + (unsigned long) N, (unsigned long) r, (unsigned long) p, + (unsigned long) olen); for (i = 0; i < olen; ++i) { printf("%02x%c", data[i], lineitems < lineitemsLimit ? ' ' : '\n'); @@ -51,7 +52,8 @@ static void test_vector(const char *password, const char *salt, uint64_t N, } } -int main(void) +int +main(void) { test_vector(password1, salt1, N1, r1, p1); test_vector(password2, salt2, N2, r2, p2);