diff --git a/crypto/fipsmodule/service_indicator/service_indicator.c b/crypto/fipsmodule/service_indicator/service_indicator.c index 94a85ea21e..b060c22846 100644 --- a/crypto/fipsmodule/service_indicator/service_indicator.c +++ b/crypto/fipsmodule/service_indicator/service_indicator.c @@ -449,6 +449,8 @@ void HKDF_verify_service_indicator(const EVP_MD *evp_md, const uint8_t *salt, case NID_sha256: case NID_sha384: case NID_sha512: + case NID_sha512_224: + case NID_sha512_256: FIPS_service_indicator_update_state(); break; default: @@ -465,6 +467,8 @@ void HKDFExpand_verify_service_indicator(const EVP_MD *evp_md) { case NID_sha256: case NID_sha384: case NID_sha512: + case NID_sha512_224: + case NID_sha512_256: FIPS_service_indicator_update_state(); break; default: @@ -492,6 +496,8 @@ void PBKDF2_verify_service_indicator(const EVP_MD *evp_md, size_t password_len, case NID_sha256: case NID_sha384: case NID_sha512: + case NID_sha512_224: + case NID_sha512_256: if (password_len >= 14 && salt_len >= 16 && iterations >= 1000) { FIPS_service_indicator_update_state(); } diff --git a/crypto/fipsmodule/service_indicator/service_indicator_test.cc b/crypto/fipsmodule/service_indicator/service_indicator_test.cc index 2106f6edb4..3e244cb710 100644 --- a/crypto/fipsmodule/service_indicator/service_indicator_test.cc +++ b/crypto/fipsmodule/service_indicator/service_indicator_test.cc @@ -1439,6 +1439,18 @@ const uint8_t kHKDF_okm_tc1_sha512[] = { 0xfc, 0x7f, 0xe9, 0x2c, 0x14, 0x81, 0x57, 0x93, 0x38, 0xda, 0x36, 0x2c, 0xb8, 0xd9, 0xf9, 0x25, 0xd7, 0xcb }; +const uint8_t kHKDF_okm_tc1_sha512_224[] = { + 0xf8, 0xd9, 0x56, 0xe1, 0x52, 0xb0, 0xfb, 0xa8, 0x31, 0xba, 0xc4, + 0x00, 0xf1, 0xa5, 0xaf, 0x54, 0x98, 0x2b, 0x91, 0xdb, 0x3d, 0x96, + 0xae, 0x21, 0xa7, 0x56, 0x55, 0xef, 0xf1, 0x72, 0x5f, 0x92, 0x8e, + 0x49, 0x1c, 0x63, 0xf3, 0xae, 0xdb, 0x40, 0x82, 0x96 +}; +const uint8_t kHKDF_okm_tc1_sha512_256[] = { + 0x78, 0x9a, 0x93, 0xe5, 0x67, 0xa1, 0x86, 0x1d, 0xe4, 0x49, 0x34, + 0x2b, 0x2d, 0x67, 0x4c, 0x0d, 0xf7, 0x37, 0xfd, 0x8a, 0xdc, 0xe2, + 0xa8, 0xe1, 0x84, 0x32, 0x37, 0xc1, 0x93, 0x8a, 0xc4, 0x13, 0x04, + 0x4b, 0x49, 0x6c, 0xe2, 0x67, 0xa1, 0x98, 0xeb, 0xe3 +}; const uint8_t kHKDF_ikm_tc2[] = { // RFC 5869 Test Case 2 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, @@ -1512,6 +1524,18 @@ const uint8_t kHKDF_okm_tc2_sha512[] = { 0x1e, 0xcf, 0xf2, 0x35, 0xf6, 0xa2, 0x05, 0x6c, 0xe3, 0xaf, 0x1d, 0xe4, 0x4d, 0x57, 0x20, 0x97, 0xa8, 0x50, 0x5d, 0x9e, 0x7a, 0x93 }; +const uint8_t kHKDF_okm_tc2_sha512_224[] = { + 0xb2, 0xfd, 0x77, 0xf9, 0xcf, 0xb6, 0xda, 0x40, 0x10, 0x23, 0x8b, + 0xa6, 0x21, 0x7a, 0x1b, 0xc7, 0xb7, 0x70, 0xa3, 0x85, 0x28, 0x4b, + 0x8e, 0x54, 0xd6, 0x8d, 0x40, 0x8c, 0xce, 0x4a, 0x42, 0xc3, 0xc5, + 0xde, 0x16, 0x91, 0x59, 0x93, 0x1e, 0x13, 0x24, 0x8b +}; +const uint8_t kHKDF_okm_tc2_sha512_256[] = { + 0x9f, 0xde, 0x11, 0xa4, 0x63, 0x48, 0xac, 0x1a, 0xba, 0xdf, 0xd2, + 0xff, 0xb6, 0x0d, 0x85, 0x26, 0x58, 0x3f, 0xc8, 0x3e, 0x08, 0xb8, + 0x8a, 0x6e, 0xdc, 0x2d, 0xc6, 0x95, 0xad, 0x61, 0x5d, 0xe3, 0xbe, + 0x8e, 0xd2, 0xe1, 0xfe, 0x5b, 0xc8, 0x38, 0xf7, 0x13 +}; const uint8_t kHKDF_ikm_tc3[] = { // RFC 5869 Test Case 3 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, @@ -1549,6 +1573,18 @@ const uint8_t kHKDF_okm_tc3_sha512[] = { 0x5c, 0x97, 0x0e, 0x3b, 0x16, 0x4b, 0xf9, 0x0f, 0xff, 0x22, 0xd0, 0x48, 0x36, 0xd0, 0xe2, 0x34, 0x3b, 0xac }; +const uint8_t kHKDF_okm_tc3_sha512_224[] = { + 0x7c, 0x21, 0xff, 0xc6, 0x05, 0x69, 0x03, 0xdd, 0x09, 0xf1, 0x31, + 0xd3, 0x36, 0xb4, 0x20, 0x41, 0x5f, 0x17, 0xb0, 0x50, 0x3b, 0xa3, + 0x23, 0x55, 0xe6, 0x79, 0xaf, 0x0f, 0x6e, 0xb6, 0x44, 0x39, 0x20, + 0x77, 0x94, 0x40, 0x09, 0x43, 0xb5, 0x3a, 0x17, 0x83 +}; +const uint8_t kHKDF_okm_tc3_sha512_256[] = { + 0xfa, 0x6f, 0xf4, 0x5b, 0x2f, 0xc4, 0xf0, 0xf4, 0x98, 0x83, 0xd9, + 0xc4, 0xc9, 0xf9, 0xed, 0xfb, 0x53, 0xce, 0xbb, 0x3f, 0x9f, 0xaa, + 0xc5, 0x71, 0x31, 0x9c, 0x7b, 0xd1, 0x7d, 0x37, 0x1a, 0x0a, 0xbc, + 0xa6, 0x5d, 0x85, 0xeb, 0x3d, 0x41, 0x49, 0x51, 0x58 +}; const uint8_t kHKDF_ikm_tc4[] = { // RFC 5869 Test Case 4 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b @@ -1589,6 +1625,18 @@ const uint8_t kHKDF_okm_tc4_sha512[] = { 0xfc, 0xf3, 0x95, 0x4d, 0xc8, 0xaf, 0xf5, 0x35, 0x59, 0xbd, 0x5e, 0x30, 0x28, 0xb0, 0x80, 0xf7, 0xc0, 0x68 }; +const uint8_t kHKDF_okm_tc4_sha512_224[] = { + 0x80, 0x86, 0x34, 0xf8, 0x71, 0x34, 0xbc, 0xb6, 0x9b, 0xfb, 0xd2, + 0x17, 0x2c, 0x91, 0xd2, 0x2b, 0x6b, 0xdf, 0x11, 0x63, 0x4f, 0x66, + 0x4e, 0x60, 0x45, 0x03, 0xac, 0x55, 0x90, 0x7c, 0x71, 0x16, 0x5e, + 0xbe, 0xfe, 0x17, 0xce, 0xf1, 0xef, 0xe8, 0x23, 0xa3 +}; +const uint8_t kHKDF_okm_tc4_sha512_256[] = { + 0xce, 0xa7, 0x08, 0xf9, 0xe8, 0x3b, 0x5b, 0x33, 0x39, 0x59, 0x9b, + 0xcf, 0x6b, 0x97, 0x08, 0xde, 0x5e, 0xdf, 0x23, 0xab, 0xb5, 0x95, + 0xfc, 0xbb, 0xcc, 0xb5, 0xf5, 0x18, 0x70, 0x1e, 0x7b, 0x72, 0x07, + 0x74, 0xa8, 0xef, 0xa7, 0x9b, 0x99, 0x46, 0xb3, 0x1f +}; // RFC Test Case 5 repeats the inputs from RFC 5869 Test Case 2; RFC Test Case 6 // repeats the inputs from RFC 5869 Test Case 3. @@ -1630,6 +1678,18 @@ const uint8_t kHKDF_okm_tc7_sha512[] = { 0xea, 0xf0, 0x7e, 0x95, 0x3c, 0xfc, 0x0a, 0x3a, 0x52, 0x40, 0xa1, 0x55, 0xd6, 0xe4, 0xda, 0xa9, 0x65, 0xbb }; +const uint8_t kHKDF_okm_tc7_sha512_224[] = { + 0xb2, 0xf0, 0x98, 0x31, 0x2a, 0xd3, 0xfe, 0xee, 0x46, 0xe9, 0x0f, + 0x1b, 0x90, 0x6a, 0x20, 0xa1, 0xab, 0xee, 0x95, 0xbb, 0xcd, 0xf8, + 0x16, 0x30, 0xc7, 0x1c, 0x2b, 0x46, 0xc6, 0xc6, 0x15, 0xbe, 0x23, + 0x54, 0x38, 0x2f, 0x42, 0x56, 0x4d, 0xee, 0x56, 0x4d +}; +const uint8_t kHKDF_okm_tc7_sha512_256[] = { + 0x6e, 0x15, 0x36, 0x0b, 0x08, 0x47, 0xd9, 0xef, 0x32, 0xa4, 0xa8, + 0x0d, 0x5e, 0x1f, 0x58, 0xce, 0xb3, 0xe9, 0x01, 0xf9, 0x29, 0x80, + 0x4e, 0xcf, 0x01, 0x6a, 0x8c, 0xf3, 0x59, 0x18, 0xb5, 0xdb, 0x99, + 0x8d, 0x1f, 0x09, 0x1e, 0x83, 0x67, 0xa1, 0x82, 0x62 +}; static const struct HKDFTestVector { // func is the hash function for HMAC to test. @@ -1693,6 +1753,23 @@ static const struct HKDFTestVector { kHKDF_okm_tc1_sha512, sizeof(kHKDF_okm_tc1_sha512), AWSLC_APPROVED, }, + { + EVP_sha512_224, + kHKDF_ikm_tc1, sizeof(kHKDF_ikm_tc1), + kHKDF_salt_tc1, sizeof(kHKDF_salt_tc1), + kHKDF_info_tc1, sizeof(kHKDF_info_tc1), + kHKDF_okm_tc1_sha512_224, sizeof(kHKDF_okm_tc1_sha512_224), + AWSLC_APPROVED, + }, + { + EVP_sha512_256, + kHKDF_ikm_tc1, sizeof(kHKDF_ikm_tc1), + kHKDF_salt_tc1, sizeof(kHKDF_salt_tc1), + kHKDF_info_tc1, sizeof(kHKDF_info_tc1), + kHKDF_okm_tc1_sha512_256, sizeof(kHKDF_okm_tc1_sha512_256), + AWSLC_APPROVED, + }, + // RFC 5869 Test Case 2 { @@ -1735,6 +1812,22 @@ static const struct HKDFTestVector { kHKDF_okm_tc2_sha512, sizeof(kHKDF_okm_tc2_sha512), AWSLC_APPROVED, }, + { + EVP_sha512_224, + kHKDF_ikm_tc2, sizeof(kHKDF_ikm_tc2), + kHKDF_salt_tc2, sizeof(kHKDF_salt_tc2), + kHKDF_info_tc2, sizeof(kHKDF_info_tc2), + kHKDF_okm_tc2_sha512_224, sizeof(kHKDF_okm_tc2_sha512_224), + AWSLC_APPROVED, + }, + { + EVP_sha512_256, + kHKDF_ikm_tc2, sizeof(kHKDF_ikm_tc2), + kHKDF_salt_tc2, sizeof(kHKDF_salt_tc2), + kHKDF_info_tc2, sizeof(kHKDF_info_tc2), + kHKDF_okm_tc2_sha512_256, sizeof(kHKDF_okm_tc2_sha512_256), + AWSLC_APPROVED, + }, // RFC 5869 Test Case 3 // @@ -1780,6 +1873,22 @@ static const struct HKDFTestVector { kHKDF_okm_tc3_sha512, sizeof(kHKDF_okm_tc3_sha512), AWSLC_NOT_APPROVED, }, + { + EVP_sha512_224, + kHKDF_ikm_tc3, sizeof(kHKDF_ikm_tc3), + kHKDF_salt_tc3, 0, + kHKDF_info_tc3, 0, + kHKDF_okm_tc3_sha512_224, sizeof(kHKDF_okm_tc3_sha512_224), + AWSLC_NOT_APPROVED, + }, + { + EVP_sha512_256, + kHKDF_ikm_tc3, sizeof(kHKDF_ikm_tc3), + kHKDF_salt_tc3, 0, + kHKDF_salt_tc3, 0, + kHKDF_okm_tc3_sha512_256, sizeof(kHKDF_okm_tc3_sha512_256), + AWSLC_NOT_APPROVED, + }, // RFC 5869 Test Case 4 { @@ -1822,6 +1931,22 @@ static const struct HKDFTestVector { kHKDF_okm_tc4_sha512, sizeof(kHKDF_okm_tc4_sha512), AWSLC_APPROVED, }, + { + EVP_sha512_224, + kHKDF_ikm_tc4, sizeof(kHKDF_ikm_tc4), + kHKDF_salt_tc4, sizeof(kHKDF_salt_tc4), + kHKDF_info_tc4, sizeof(kHKDF_info_tc4), + kHKDF_okm_tc4_sha512_224, sizeof(kHKDF_okm_tc4_sha512_224), + AWSLC_APPROVED, + }, + { + EVP_sha512_256, + kHKDF_ikm_tc4, sizeof(kHKDF_ikm_tc4), + kHKDF_salt_tc4, sizeof(kHKDF_salt_tc4), + kHKDF_info_tc4, sizeof(kHKDF_info_tc4), + kHKDF_okm_tc4_sha512_256, sizeof(kHKDF_okm_tc4_sha512_256), + AWSLC_APPROVED, + }, // RFC Test Case 5 repeats the inputs from RFC 5869 Test Case 2; RFC Test // Case 6 repeats the inputs from RFC 5869 Test Case 3. @@ -1869,6 +1994,22 @@ static const struct HKDFTestVector { kHKDF_okm_tc7_sha512, sizeof(kHKDF_okm_tc7_sha512), AWSLC_NOT_APPROVED, }, + { + EVP_sha512_224, + kHKDF_ikm_tc7, sizeof(kHKDF_ikm_tc7), + NULL, 0, + kHKDF_info_tc7, 0, + kHKDF_okm_tc7_sha512_224, sizeof(kHKDF_okm_tc7_sha512_224), + AWSLC_NOT_APPROVED, + }, + { + EVP_sha512_256, + kHKDF_ikm_tc7, sizeof(kHKDF_ikm_tc7), + NULL, 0, + kHKDF_info_tc7, 0, + kHKDF_okm_tc7_sha512_256, sizeof(kHKDF_okm_tc7_sha512_256), + AWSLC_NOT_APPROVED, + }, }; // Index into the kHKDFTestVectors array; used in the EVP_HKDF_Extract and @@ -3384,6 +3525,71 @@ static const uint8_t kPBKDF2DerivedKey6SHA512[] = { 0x49 // 25 bytes }; +static const uint8_t kPBKDF2DerivedKey1SHA512_224[] = { + 0xb3, 0x4a, 0xb6, 0x26, 0x27, 0x6a, 0x61, 0xce, 0x19, 0xd2, + 0xec, 0xb4, 0xc7, 0xe1, 0x5f, 0x81, 0x98, 0xa2, 0x98, 0x9a // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey2SHA512_224[] = { + 0xb8, 0x87, 0x8a, 0xc5, 0xe4, 0x50, 0x9c, 0x16, 0x5c, 0x1b, + 0x50, 0x89, 0x61, 0xfa, 0x3c, 0x3a, 0xfc, 0xef, 0x3f, 0x37 // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey3SHA512_224[] = { + 0xed, 0x54, 0xaf, 0x69, 0x9c, 0xc3, 0x07, 0xe0, 0x89, 0x65, + 0x09, 0x8b, 0xda, 0x5f, 0xf4, 0xe4, 0x1e, 0xa1, 0x93, 0x1f // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey4SHA512_224[] = { + 0xca, 0x62, 0x62, 0xfa, 0x52, 0xea, 0xd9, 0x88, 0x78, 0x86, + 0x7e, 0x13, 0x75, 0xd0, 0xa5, 0x8a, 0x8a, 0xe0, 0x4d, 0x00 // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey5SHA512_224[] = { + 0x57, 0x3d, 0xf9, 0x67, 0x62, 0xea, 0x7d, 0xa4, 0xf7, + 0x12, 0x31, 0x85, 0x9c, 0xa2, 0x82, 0xef, 0x48, 0x27, + 0x64, 0xad, 0x96, 0x71, 0xc5, 0x27, 0x5c // 25 bytes +}; + +static const uint8_t kPBKDF2DerivedKey6SHA512_224[] = { + 0xcb, 0x42, 0xca, 0xcd, 0x9a, 0xe7, 0xc6, 0x27, 0xb3, 0xa5, 0x04, 0x86, + 0x75, 0xbc, 0xed, 0xd9, 0xdd, 0xf8, 0xa5, 0xfd, 0xfe, 0x7a, 0x6a, 0xc6, + 0xcc // 25 bytes +}; + +static const uint8_t kPBKDF2DerivedKey1SHA512_256[] = { + 0x4b, 0x6a, 0x63, 0x11, 0x7d, 0x3e, 0xc0, 0x03, 0x26, 0x24, 0x61, + 0x60, 0x82, 0xc1, 0xc1, 0x91, 0x2f, 0x56, 0xfa, 0x5f // 20 bytes + +}; + +static const uint8_t kPBKDF2DerivedKey2SHA512_256[] = { + 0xfc, 0xfd, 0x10, 0x8c, 0x99, 0xcc, 0x88, 0x8e, 0xc0, 0xaf, + 0x9f, 0x18, 0x48, 0x85, 0xaf, 0xf5, 0xf0, 0x2d, 0x19, 0xa9 // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey3SHA512_256[] = { + 0xf2, 0xfb, 0xe5, 0xf8, 0xec, 0x36, 0x18, 0xbb, 0x14, 0x52, + 0x79, 0xa8, 0xc6, 0xa8, 0xdf, 0xa4, 0x76, 0xc2, 0x82, 0xa3 // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey4SHA512_256[] = { + 0x25, 0xf5, 0xd3, 0x8f, 0x4b, 0x39, 0xd9, 0x2b, 0x43, 0x6e, + 0x52, 0xf8, 0xa9, 0x2f, 0xb6, 0x9d, 0xf7, 0x6f, 0xb0, 0x14 // 20 bytes +}; + +static const uint8_t kPBKDF2DerivedKey5SHA512_256[] = { + 0x31, 0xcf, 0x94, 0xe3, 0xd8, 0xe3, 0x6a, 0xa1, 0x8d, + 0x40, 0xad, 0x92, 0x65, 0x4a, 0xb8, 0x0f, 0x50, 0x0e, + 0xd7, 0xfb, 0x57, 0x5a, 0x22, 0x15, 0x54 // 25 bytes +}; + +static const uint8_t kPBKDF2DerivedKey6SHA512_256[] = { + 0x4d, 0x68, 0xef, 0xc6, 0x80, 0xd2, 0x30, 0x5d, 0x23, + 0x44, 0x9c, 0x92, 0xc4, 0x3b, 0x5b, 0xb7, 0x7f, 0x75, + 0x03, 0x4d, 0x95, 0xc5, 0x48, 0xaa, 0x44 // 25 bytes +}; + static const struct PBKDF2TestVector { // func is the hash function for PBKDF2 to test. const EVP_MD *(*func)(); @@ -3649,6 +3855,108 @@ static const struct PBKDF2TestVector { sizeof(kPBKDF2DerivedKey6SHA512), kPBKDF2DerivedKey6SHA512, AWSLC_NOT_APPROVED }, + + // SHA512_224 using + // https://github.com/brycx/Test-Vector-Generation/blob/master/PBKDF2/pbkdf2-hmac-sha2-test-vectors.md + { + EVP_sha512_224, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 1, + sizeof(kPBKDF2DerivedKey1SHA512_224), kPBKDF2DerivedKey1SHA512_224, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_224, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 2, + sizeof(kPBKDF2DerivedKey2SHA512_224), kPBKDF2DerivedKey2SHA512_224, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_224, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 4096, + sizeof(kPBKDF2DerivedKey3SHA512_224), kPBKDF2DerivedKey3SHA512_224, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_224, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 16777216, + sizeof(kPBKDF2DerivedKey4SHA512_224), kPBKDF2DerivedKey4SHA512_224, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_224, + kPBKDF2Password2, sizeof(kPBKDF2Password2), + kPBKDF2Salt2, sizeof(kPBKDF2Salt2), + 4096, + sizeof(kPBKDF2DerivedKey5SHA512_224), kPBKDF2DerivedKey5SHA512_224, + AWSLC_APPROVED + }, + { + EVP_sha512_224, + kPBKDF2Password2, sizeof(kPBKDF2Password2), + kPBKDF2Salt2, sizeof(kPBKDF2Salt2), + 999, + sizeof(kPBKDF2DerivedKey6SHA512_224), kPBKDF2DerivedKey6SHA512_224, + AWSLC_NOT_APPROVED + }, + + // SHA512_256 using + // https://github.com/brycx/Test-Vector-Generation/blob/master/PBKDF2/pbkdf2-hmac-sha2-test-vectors.md + { + EVP_sha512_256, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 1, + sizeof(kPBKDF2DerivedKey1SHA512_256), kPBKDF2DerivedKey1SHA512_256, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_256, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 2, + sizeof(kPBKDF2DerivedKey2SHA512_256), kPBKDF2DerivedKey2SHA512_256, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_256, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 4096, + sizeof(kPBKDF2DerivedKey3SHA512_256), kPBKDF2DerivedKey3SHA512_256, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_256, + kPBKDF2Password1, sizeof(kPBKDF2Password1), + kPBKDF2Salt1, sizeof(kPBKDF2Salt1), + 16777216, + sizeof(kPBKDF2DerivedKey4SHA512_256), kPBKDF2DerivedKey4SHA512_256, + AWSLC_NOT_APPROVED + }, + { + EVP_sha512_256, + kPBKDF2Password2, sizeof(kPBKDF2Password2), + kPBKDF2Salt2, sizeof(kPBKDF2Salt2), + 4096, + sizeof(kPBKDF2DerivedKey5SHA512_256), kPBKDF2DerivedKey5SHA512_256, + AWSLC_APPROVED + }, + { + EVP_sha512_256, + kPBKDF2Password2, sizeof(kPBKDF2Password2), + kPBKDF2Salt2, sizeof(kPBKDF2Salt2), + 999, + sizeof(kPBKDF2DerivedKey6SHA512_256), kPBKDF2DerivedKey6SHA512_256, + AWSLC_NOT_APPROVED + }, }; class PBKDF2_ServiceIndicatorTest : public TestWithNoErrors { diff --git a/util/fipstools/acvp/acvptool/subprocess/pbkdf.go b/util/fipstools/acvp/acvptool/subprocess/pbkdf.go index f2fb4fc985..797a3fb4fa 100644 --- a/util/fipstools/acvp/acvptool/subprocess/pbkdf.go +++ b/util/fipstools/acvp/acvptool/subprocess/pbkdf.go @@ -44,11 +44,13 @@ type pbkdfTestResponse struct { // List of supported HMAC Algorithms by NIST var HmacAlgList map[string]bool = map[string]bool{ - "SHA-1": true, - "SHA2-224": true, - "SHA2-256": true, - "SHA2-384": true, - "SHA2-512": true, + "SHA-1": true, + "SHA2-224": true, + "SHA2-256": true, + "SHA2-384": true, + "SHA2-512": true, + "SHA2-512/224": true, + "SHA2-512/256": true, } // Key and salt length mins and maxes as defined by NIST diff --git a/util/fipstools/acvp/acvptool/test/expected/KDA-HKDF.bz2 b/util/fipstools/acvp/acvptool/test/expected/KDA-HKDF.bz2 index 64066f2639..8fbd81b1b4 100644 Binary files a/util/fipstools/acvp/acvptool/test/expected/KDA-HKDF.bz2 and b/util/fipstools/acvp/acvptool/test/expected/KDA-HKDF.bz2 differ diff --git a/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 b/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 index 2e3ba597e4..9b41514e80 100644 Binary files a/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 and b/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 differ diff --git a/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2 b/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2 index dd220977a0..85c619b945 100644 Binary files a/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2 and b/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2 differ diff --git a/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2 b/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2 index fd1da186e3..fd3bda0e10 100644 Binary files a/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2 and b/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2 differ diff --git a/util/fipstools/acvp/modulewrapper/modulewrapper.cc b/util/fipstools/acvp/modulewrapper/modulewrapper.cc index 9ccb38fc5a..f1ac3cee7f 100644 --- a/util/fipstools/acvp/modulewrapper/modulewrapper.cc +++ b/util/fipstools/acvp/modulewrapper/modulewrapper.cc @@ -529,7 +529,9 @@ static bool GetConfig(const Span args[], "SHA2-224", "SHA2-256", "SHA2-384", - "SHA2-512" + "SHA2-512", + "SHA2-512/224", + "SHA2-512/256" ] } ] @@ -1249,7 +1251,9 @@ static bool GetConfig(const Span args[], "SHA2-224", "SHA2-256", "SHA2-384", - "SHA2-512" + "SHA2-512", + "SHA2-512/224", + "SHA2-512/256" ], "macSaltMethods": [ "default", @@ -3210,6 +3214,8 @@ static struct { {"KDA/HKDF/SHA2-256", 4, HKDF}, {"KDA/HKDF/SHA2-384", 4, HKDF}, {"KDA/HKDF/SHA2-512", 4, HKDF}, + {"KDA/HKDF/SHA2-512/224", 4, HKDF}, + {"KDA/HKDF/SHA2-512/256", 4, HKDF}, {"KDA/OneStep/SHA-1", 3, SSKDF_DIGEST}, {"KDA/OneStep/SHA2-224", 3, SSKDF_DIGEST}, {"KDA/OneStep/SHA2-256", 3, SSKDF_DIGEST},