Add ACVP testing for SHA2-512/224 and SHA2-512/256 for PBKDF and HKDF

aws · Oct 24, 2024 · 0ac9a50 · 0ac9a50
1 parent 90d2a34
commit 0ac9a50
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git 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
diff --git a/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2 b/util/fipstools/acvp/acvptool/test/expected/PBKDF.bz2
diff --git a/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2 b/util/fipstools/acvp/acvptool/test/vectors/KDA-HKDF.bz2
diff --git a/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2 b/util/fipstools/acvp/acvptool/test/vectors/PBKDF.bz2
diff --git a/util/fipstools/acvp/modulewrapper/modulewrapper.cc b/util/fipstools/acvp/modulewrapper/modulewrapper.cc
@@ -529,7 +529,9 @@ static bool GetConfig(const Span<const uint8_t> 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<const uint8_t> 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<EVP_sha256>},
     {"KDA/HKDF/SHA2-384", 4, HKDF<EVP_sha384>},
     {"KDA/HKDF/SHA2-512", 4, HKDF<EVP_sha512>},
+    {"KDA/HKDF/SHA2-512/224", 4, HKDF<EVP_sha512_224>},
+    {"KDA/HKDF/SHA2-512/256", 4, HKDF<EVP_sha512_256>},
     {"KDA/OneStep/SHA-1", 3, SSKDF_DIGEST<EVP_sha1>},
     {"KDA/OneStep/SHA2-224", 3, SSKDF_DIGEST<EVP_sha224>},
     {"KDA/OneStep/SHA2-256", 3, SSKDF_DIGEST<EVP_sha256>},