enable ltm, add key blinding, add remove tfm

This commit is contained in:
Love Hornquist Astrand
2010-08-15 15:06:58 -07:00
parent 44dfbeb596
commit 763a72b73a
143 changed files with 482 additions and 21199 deletions

View File

@@ -44,129 +44,65 @@
struct tests {
const char *password;
size_t passwordlen;
const char *salt;
size_t saltsize;
int iterations;
size_t keysize;
const void *pbkdf2;
const void *pbkdf2_128;
const void *pbkdf2_256;
};
const struct tests pkcs5_tests[] = {
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
{ "password",
"ATHENA.MIT.EDUraeburn",
1,
16,
"\xcd\xed\xb5\x28\x1b\xb2\xf8\x01\x56\x5a\x11\x22\xb2\x56\x35\x15"
},
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
1,
32,
"\xcd\xed\xb5\x28\x1b\xb2\xf8\x01\x56\x5a\x11\x22\xb2\x56\x35\x15",
"\xcd\xed\xb5\x28\x1b\xb2\xf8\x01\x56\x5a\x11\x22\xb2\x56\x35\x15"
"\x0a\xd1\xf7\xa0\x4b\xb9\xf3\xa3\x33\xec\xc0\xe2\xe1\xf7\x08\x37"
},
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
{ "password",
"ATHENA.MIT.EDUraeburn",
2,
16,
"\x01\xdb\xee\x7f\x4a\x9e\x24\x3e\x98\x8b\x62\xc7\x3c\xda\x93\x5d"
},
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
2,
32,
"\x01\xdb\xee\x7f\x4a\x9e\x24\x3e\x98\x8b\x62\xc7\x3c\xda\x93\x5d",
"\x01\xdb\xee\x7f\x4a\x9e\x24\x3e\x98\x8b\x62\xc7\x3c\xda\x93\x5d"
"\xa0\x53\x78\xb9\x32\x44\xec\x8f\x48\xa9\x9e\x61\xad\x79\x9d\x86"
},
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
{ "password",
"ATHENA.MIT.EDUraeburn",
1200,
16,
"\x5c\x08\xeb\x61\xfd\xf7\x1e\x4e\x4e\xc3\xcf\x6b\xa1\xf5\x51\x2b"
},
{ "password", 0,
"ATHENA.MIT.EDUraeburn", 0,
1200,
32,
"\x5c\x08\xeb\x61\xfd\xf7\x1e\x4e\x4e\xc3\xcf\x6b\xa1\xf5\x51\x2b",
"\x5c\x08\xeb\x61\xfd\xf7\x1e\x4e\x4e\xc3\xcf\x6b\xa1\xf5\x51\x2b"
"\xa7\xe5\x2d\xdb\xc5\xe5\x14\x2f\x70\x8a\x31\xe2\xe6\x2b\x1e\x13"
},
{
"password", 0,
"\x12\x34\x56\x78\x78\x56\x34\x12", 0,
"password", "\x12\x34\x56\x78\x78\x56\x34\x12",
5,
16,
"\xd1\xda\xa7\x86\x15\xf2\x87\xe6\xa1\xc8\xb1\x20\xd7\x06\x2a\x49"
},
{
"password", 0,
"\x12\x34\x56\x78\x78\x56\x34\x12", 0,
5,
32,
"\xd1\xda\xa7\x86\x15\xf2\x87\xe6\xa1\xc8\xb1\x20\xd7\x06\x2a\x49",
"\xd1\xda\xa7\x86\x15\xf2\x87\xe6\xa1\xc8\xb1\x20\xd7\x06\x2a\x49"
"\x3f\x98\xd2\x03\xe6\xbe\x49\xa6\xad\xf4\xfa\x57\x4b\x6e\x64\xee"
},
{
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 0,
"pass phrase equals block size", 0,
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"pass phrase equals block size",
1200,
16,
"\x13\x9c\x30\xc0\x96\x6b\xc3\x2b\xa5\x5f\xdb\xf2\x12\x53\x0a\xc9"
},
{
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 0,
"pass phrase equals block size", 0,
1200,
32,
"\x13\x9c\x30\xc0\x96\x6b\xc3\x2b\xa5\x5f\xdb\xf2\x12\x53\x0a\xc9",
"\x13\x9c\x30\xc0\x96\x6b\xc3\x2b\xa5\x5f\xdb\xf2\x12\x53\x0a\xc9"
"\xc5\xec\x59\xf1\xa4\x52\xf5\xcc\x9a\xd9\x40\xfe\xa0\x59\x8e\xd1"
},
{
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 0,
"pass phrase exceeds block size", 0,
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"pass phrase exceeds block size",
1200,
16,
"\x9c\xca\xd6\xd4\x68\x77\x0c\xd5\x1b\x10\xe6\xa6\x87\x21\xbe\x61"
},
{
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 0,
"pass phrase exceeds block size", 0,
1200,
32,
"\x9c\xca\xd6\xd4\x68\x77\x0c\xd5\x1b\x10\xe6\xa6\x87\x21\xbe\x61",
"\x9c\xca\xd6\xd4\x68\x77\x0c\xd5\x1b\x10\xe6\xa6\x87\x21\xbe\x61"
"\x1a\x8b\x4d\x28\x26\x01\xdb\x3b\x36\xbe\x92\x46\x91\x5e\xc8\x2a"
},
{
"\xf0\x9d\x84\x9e" /* g-clef */, 0,
"EXAMPLE.COMpianist", 0,
"\xf0\x9d\x84\x9e" /* g-clef */,
"EXAMPLE.COMpianist",
50,
16,
"\x6b\x9c\xf2\x6d\x45\x45\x5a\x43\xa5\xb8\xbb\x27\x6a\x40\x3b\x39"
},
{
"\xf0\x9d\x84\x9e" /* g-clef */, 0,
"EXAMPLE.COMpianist", 0,
50,
32,
"\x6b\x9c\xf2\x6d\x45\x45\x5a\x43\xa5\xb8\xbb\x27\x6a\x40\x3b\x39",
"\x6b\x9c\xf2\x6d\x45\x45\x5a\x43\xa5\xb8\xbb\x27\x6a\x40\x3b\x39"
"\xe7\xfe\x37\xa0\xc4\x1e\x02\xc2\x81\xff\x30\x69\xe1\xe9\x4f\x52"
},
{
"passwordPASSWORDpassword", 0,
"saltSALTsaltSALTsaltSALTsaltSALTsalt", 0,
4096,
25,
"\x3d\x2e\xec\x4f\xe4\x1c\x84\x9b\x80\xc8\xd8\x36\x62\xc0\xe4\x4a\x8b\x29\x1a\x96\x4c\xf2\xf0\x70\x38"
},
{
"pass\0word", 9,
"sa\0lt", 5,
4096,
16,
"\x56\xfa\x6a\xa7\x55\x48\x9\x9d\xcc\x37\xd7\xf0\x34\x25\xe0\xc3"
}
};
@@ -175,23 +111,28 @@ test_pkcs5_pbe2(const struct tests *t)
{
unsigned char key[32];
int ret, error = 0;
size_t saltsize = t->saltsize;
size_t passwordlen = t->passwordlen;
if (saltsize == 0)
saltsize = strlen(t->salt);
if (passwordlen == 0)
passwordlen = strlen(t->password);
ret = PKCS5_PBKDF2_HMAC_SHA1(t->password, passwordlen,
t->salt, saltsize,
ret = PKCS5_PBKDF2_HMAC_SHA1(t->password, strlen(t->password),
t->salt, strlen(t->salt),
t->iterations,
t->keysize, key);
16, key);
if (ret != 1)
errx(1, "PKCS5_PBKDF2_HMAC_SHA1: %d", ret);
if (memcmp(t->pbkdf2, key, t->keysize) != 0) {
printf("incorrect %d key\n", (int)t->keysize);
if (memcmp(t->pbkdf2_128, key, 16) != 0) {
printf("incorrect 128 key\n");
error++;
}
ret = PKCS5_PBKDF2_HMAC_SHA1(t->password, strlen(t->password),
t->salt, strlen(t->salt),
t->iterations,
32, key);
if (ret != 1)
errx(1, "PKCS5_PBKDF2_HMAC_SHA1: %d", ret);
if (memcmp(t->pbkdf2_256, key, 32) != 0) {
printf("incorrect 256 key\n");
error++;
}