Added generic HKDF implementation.

This commit is contained in:
Thomas Pornin 2018-08-14 17:02:22 +02:00
parent f8e38c231d
commit fa0b7bbe90
7 changed files with 433 additions and 1 deletions

View file

@ -1029,6 +1029,107 @@ test_HMAC(void)
fflush(stdout);
}
static void
test_HKDF_inner(const br_hash_class *dig, const char *ikmhex,
const char *salthex, const char *infohex, const char *okmhex)
{
unsigned char ikm[100], saltbuf[100], info[100], okm[100], tmp[107];
const unsigned char *salt;
size_t ikm_len, salt_len, info_len, okm_len;
br_hkdf_context hc;
size_t u;
ikm_len = hextobin(ikm, ikmhex);
if (salthex == NULL) {
salt = BR_HKDF_NO_SALT;
salt_len = 0;
} else {
salt = saltbuf;
salt_len = hextobin(saltbuf, salthex);
}
info_len = hextobin(info, infohex);
okm_len = hextobin(okm, okmhex);
br_hkdf_init(&hc, dig, salt, salt_len);
br_hkdf_inject(&hc, ikm, ikm_len);
br_hkdf_flip(&hc);
br_hkdf_produce(&hc, info, info_len, tmp, okm_len);
check_equals("KAT HKDF 1", tmp, okm, okm_len);
br_hkdf_init(&hc, dig, salt, salt_len);
for (u = 0; u < ikm_len; u ++) {
br_hkdf_inject(&hc, &ikm[u], 1);
}
br_hkdf_flip(&hc);
for (u = 0; u < okm_len; u ++) {
br_hkdf_produce(&hc, info, info_len, &tmp[u], 1);
}
check_equals("KAT HKDF 2", tmp, okm, okm_len);
br_hkdf_init(&hc, dig, salt, salt_len);
br_hkdf_inject(&hc, ikm, ikm_len);
br_hkdf_flip(&hc);
for (u = 0; u < okm_len; u += 7) {
br_hkdf_produce(&hc, info, info_len, &tmp[u], 7);
}
check_equals("KAT HKDF 3", tmp, okm, okm_len);
printf(".");
fflush(stdout);
}
static void
test_HKDF(void)
{
printf("Test HKDF: ");
fflush(stdout);
test_HKDF_inner(&br_sha256_vtable,
"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
"000102030405060708090a0b0c",
"f0f1f2f3f4f5f6f7f8f9",
"3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865");
test_HKDF_inner(&br_sha256_vtable,
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f",
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
"b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
"b11e398dc80327a1c8e7f78c596a49344f012eda2d4efad8a050cc4c19afa97c59045a99cac7827271cb41c65e590e09da3275600c2f09b8367793a9aca3db71cc30c58179ec3e87c14c01d5c1f3434f1d87");
test_HKDF_inner(&br_sha256_vtable,
"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
"",
"",
"8da4e775a563c18f715f802a063c5a31b8a11f5c5ee1879ec3454e5f3c738d2d9d201395faa4b61a96c8");
test_HKDF_inner(&br_sha1_vtable,
"0b0b0b0b0b0b0b0b0b0b0b",
"000102030405060708090a0b0c",
"f0f1f2f3f4f5f6f7f8f9",
"085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f155fda2c22e422478d305f3f896");
test_HKDF_inner(&br_sha1_vtable,
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f",
"606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
"b0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
"0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4");
test_HKDF_inner(&br_sha1_vtable,
"0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
"",
"",
"0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918");
test_HKDF_inner(&br_sha1_vtable,
"0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
NULL,
"",
"2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48");
printf(" done.\n");
fflush(stdout);
}
static void
test_HMAC_DRBG(void)
{
@ -8266,6 +8367,7 @@ static const struct {
STU(MD5_SHA1),
STU(multihash),
STU(HMAC),
STU(HKDF),
STU(HMAC_DRBG),
STU(AESCTR_DRBG),
STU(PRF),