Merge 325286187fe076994e7d9862fdf00d7a9ccbcbbc into 4215362acbf69b88fe1777c4c052f154e29f9897

Signed-off-by: Abhinav Saxena <abhinav.saxena@thalesgroup.com>

tests/ACVP_Vectors/fetch_values.sh

@@ -3,7 +3,7 @@
 
 # This script fetches the ACVP vectors for ML-DSA and ML-KEM
 
-rel_name="1.1.0.39"
+rel_name="1.1.0.40"
 rel_url="https://github.com/usnistgov/ACVP-Server/archive/refs/tags/v$rel_name.tar.gz"
 fld_vecs="ACVP-Server-$rel_name/gen-val/json-files"
 

tests/test_acvp_vectors.py

@@ -55,7 +55,7 @@ def test_acvp_vec_kem_encdec_aft(kem_name):
 
         variantFound = False
         for variant in ml_kem_encdec_acvp["testGroups"]:
-            if variant["parameterSet"] == kem_name and variant["testType"] == "AFT":
+            if variant["parameterSet"] == kem_name and variant["function"] == "encapsulation":
                 variantFound = True
                 for testCase in variant["tests"]:
                     #prompt
@@ -85,10 +85,10 @@ def test_acvp_vec_kem_encdec_val(kem_name):
 
         variantFound = False
         for variant in ml_kem_encdec_acvp["testGroups"]:
-            if variant["parameterSet"] == kem_name and variant["testType"] == "VAL":
+            if variant["parameterSet"] == kem_name and variant["function"] == "decapsulation":
                 variantFound = True
-                sk = variant["dk"]
                 for testCase in variant["tests"]:
+                    sk = testCase["dk"]
                     #prompt
                     c = testCase["c"]
                     #expected results