aws-crt 0.1.9 → 0.2.0

data/aws-crt-ffi/crt/aws-lc/tool/digest.cc

@@ -451,6 +451,10 @@ bool SHA512Sum(const std::vector<std::string> &args) {
   return DigestSum(EVP_sha512(), args);
 }
 
+bool SHA512224Sum(const std::vector<std::string> &args) {
+  return DigestSum(EVP_sha512_224(), args);
+}
+
 bool SHA512256Sum(const std::vector<std::string> &args) {
   return DigestSum(EVP_sha512_256(), args);
 }

data/aws-crt-ffi/crt/aws-lc/tool/internal.h

@@ -146,6 +146,7 @@ bool SHA224Sum(const std::vector<std::string> &args);
 bool SHA256Sum(const std::vector<std::string> &args);
 bool SHA384Sum(const std::vector<std::string> &args);
 bool SHA512Sum(const std::vector<std::string> &args);
+bool SHA512224Sum(const std::vector<std::string> &args);
 bool SHA512256Sum(const std::vector<std::string> &args);
 bool Server(const std::vector<std::string> &args);
 bool Sign(const std::vector<std::string> &args);

data/aws-crt-ffi/crt/aws-lc/tool/speed.cc

@@ -337,7 +337,7 @@ static bool SpeedRSA(const std::string &selected) {
           // RSA key, with a new |BN_MONT_CTX| for the public modulus. If we
           // were to use |key| directly instead, then these costs wouldn't be
           // accounted for.
-          BM_NAMESPACE::UniquePtr<RSA> verify_key(RSA_new());
+		  BM_NAMESPACE::UniquePtr<RSA> verify_key(RSA_new());
           if (!verify_key) {
             return false;
           }
@@ -1632,7 +1632,44 @@ static bool SpeedECMUL(const std::string &selected) {
          SpeedECMULCurve("ECMUL P-521", NID_secp521r1, selected) &&
          SpeedECMULCurve("ECMUL secp256k1", NID_secp256k1, selected);
 }
-#endif
+
+#endif // !defined(OPENSSL_1_0_BENCHMARK)
+
+// Only new AWS-LC (>= 22) and new OpenSSL (>= 1.1.1) support FFDH
+#if (!defined(OPENSSL_1_0_BENCHMARK) && !defined(BORINGSSL_BENCHMARK) && !defined(OPENSSL_IS_AWSLC)) || AWSLC_API_VERSION >= 22
+static bool SpeedFFDHGroup(const std::string &name, int nid,
+                           const std::string &selected) {
+  if (!selected.empty() && name.find(selected) == std::string::npos) {
+    return true;
+  }
+
+  BM_NAMESPACE::UniquePtr<DH> server_dh(DH_new_by_nid(nid));
+  if(!DH_generate_key(server_dh.get())) {
+    return false;
+  }
+  const BIGNUM *server_pub = DH_get0_pub_key(server_dh.get());
+
+  int dh_size = DH_size(server_dh.get());
+  std::unique_ptr<uint8_t[]> shared_secret(new uint8_t[dh_size]);
+
+  TimeResults results;
+  if (!TimeFunction(&results, [&shared_secret, &server_pub, &dh_size, &nid]() -> bool {
+        BM_NAMESPACE::UniquePtr<DH> client_dh(DH_new_by_nid(nid));
+        return DH_generate_key(client_dh.get()) &&
+               dh_size == DH_compute_key_padded(shared_secret.get(), server_pub, client_dh.get());
+      })) {
+    return false;
+  }
+
+  results.Print(name);
+  return true;
+}
+
+static bool SpeedFFDH(const std::string &selected) {
+  return SpeedFFDHGroup("FFDH 2048", NID_ffdhe2048, selected) &&
+         SpeedFFDHGroup("FFDH 4096", NID_ffdhe4096, selected);
+}
+#endif //(!defined(OPENSSL_1_0_BENCHMARK) && !defined(BORINGSSL_BENCHMARK) && !defined(OPENSSL_IS_AWSLC)) || AWSLC_API_VERSION >= 22
 
 #if !defined(OPENSSL_BENCHMARK)
 static bool Speed25519(const std::string &selected) {
@@ -2215,6 +2252,7 @@ static bool SpeedSelfTest(const std::string &selected) {
   return true;
 }
 
+#if defined(FIPS_ENTROPY_SOURCE_JITTER_CPU)
 static bool SpeedJitter(size_t chunk_size) {
   struct rand_data *jitter_ec = jent_entropy_collector_alloc(0, JENT_FORCE_FIPS);
 
@@ -2251,6 +2289,7 @@ static bool SpeedJitter(std::string selected) {
   return true;
 }
 #endif
+#endif
 
 static bool SpeedDHcheck(size_t prime_bit_length) {
 
@@ -2349,7 +2388,7 @@ static bool SpeedPKCS8(const std::string &selected) {
     return false;
   }
   results.Print("Ed25519 PKCS#8 v1 decode");
-  
+
   CBB_cleanup(&out);
 
   if (!CBB_init(&out, 1024)) {
@@ -2448,7 +2487,7 @@ static bool parseCommaArgument(std::vector<std::string> &vector,
   return true;
 }
 
-// parseStringVectorToIntegerVector attempts to parse each element of 
+// parseStringVectorToIntegerVector attempts to parse each element of
 // |in_vector| as a size_t integer and adds the result to |out_vector|. Clears
 // |out_vector|.
 static bool parseStringVectorToIntegerVector(
@@ -2588,6 +2627,10 @@ bool Speed(const std::vector<std::string> &args) {
        !SpeedECMUL(selected) ||
        // OpenSSL 1.0 doesn't support Scrypt
        !SpeedScrypt(selected) ||
+#endif
+#if (!defined(OPENSSL_1_0_BENCHMARK) && !defined(BORINGSSL_BENCHMARK) && !defined(OPENSSL_IS_AWSLC)) || AWSLC_API_VERSION >= 22
+       // OpenSSL 1.0 and BoringSSL don't support DH_new_by_nid, NID_ffdhe2048, or NID_ffdhe4096
+       !SpeedFFDH(selected) ||
 #endif
        !SpeedRSA(selected) ||
        !SpeedRSAKeyGen(false, selected) ||
@@ -2641,10 +2684,14 @@ bool Speed(const std::vector<std::string> &args) {
     }
 
 #if defined(AWSLC_FIPS)
-    if (!SpeedSelfTest(selected) ||
-        !SpeedJitter(selected)) {
+    if (!SpeedSelfTest(selected)) {
       return false;
     }
+#if defined(FIPS_ENTROPY_SOURCE_JITTER_CPU)
+    if (!SpeedJitter(selected)) {
+      return false;
+    }
+#endif
 #endif
   }
 

data/aws-crt-ffi/crt/aws-lc/util/all_tests.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"flag"
 	"fmt"
@@ -29,6 +30,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 
 	"boringssl.googlesource.com/boringssl/util/testconfig"
 	"boringssl.googlesource.com/boringssl/util/testresult"
@@ -135,7 +137,7 @@ func gdbOf(path string, args ...string) *exec.Cmd {
 	return exec.Command("xterm", xtermArgs...)
 }
 
-func sdeOf(cpu, path string, args ...string) *exec.Cmd {
+func sdeOf(cpu, path string, args ...string) (*exec.Cmd, context.CancelFunc) {
 	sdeArgs := []string{"-" + cpu}
 	// The kernel's vdso code for gettimeofday sometimes uses the RDTSCP
 	// instruction. Although SDE has a -chip_check_vsyscall flag that
@@ -147,12 +149,18 @@ func sdeOf(cpu, path string, args ...string) *exec.Cmd {
 	}
 	sdeArgs = append(sdeArgs, "--", path)
 	sdeArgs = append(sdeArgs, args...)
-	return exec.Command(*sdePath, sdeArgs...)
+
+	// TODO(CryptoAlg-2154):SDE+ASAN tests will hang without exiting if tests pass for an unknown reason.
+	// Current workaround is to manually cancel the run after 20 minutes and check the output.
+	ctx, cancel := context.WithTimeout(context.Background(), 1200*time.Second)
+
+	return exec.CommandContext(ctx, *sdePath, sdeArgs...), cancel
 }
 
 var (
 	errMoreMallocs = errors.New("child process did not exhaust all allocation calls")
 	errTestSkipped = errors.New("test was skipped")
+	errTestHanging = errors.New("test hangs without exiting")
 )
 
 func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
@@ -164,6 +172,8 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
 		args = append(args, "--no_unwind_tests")
 	}
 	var cmd *exec.Cmd
+	var cancel context.CancelFunc
+	cancelled := false
 	if *useValgrind {
 		cmd = valgrindOf(false, test.ValgrindSupp, prog, args...)
 	} else if *useCallgrind {
@@ -171,7 +181,13 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
 	} else if *useGDB {
 		cmd = gdbOf(prog, args...)
 	} else if *useSDE {
-		cmd = sdeOf(test.cpu, prog, args...)
+		cmd, cancel = sdeOf(test.cpu, prog, args...)
+		defer cancel()
+
+		cmd.Cancel = func() error {
+			cancelled = true
+			return cmd.Process.Kill()
+		}
 	} else {
 		cmd = exec.Command(prog, args...)
 	}
@@ -201,6 +217,7 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
 	if err := cmd.Start(); err != nil {
 		return false, err
 	}
+
 	if err := cmd.Wait(); err != nil {
 		if exitError, ok := err.(*exec.ExitError); ok {
 			switch exitError.Sys().(syscall.WaitStatus).ExitStatus() {
@@ -210,28 +227,36 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
 				fmt.Print(string(outBuf.Bytes()))
 				return false, errTestSkipped
 			}
+			if cancelled {
+				return testPass(outBuf), errTestHanging
+			}
 		}
 		fmt.Print(string(outBuf.Bytes()))
 		return false, err
 	}
 
+
+	return testPass(outBuf), nil
+}
+
+func testPass(outBuf bytes.Buffer) bool {
 	// Account for Windows line-endings.
 	stdout := bytes.Replace(outBuf.Bytes(), []byte("\r\n"), []byte("\n"), -1)
 
 	if bytes.HasSuffix(stdout, []byte("PASS\n")) &&
 		(len(stdout) == 5 || stdout[len(stdout)-6] == '\n') {
-		return true, nil
+		return true
 	}
 
 	// Also accept a googletest-style pass line. This is left here in
 	// transition until the tests are all converted and this script made
 	// unnecessary.
 	if bytes.Contains(stdout, []byte("\n[  PASSED  ]")) {
-		return true, nil
+		return true
 	}
 
 	fmt.Print(string(outBuf.Bytes()))
-	return false, nil
+	return false
 }
 
 func runTest(test test) (bool, error) {
@@ -315,12 +340,7 @@ func (t test) envMsg() string {
 }
 
 func (t test) getGTestShards() ([]test, error) {
-	if *numWorkers == 1 || len(t.Cmd) != 1 {
-		return []test{t}, nil
-	}
-
-	// Only shard the three GTest-based tests.
-	if t.Cmd[0] != "crypto/crypto_test" && t.Cmd[0] != "ssl/ssl_test" {
+	if *numWorkers == 1 || !t.Shard {
 		return []test{t}, nil
 	}
 
@@ -412,6 +432,17 @@ func main() {
 			fmt.Printf("%s was skipped\n", args[0])
 			skipped = append(skipped, test)
 			testOutput.AddSkip(test.longName())
+		} else if testResult.Error == errTestHanging {
+			if !testResult.Passed {
+				fmt.Printf("%s\n", test.longName())
+				fmt.Printf("%s was left hanging without finishing.\n", args[0])
+				failed = append(failed, test)
+				testOutput.AddResult(test.longName(), "FAIL")
+			} else {
+				fmt.Printf("%s\n", test.shortName())
+				fmt.Printf("%s was left hanging, but actually passed\n", args[0])
+				testOutput.AddResult(test.longName(), "PASS")
+			}
 		} else if testResult.Error != nil {
 			fmt.Printf("%s\n", test.longName())
 			fmt.Printf("%s failed to complete: %s\n", args[0], testResult.Error)

data/aws-crt-ffi/crt/aws-lc/util/all_tests.json

@@ -1,7 +1,8 @@
 [
   {
     "cmd": ["crypto/crypto_test"],
-    "valgrind_supp": ["valgrind_suppressions_crypto_test.supp"]
+    "valgrind_supp": ["valgrind_suppressions_crypto_test.supp"],
+    "shard": true
   },
   {
     "cmd": ["crypto/crypto_test", "--gtest_also_run_disabled_tests", "--gtest_filter=BNTest.DISABLED_WycheproofPrimality"],
@@ -16,19 +17,22 @@
     "cmd": ["crypto/crypto_test"],
     "env": ["OPENSSL_armcap=0x0"],
     "target_arch": "arm",
-    "skip_valgrind": true
+    "skip_valgrind": true,
+    "shard": true
   },
   {
     "cmd": ["crypto/crypto_test"],
     "env": ["OPENSSL_armcap=0x1"],
     "target_arch": "arm",
-    "skip_valgrind": true
+    "skip_valgrind": true,
+    "shard": true
   },
   {
     "cmd": ["crypto/crypto_test"],
     "env": ["OPENSSL_armcap=0x3D"],
     "target_arch": "arm",
-    "skip_valgrind": true
+    "skip_valgrind": true,
+    "shard": true
   },
   {
     "comment": "Test OPENSSL_ia32cap on crypto_test for x86, as urandom_test is disabled for shared builds on x86",
@@ -93,7 +97,11 @@
     "skip_valgrind": true
   },
   {
-    "cmd": ["ssl/ssl_test"]
+    "cmd": ["ssl/ssl_test"],
+    "shard": true
+  },
+  {
+    "cmd": ["ssl/integration_test"]
   },
   {
     "cmd": ["crypto/mem_test"]

data/aws-crt-ffi/crt/aws-lc/util/bot/DEPS

@@ -25,19 +25,19 @@ vars = {
   #  cipd describe PACKAGE_NAME -version latest
 
   # infra/3pp/tools/cmake/linux-amd64
-  'cmake_version': 'version:2@3.26.3.chromium.7',
+  'cmake_version': 'version:2@3.26.4.chromium.7',
   # infra/3pp/tools/go/linux-amd64
-  'go_version': 'version:2@1.20.4',
+  'go_version': 'version:2@1.20.5',
   # infra/3pp/tools/perl/windows-amd64
   'perl_version': 'version:2@5.32.1.1',
 
   # Update the following from
   # https://chromium.googlesource.com/chromium/src/+/main/DEPS
   'android_sdk_platform-tools_version': 'RSI3iwryh7URLGRgJHsCvUxj092woTPnKt4pwFcJ6L8C',
-  'android_ndk_revision': '8388a2be5421311dc75c5f937aae13d821a27f3d',
+  'android_ndk_revision': '310956bd122ec2b96049f8d7398de6b717f3452e',
   'libfuzzer_revision': 'debe7d2d1982e540fbd6bd78604bf001753f9e74',
   'libcxx_revision': 'f8279b01085b800724f5c5629dc365b9f040dc53',
-  'libcxxabi_revision': 'd5e79e117ce9adfdcfdc5dde56ee8cddd7742854',
+  'libcxxabi_revision': '899caea3814eeb45c689fc206052968943fd5cb8',
   'ninja_version': 'version:2@1.11.1.chromium.6',
 }
 

data/aws-crt-ffi/crt/aws-lc/util/bot/update_clang.py

@@ -9,6 +9,7 @@ from __future__ import division
 from __future__ import print_function
 
 import os
+import platform
 import shutil
 import subprocess
 import stat
@@ -28,8 +29,8 @@ except ImportError:
 # CLANG_REVISION and CLANG_SUB_REVISION determine the build of clang
 # to use. These should be synced with tools/clang/scripts/update.py in
 # Chromium.
-CLANG_REVISION = 'llvmorg-17-init-10134-g3da83fba'
-CLANG_SUB_REVISION = 1
+CLANG_REVISION = 'llvmorg-17-init-12166-g7586aeab'
+CLANG_SUB_REVISION = 3
 
 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
 
@@ -138,6 +139,11 @@ def UpdateClang():
     cds_full_url = CDS_URL + '/Win/' + cds_file
   elif sys.platform.startswith('linux'):
     cds_full_url = CDS_URL + '/Linux_x64/' + cds_file
+  elif sys.platform == 'darwin':
+    if platform.machine() == 'arm64':
+      cds_full_url = CDS_URL + '/Mac_arm64/' + cds_file
+    else:
+      cds_full_url = CDS_URL + '/Mac/' + cds_file
   else:
     return 0
 

data/aws-crt-ffi/crt/aws-lc/util/codecov-ci.sh

@@ -0,0 +1,82 @@
+#!/usr/bin/env bash
+#
+# Copyright Amazon.com Inc. or its affiliates.  All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0 OR ISC
+#
+
+set -xe
+
+SRC=$(pwd)
+SRC=$(readlink -f "$SRC")
+
+# Sanity check
+DIRNAME=$(basename -- "${SRC}")
+if [[ "${DIRNAME}" != 'aws-lc' ]]; then
+  echo "Script must be executed from aws-lc directory"
+  exit 1
+fi
+
+BUILD="$1"
+if [ -n "$BUILD" ]; then
+  mkdir -p "${BUILD}"
+  BUILD=$(readlink -f "$BUILD")
+  BUILD_HTML=$(mkdir -vp "$BUILD/html")
+else
+  echo "Must specify a build directory."
+  exit 1
+fi
+
+LCOV_PARAMS=()
+LCOV_PARAMS+=(--exclude '*/third_party/*')
+LCOV_PARAMS+=(--exclude '*/tool/*')
+LCOV_PARAMS+=(--exclude '*_test.*')
+LCOV_PARAMS+=(--exclude '*/test_*')
+LCOV_PARAMS+=(--exclude '*_test_*')
+LCOV_PARAMS+=(--exclude '*/gtest_*')
+LCOV_PARAMS+=(--exclude '*/wycheproof_*')
+if [[ "$(uname -s)" == "Darwin" ]]; then
+  LCOV_PARAMS+=(--exclude '/Applications/*')
+  LCOV_IGNORE_ERRORS="inconsistent,inconsistent,gcov,gcov"
+  GENHTML_IGNORE_ERRORS="inconsistent,unmapped"
+else
+  LCOV_PARAMS+=(--exclude '/usr/*')
+  LCOV_PARAMS+=(--exclude '/lib/*')
+  if lcov --version | grep --silent 'LCOV version 1.'; then
+    LCOV_IGNORE_ERRORS="gcov,source,graph"
+  else
+    LCOV_IGNORE_ERRORS="negative,mismatch,unused"
+  fi
+  GENHTML_IGNORE_ERRORS="inconsistent,unmapped"
+fi
+LCOV_PARAMS+=(--ignore-errors ${LCOV_IGNORE_ERRORS})
+
+CMAKE_SETUP_PARAMS=(-DGCOV=1 -DDISABLE_PERL=1 -DBUILD_TESTING=1 -DBUILD_LIBSSL=1 -DCMAKE_BUILD_TYPE=Debug -S "${SRC}")
+
+function generate_coverage() {
+  mkdir -p "${BUILD}/${1}"
+  BUILD_DIR="${BUILD}/${1}"
+
+  # Build
+  cmake ${2} ${CMAKE_SETUP_PARAMS} -B "${BUILD_DIR}"
+  cmake --build "${BUILD_DIR}" --target all_tests
+
+  # Collect initial coverage data
+  lcov --capture "${LCOV_PARAMS[@]}" --initial --directory "${BUILD_DIR}" --output-file "${BUILD}/initial-${1}.info"
+
+  # Run tests
+  cmake --build "${BUILD_DIR}" --target run_tests
+
+  # Collect coverage data and combine it with initial data
+  lcov --capture "${LCOV_PARAMS[@]}" --directory "${BUILD_DIR}" --output-file "${BUILD}/test-${1}.info"
+  lcov "${LCOV_PARAMS[@]}" --add-tracefile "${BUILD}/initial-${1}.info" --add-tracefile "${BUILD}/test-${1}.info" --output-file "${BUILD}/coverage-${1}.info"
+}
+
+# Default x86-64 build/test
+generate_coverage "default" ""
+
+# No Assembly x86-64 build/test
+generate_coverage "no-asm" "-DOPENSSL_NO_ASM=1"
+
+#genhtml --ignore-errors ${GENHTML_IGNORE_ERRORS} --output-directory "${BUILD_HTML}" "${BUILD}"/coverage-*.info
+#open "${BUILD_HTML}"/index.html
+

data/aws-crt-ffi/crt/aws-lc/util/convert_wycheproof/convert_wycheproof.go

@@ -26,11 +26,11 @@ import (
 )
 
 type wycheproofTest struct {
-	Algorithm        string            `json:"algorithm"`
-	GeneratorVersion string            `json:"generatorVersion"`
-	NumberOfTests    int               `json:"numberOfTests"`
-	Notes            map[string]string `json:"notes"`
-	Header           []string          `json:"header"`
+	Algorithm        string         `json:"algorithm"`
+	GeneratorVersion string         `json:"generatorVersion"`
+	NumberOfTests    int            `json:"numberOfTests"`
+	Notes            map[string]any `json:"notes"`
+	Header           []string       `json:"header"`
 	// encoding/json does not support collecting unused keys, so we leave
 	// everything past this point as generic.
 	TestGroups []map[string]any `json:"testGroups"`
@@ -224,6 +224,8 @@ var defaultInputs = []string{
 	"hmac_sha256_test.json",
 	"hmac_sha384_test.json",
 	"hmac_sha512_test.json",
+	"hmac_sha512_224_test.json",
+	"hmac_sha512_256_test.json",
 	"kw_test.json",
 	"kwp_test.json",
 	"primality_test.json",

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/ACVP.md

@@ -82,6 +82,7 @@ The other commands are as follows. (Note that you only need to implement the com
 | HMAC-SHA2-256        | Value to hash, key        | Digest  |
 | HMAC-SHA2-384        | Value to hash, key        | Digest  |
 | HMAC-SHA2-512        | Value to hash, key        | Digest  |
+| HMAC-SHA2-512/224    | Value to hash, key        | Digest  |
 | HMAC-SHA2-512/256    | Value to hash, key        | Digest  |
 | hmacDRBG/<HASH>| Output length, entropy, personalisation, ad1, ad2, nonce | Output |
 | hmacDRBG-reseed/<HASH>| Output length, entropy, personalisation, reseedAD, reseedEntropy, ad1, ad2, nonce | Output |
@@ -97,13 +98,19 @@ The other commands are as follows. (Note that you only need to implement the com
 | SHA2-256             | Value to hash             | Digest  |
 | SHA2-384             | Value to hash             | Digest  |
 | SHA2-512             | Value to hash             | Digest  |
+| SHA2-512/224         | Value to hash             | Digest  |
 | SHA2-512/256         | Value to hash             | Digest  |
+| SHAKE-128            | Value to hash, output len | Digest  |
+| SHAKE-256            | Value to hash, output len | Digest  |
 | SHA-1/MCT            | Initial seed¹             | Digest  |
 | SHA2-224/MCT         | Initial seed¹             | Digest  |
 | SHA2-256/MCT         | Initial seed¹             | Digest  |
 | SHA2-384/MCT         | Initial seed¹             | Digest  |
 | SHA2-512/MCT         | Initial seed¹             | Digest  |
+| SHA2-512/224/MCT     | Initial seed¹             | Digest  |
 | SHA2-512/256/MCT     | Initial seed¹             | Digest  |
+| SHAKE-128/MCT        | Initial seed_, output len | Digest  |
+| SHAKE-256/MCT        | Initial seed_, output len | Digest  |
 | TLSKDF/<1.0\|1.2>/<HASH> | Number output bytes, secret, label, seed1, seed2 | Output |
 
 ¹ The iterated tests would result in excessive numbers of round trips if the module wrapper handled only basic operations. Thus some ACVP logic is pushed down for these tests so that the inner loop can be handled locally. Either read the NIST documentation ([block-ciphers](https://pages.nist.gov/ACVP/draft-celi-acvp-symmetric.html#name-monte-carlo-tests-for-block) [hashes](https://pages.nist.gov/ACVP/draft-celi-acvp-sha.html#name-monte-carlo-tests-for-sha-1)) to understand the iteration count and return values or, probably more fruitfully, see how these functions are handled in the `modulewrapper` directory.

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/subprocess/hash.go

@@ -19,6 +19,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"strings"
 )
 
 // The following structures reflect the JSON of ACVP hash tests. See
@@ -29,13 +30,16 @@ type hashTestVectorSet struct {
 }
 
 type hashTestGroup struct {
-	ID    uint64 `json:"tgId"`
-	Type  string `json:"testType"`
-	Tests []struct {
-		ID        uint64       `json:"tcId"`
-		BitLength uint64       `json:"len"`
-		MsgHex    string       `json:"msg"`
-		LargeMsg  hashLargeMsg `json:"largeMsg"`
+	ID        uint64  `json:"tgId"`
+	Type      string  `json:"testType"`
+	MaxOutLen *uint64 `json:"maxOutLen,omitempty"`
+	MinOutLen *uint64 `json:"minxOutLen,omitempty"`
+	Tests     []struct {
+		ID           uint64       `json:"tcId"`
+		BitLength    uint64       `json:"len"`
+		MsgHex       string       `json:"msg"`
+		OutputLength *uint64      `json:"outLen,omitempty"`
+		LargeMsg     hashLargeMsg `json:"largeMsg"`
 	} `json:"tests"`
 }
 
@@ -97,8 +101,16 @@ func (h *hashPrimitive) Process(vectorSet []byte, m Transactable) (any, error) {
 
 			// http://usnistgov.github.io/ACVP/artifacts/draft-celi-acvp-sha-00.html#rfc.section.3
 			switch group.Type {
+			case "VOT":
+				fallthrough
 			case "AFT":
-				result, err := m.Transact(h.algo, 1, msg)
+				args := [][]byte{}
+				args = append(args, msg)
+				if test.OutputLength != nil {
+					outLenBytes := *test.OutputLength / 8
+					args = append(args, uint32le(uint32(outLenBytes)))
+				}
+				result, err := m.Transact(h.algo, 1, args...)
 				if err != nil {
 					panic(h.algo + " hash operation failed: " + err.Error())
 				}
@@ -109,7 +121,10 @@ func (h *hashPrimitive) Process(vectorSet []byte, m Transactable) (any, error) {
 				})
 
 			case "MCT":
-				if len(msg) != h.size {
+				// MCT tests for conventional digest functions expect message
+				// and digest output lengths to be equivalent, however SHAKE
+				// does not have a predefined output length.
+				if len(msg) != h.size && !strings.HasPrefix(h.algo, "SHAKE") {
 					return nil, fmt.Errorf("MCT test case %d/%d contains message of length %d but the digest length is %d", group.ID, test.ID, len(msg), h.size)
 				}
 

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/subprocess/rsa.go

@@ -126,10 +126,9 @@ func processKeyGen(vectorSet []byte, m Transactable) (any, error) {
 	var ret []rsaKeyGenTestGroupResponse
 
 	for _, group := range parsed.Groups {
-		// GDT means "Generated data test", i.e. "please generate an RSA key".
-		const expectedType = "GDT"
-		if group.Type != expectedType {
-			return nil, fmt.Errorf("RSA KeyGen test group has type %q, but only generation tests (%q) are supported", group.Type, expectedType)
+		// We support both GDT and AFT tests, which are formatted the same and expect the same output.
+		if !(group.Type == "GDT" || group.Type == "AFT") {
+			return nil, fmt.Errorf("RSA KeyGen test group has type %q, but only GDT and AFT tests are supported", group.Type)
 		}
 
 		response := rsaKeyGenTestGroupResponse{

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/subprocess/subprocess.go

@@ -97,16 +97,20 @@ func NewWithIO(cmd *exec.Cmd, in io.WriteCloser, out io.ReadCloser) *Subprocess
 	}
 
 	m.primitives = map[string]primitive{
-		"SHA-1":             &hashPrimitive{"SHA-1", 20},
-		"SHA2-224":          &hashPrimitive{"SHA2-224", 28},
-		"SHA2-256":          &hashPrimitive{"SHA2-256", 32},
-		"SHA2-384":          &hashPrimitive{"SHA2-384", 48},
-		"SHA2-512":          &hashPrimitive{"SHA2-512", 64},
-		"SHA2-512/256":      &hashPrimitive{"SHA2-512/256", 32},
-		"SHA3-224":          &hashPrimitive{"SHA3-224", 28},
-		"SHA3-256":          &hashPrimitive{"SHA3-256", 32},
-		"SHA3-384":          &hashPrimitive{"SHA3-384", 48},
-		"SHA3-512":          &hashPrimitive{"SHA3-512", 64},
+		"SHA-1":        &hashPrimitive{"SHA-1", 20},
+		"SHA2-224":     &hashPrimitive{"SHA2-224", 28},
+		"SHA2-256":     &hashPrimitive{"SHA2-256", 32},
+		"SHA2-384":     &hashPrimitive{"SHA2-384", 48},
+		"SHA2-512":     &hashPrimitive{"SHA2-512", 64},
+		"SHA2-512/224": &hashPrimitive{"SHA2-512/224", 28},
+		"SHA2-512/256": &hashPrimitive{"SHA2-512/256", 32},
+		"SHA3-224":     &hashPrimitive{"SHA3-224", 28},
+		"SHA3-256":     &hashPrimitive{"SHA3-256", 32},
+		"SHA3-384":     &hashPrimitive{"SHA3-384", 48},
+		"SHA3-512":     &hashPrimitive{"SHA3-512", 64},
+		// NOTE: SHAKE does not have a predifined digest output size
+		"SHAKE-128":         &hashPrimitive{"SHAKE-128", -1},
+		"SHAKE-256":         &hashPrimitive{"SHAKE-256", -1},
 		"ACVP-AES-ECB":      &blockCipher{"AES", 16, 2, true, false, iterateAES},
 		"ACVP-AES-CBC":      &blockCipher{"AES-CBC", 16, 2, true, true, iterateAESCBC},
 		"ACVP-AES-CBC-CS3":  &blockCipher{"AES-CBC-CS3", 16, 1, false, true, iterateAESCBC},
@@ -124,6 +128,7 @@ func NewWithIO(cmd *exec.Cmd, in io.WriteCloser, out io.ReadCloser) *Subprocess
 		"HMAC-SHA2-256":     &hmacPrimitive{"HMAC-SHA2-256", 32},
 		"HMAC-SHA2-384":     &hmacPrimitive{"HMAC-SHA2-384", 48},
 		"HMAC-SHA2-512":     &hmacPrimitive{"HMAC-SHA2-512", 64},
+		"HMAC-SHA2-512/224": &hmacPrimitive{"HMAC-SHA2-512/224", 28},
 		"HMAC-SHA2-512/256": &hmacPrimitive{"HMAC-SHA2-512/256", 32},
 		"HMAC-SHA3-224":     &hmacPrimitive{"HMAC-SHA3-224", 28},
 		"HMAC-SHA3-256":     &hmacPrimitive{"HMAC-SHA3-256", 32},

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/test/sha-tests/sha512-224-tests.json

@@ -0,0 +1 @@
+[{"Wrapper": "modulewrapper", "In": "vectors/SHA2-512-224.bz2", "Out": "expected/SHA2-512-224.bz2"}]

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/test/sha-tests/shake-128-tests.json

@@ -0,0 +1 @@
+[{"Wrapper": "modulewrapper", "In": "vectors/SHAKE-128.bz2", "Out": "expected/SHAKE-128.bz2"}]

data/aws-crt-ffi/crt/aws-lc/util/fipstools/acvp/acvptool/test/sha-tests/shake-256-tests.json

@@ -0,0 +1 @@
+[{"Wrapper": "modulewrapper", "In": "vectors/SHAKE-256.bz2", "Out": "expected/SHAKE-256.bz2"}]