clang-format-6.0

pull/1236/head
Tatsuhiro Tsujikawa 2018-06-09 16:03:29 +09:00
parent eb30bb1a52
commit 67d07534ea
1 changed files with 60 additions and 62 deletions

View File

@ -336,68 +336,66 @@ static struct pbkdf2 {
size_t iterations; size_t iterations;
unsigned char key[32]; unsigned char key[32];
size_t key_len; size_t key_len;
} pbkdf2s[] = { } pbkdf2s[] = {{"password",
{"password", 8,
8, "salt",
"salt", 4,
4, 1,
1, {0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71, 0xf3, 0xa9,
{0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71, 0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06, 0x2f, 0xe0, 0x37, 0xa6},
0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06, 0x2f, 0xe0, 0x37, 0xa6}, 20},
20}, {"password",
{"password", 8,
8, "salt",
"salt", 4,
4, 1,
1, {0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71, 0xf3, 0xa9,
{0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71, 0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06, 0x2f, 0xe0, 0x37, 0xa6},
0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06, 0x2f, 0xe0, 0x37, 0xa6}, 0},
0}, {"password",
{"password", 8,
8, "salt",
"salt", 4,
4, 2,
2, {0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c, 0xcd, 0x1e,
{0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c, 0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0, 0xd8, 0xde, 0x89, 0x57},
0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0, 0xd8, 0xde, 0x89, 0x57}, 20},
20}, {"password",
{"password", 8,
8, "salt",
"salt", 4,
4, 4096,
4096, {0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a, 0xbe, 0xad,
{0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a, 0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0, 0x65, 0xa4, 0x29, 0xc1},
0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0, 0x65, 0xa4, 0x29, 0xc1}, 20},
20}, /* Disabled due to #236
/* Disabled due to #236 {
{ "password", 8,
"password", 8, "salt", 4,
"salt", 4, 16777216,
16777216, { 0xee, 0xfe, 0x3d, 0x61, 0xcd, 0x4d, 0xa4, 0xe4, 0xe9, 0x94,
{ 0xee, 0xfe, 0x3d, 0x61, 0xcd, 0x4d, 0xa4, 0xe4, 0xe9, 0x94, 0x5b, 0x3d, 0x5b, 0x3d, 0x6b, 0xa2, 0x15, 0x8c, 0x26, 0x34, 0xe9, 0x84 }, 20,
0x6b, 0xa2, 0x15, 0x8c, 0x26, 0x34, 0xe9, 0x84 }, },
20, */
}, {
*/ "passwordPASSWORDpassword",
{ 24,
"passwordPASSWORDpassword", "saltSALTsaltSALTsaltSALTsaltSALTsalt",
24, 36,
"saltSALTsaltSALTsaltSALTsaltSALTsalt", 4096,
36, {0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b, 0x80,
4096, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a, 0x8b, 0x29,
{0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b, 0x80, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70, 0x38},
0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a, 0x8b, 0x29, 25,
0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70, 0x38}, },
25, {"pass\0word",
}, 9,
{"pass\0word", "sa\0lt",
9, 5,
"sa\0lt", 4096,
5, {0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d, 0xcc, 0x37,
4096, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3},
{0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d, 0xcc, 0x37, 0xd7, 0xf0, 16}};
0x34, 0x25, 0xe0, 0xc3},
16}};
void SecurityTest::testPBKDF2() void SecurityTest::testPBKDF2()
{ {