restore support for AWS-LC [ci skip]

Experimental. Not working.

The goal is to make it possible to test and compare it with BoringSSL.

Also:

- disable Perl (it's not present on Alpine by default).
  Needed for FIPS only.

- add new Windows-specific AWS-LC build issue where it force-sets
  `_WIN32_WINNT` to Win7.

- address the above by patching out `_WIN32_WINNT` force-set.

- address the above by bumping Windows target to Win7.
  Yet to be seen if this is a true requirement or an arbitrary
  value that's newer than the default they intended to avoid in
  some mingw builds.

- fix clang 19? deprecation warning triggered in mingw-w64 builds
  ```
  /usr/lib/llvm-19/lib/clang/19/include/mm3dnow.h:16:2: error: "The <mm3dnow.h> header is deprecated, and 3dNow! intrinsics are unsupported. For other intrinsics, include <x86intrin.h>, instead." [-Werror,-W#warnings]
     16 | #warning "The <mm3dnow.h> header is deprecated, and 3dNow! intrinsics are unsupported. For other intrinsics, include <x86intrin.h>, instead."
        |  ^
  1 error generated.
  ```
  https://github.com/curl/curl-for-win/actions/runs/11714432529/job/32629108727#step:3:4286

- patch AWS-LC to avoid `-Werror,-Wcast-function-type-mismatch`
  on Windows:
  ```
  /path/to/awslc/crypto/rand_extra/windows.c:68:22: error: cast from 'FARPROC' (aka 'long long (*)()')
  to 'ProcessPrngFunction' (aka 'int (*)(unsigned char *, unsigned long long)') converts
  to incompatible function type [-Werror,-Wcast-function-type-mismatch]
     68 |   g_processprng_fn = (ProcessPrngFunction)GetProcAddress(hmod, "ProcessPrng");
        |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  1 error generated.
  ```
  https://github.com/curl/curl-for-win/actions/runs/11712448493/job/32623148501#step:3:3996
  Upstream report and patch:
  aws/aws-lc#1971
  aws/aws-lc#1972

Unfixed issues:

- curl cmake is trying and failing to detect ECH support:
  ```
  -- Looking for SSL_set1_ech_config_list - not found
  [...]
           "/usr/bin/ld.lld-19" --sysroot=/usr/x86_64-w64-mingw32 -m i386pep -Bdynamic -o cmTC_d97c0.exe /usr/x86_64-w64-mingw32/lib/crt2.o /usr/x86_64-w64-mingw32/lib/crtbegin.o -L/usr/lib/gcc/x86_64-w64-mingw32/13-posix -L/usr/x86_64-w64-mingw32/x86_64-w64-mingw32/lib -L/usr/x86_64-w64-mingw32/x86_64-w64-mingw32/mingw/lib -L/usr/x86_64-w64-mingw32/lib -lucrt -Xlink=-cetcompat --gc-sections --icf=all -s -Bstatic -Map curl.map -lpthread CMakeFiles/cmTC_d97c0.dir/CheckSymbolExists.c.obj --out-implib libcmTC_d97c0.dll.a --major-image-version 0 --minor-image-version 0 /home/runner/work/curl-for-win/curl-for-win/awslc/_x64-win-ucrt/usr/lib/libssl.a /home/runner/work/curl-for-win/curl-for-win/awslc/_x64-win-ucrt/usr/lib/libcrypto.a /home/runner/work/curl-for-win/curl-for-win/zlib/_x64-win-ucrt/usr/lib/libz.a -lws2_32 -lbcrypt -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex -lmsvcrt -ladvapi32 -lshell32 -luser32 -lkernel32 -lmingw32 -lgcc -lgcc_eh -lmoldname -lmingwex -lmsvcrt -lkernel32 /usr/x86_64-w64-mingw32/lib/crtend.o
          ld.lld-19: error: libcrypto.a(err.o): invalid symbol index in addrsig section
          clang-19: error: linker command failed with exit code 1 (use -v to see invocation)
  ```
  https://github.com/curl/curl-for-win/actions/runs/11714665857/job/32629738265#step:3:6997

Author: vszakats

_build.sh

@@ -42,6 +42,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
 #        nohttp     build without HTTP and proxy support
 #        nocookie   build without cookie support
 #        imap       build with IMAP protocol (for zero, bldtst or pico build)
+#        awslc      build with AWS-LC
 #        boringssl  build with BoringSSL
 #        libressl   build with LibreSSL
 #        quictls    build with quictls
@@ -177,7 +178,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
 #   nghttp3          cmake
 #   ngtcp2           cmake
 #   openssl/quictls  proprietary
-#   boringssl        cmake
+#   boringssl/awslc  cmake
 #   libressl         cmake
 #   libssh           cmake
 #   libssh2          cmake-unity
@@ -515,6 +516,8 @@ build_single_target() {
   export _OPENSSL=''; boringssl=0
   if   [[ "${_DEPS}" = *'libressl'* ]]; then
     _OPENSSL='libressl'
+  elif [[ "${_DEPS}" = *'awslc'* ]]; then
+    _OPENSSL='awslc'; boringssl=1
   elif [[ "${_DEPS}" = *'boringssl'* ]]; then
     _OPENSSL='boringssl'; boringssl=1
   elif [[ "${_DEPS}" = *'quictls'* ]]; then
@@ -819,7 +822,11 @@ build_single_target() {
 
   if [ "${_OS}" = 'win' ]; then
 
-    _CPPFLAGS_GLOBAL+=' -D_WIN32_WINNT=0x0600'  # Windows Vista
+    if [ "${_OPENSSL}" = 'awslc' ]; then
+      _CPPFLAGS_GLOBAL+=' -D_WIN32_WINNT=0x0700'  # Windows 7
+    else
+      _CPPFLAGS_GLOBAL+=' -D_WIN32_WINNT=0x0600'  # Windows Vista
+    fi
 
     if [ "${_HOST}" != "${_OS}" ] || \
        [ "${unamem}" != "${_machine}" ]; then
@@ -983,7 +990,7 @@ build_single_target() {
     _CXXFLAGS_GLOBAL+=' -fvisibility=hidden'
   fi
 
-  if [ "${_OPENSSL}" = 'boringssl' ]; then
+  if [ "${boringssl}" = '1' ]; then
     _LDFLAGS_GLOBAL+=' -Wl,-Bstatic -lstdc++'
     if [ "${_TOOLCHAIN}" = 'llvm-mingw' ]; then
       _LDFLAGS_GLOBAL+=' -stdlib=libc++'
@@ -1303,7 +1310,7 @@ build_single_target() {
     _CFLAGS_GLOBAL+=' -fno-ident'
   fi
 
-  # for boringssl
+  # for boringssl/awslc
   export _STRIP_BINUTILS=''
   if [ "${_OS}" = 'win' ] && [ "${_CC}" = 'llvm' ]; then
     if [ "${_CPU}" = 'x64' ] || \
@@ -1314,7 +1321,7 @@ build_single_target() {
       if command -v "${tmp}" >/dev/null 2>&1; then
         _STRIP_BINUTILS="$(PATH="${_ori_path}" command -v "${tmp}" 2>/dev/null)"
       else
-        echo "! Warning: binutils strip tool '${tmp}' not found. BoringSSL libs may not be reproducible."
+        echo "! Warning: binutils strip tool '${tmp}' not found. BoringSSL/AWC-LC libs may not be reproducible."
       fi
     fi
   fi
@@ -1452,7 +1459,7 @@ build_single_target() {
       fi
       ccrsdir="${ccrtdir}"
       ccrtlib="-Wl,-lgcc -Wl,-lgcc_eh"
-      if [ "${_OPENSSL}" != 'boringssl' ]; then
+      if [ "${boringssl}" != '1' ]; then
         _LDFLAGS_CXX_GLOBAL+=' -nostdlib++'
       fi
       ccridir="$("clang${_CCSUFFIX}" -print-resource-dir)"                             # /usr/lib/llvm-13/lib/clang/13.0.1
@@ -1536,7 +1543,7 @@ build_single_target() {
         fi
         _LDFLAGS_GLOBAL+=' -rtlib=compiler-rt'
       fi
-      if [ "${_OPENSSL}" != 'boringssl' ]; then
+      if [ "${boringssl}" != '1' ]; then
         _LDFLAGS_CXX_GLOBAL+=' -nostdlib++'
       fi
     fi
@@ -1689,6 +1696,7 @@ build_single_target() {
   bld cares               "${CARES_VER_}"
   bld libpsl             "${LIBPSL_VER_}"
   bld nghttp3           "${NGHTTP3_VER_}"
+  bld awslc               "${AWSLC_VER_}" boringssl
   bld boringssl       "${BORINGSSL_VER_}"
   bld libressl         "${LIBRESSL_VER_}"
   bld quictls           "${QUICTLS_VER_}" openssl

_ci-linux-alpine.sh

@@ -15,7 +15,7 @@ extra=''
 
 if [[ "${CW_CONFIG:-}" = *'win'* ]]; then
   extra+=' mingw-w64-gcc-base wine'
-  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]]; then
+  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
     extra+=' nasm'
   fi
 elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then

_ci-linux-debian.sh

@@ -27,7 +27,7 @@ if [[ "${CW_CONFIG:-}" = *'win'* ]]; then
   extra+=' mingw-w64 wine64'
   # https://tracker.debian.org/pkg/osslsigncode
   extra+=' osslsigncode'
-  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]]; then
+  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
     extra+=' nasm'
   fi
 elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then

_ci-mac-homebrew.sh

@@ -14,7 +14,7 @@ fi
 
 if [[ "${CW_CONFIG:-}" = *'win'* ]]; then
   extra+=' mingw-w64 osslsigncode wine-stable openssh'
-  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]]; then
+  if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
     extra+=' nasm'
   fi
 elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then

_ci-win-msys2.sh

@@ -13,6 +13,11 @@ pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
 
 [[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
 pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
-  mingw-w64-{x86_64,i686}-{go,nasm}
+  mingw-w64-{x86_64,i686}-go
+
+if [[ "${CW_CONFIG:-}" = *'boringssl'* ]] || [[ "${CW_CONFIG:-}" = *'awslc'* ]]; then
+  pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
+    mingw-w64-{x86_64,i686}-nasm
+fi
 
 ./_build.sh

_dl.sh

@@ -112,6 +112,12 @@ cat <<EOF
     "sig": ".asc",
     "keys": "A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5"
   },
+  {
+    "name": "awslc",
+    "url": "https://github.com/aws/aws-lc/archive/refs/tags/v{ver}.tar.gz",
+    "redir": "redir",
+    "tag": "v\\\\d+\\\\.\\\\d+\\\\.\\\\d+$"
+  },
   {
     "name": "boringssl",
     "url": "https://github.com/google/boringssl/releases/download/{ver}/boringssl-{ver}.tar.gz",
@@ -677,6 +683,9 @@ if [[ ! "${_CONFIG}" =~ (zero|bldtst) ]]; then
   if   [[ "${_CONFIG}" = *'libressl'* ]]; then
     _DEPS+=' libressl'
     need_cacert=1
+  elif [[ "${_CONFIG}" = *'awslc'* ]]; then
+    _DEPS+=' awslc'
+    need_cacert=1
   elif [[ "${_CONFIG}" = *'boringssl'* ]]; then
     _DEPS+=' boringssl'
     need_cacert=1
@@ -765,6 +774,10 @@ if [[ "${_DEPS}" = *'libressl'* ]]; then
   live_dl libressl "${LIBRESSL_VER_}"
   live_xt libressl "${LIBRESSL_HASH}"
 fi
+if [[ "${_DEPS}" = *'awslc'* ]]; then
+  live_dl awslc "${AWSLC_VER_}"
+  live_xt awslc "${AWSLC_HASH}"
+fi
 if [[ "${_DEPS}" = *'boringssl'* ]]; then
   live_dl boringssl "${BORINGSSL_VER_}"
   live_xt boringssl "${BORINGSSL_HASH}"

_versions.sh

@@ -41,6 +41,8 @@ export OPENSSL_VER_='3.4.0'
 export OPENSSL_HASH=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf
 export BORINGSSL_VER_='0.20241024.0'
 export BORINGSSL_HASH=7474771bad71aaef19a58ba8bc618834767b5713cc3c479a9f502ab94ef89391
+export AWSLC_VER_='1.37.0'
+export AWSLC_HASH=d5ba1bd922247ce8bdd9139289bf5a021237b121e1f29a323c0ef1730cb1ed07
 export LIBRESSL_VER_='4.0.0'
 export LIBRESSL_HASH=4d841955f0acc3dfc71d0e3dd35f283af461222350e26843fea9731c0246a1e4
 export OSSLSIGNCODE_VER_='2.9.0'

appveyor.yml

@@ -9,16 +9,19 @@ branches:
     - 'main-libressl'
     - 'main-quictls'
     - 'main-boringssl'
+    - 'main-awslc'
     - 'main-mini'
     - 'dev'
     - 'dev-libressl'
     - 'dev-quictls'
     - 'dev-boringssl'
+    - 'dev-awslc'
     - 'dev-mini'
     - 'test'
     - 'test-libressl'
     - 'test-quictls'
     - 'test-boringssl'
+    - 'test-awslc'
     - 'test-mini'
 # https://www.appveyor.com/docs/build-environment/#build-worker-images
 # https://www.appveyor.com/docs/linux-images-software/

awslc.dev.patch

@@ -0,0 +1 @@
+awslc.patch

awslc.patch

@@ -0,0 +1,11 @@
+--- a/crypto/rand_extra/windows.c
++++ b/crypto/rand_extra/windows.c
+@@ -65,7 +65,7 @@
+   if (hmod == NULL) {
+     abort();
+   }
+-  g_processprng_fn = (ProcessPrngFunction)GetProcAddress(hmod, "ProcessPrng");
++  g_processprng_fn = (ProcessPrngFunction)(void(*)(void))GetProcAddress(hmod, "ProcessPrng");
+   if (g_processprng_fn == NULL) {
+     abort();
+   }

awslc.test.patch

@@ -0,0 +1 @@
+awslc.patch

boringssl.sh

@@ -12,6 +12,7 @@
 #   https://github.com/mirror/mingw-w64/commit/ad2b46ca1e603872f62f83eaaff9e5ef77c99500
 # - as of 4fe29ebc hacks are needed to avoid build issues. grep for the hash
 #   to find them.
+#   Does not affect AWS-LC.
 # - BoringSSL also supports native-Windows threading, but it uses
 #   MSVC-specific hacks, thus cannot be enabled for MinGW:
 #     https://github.com/google/boringssl/blob/master/crypto/thread_win.c
@@ -32,6 +33,14 @@
 #   This is fixed in AWS-LC fork with a CMake option.
 # - Objects built on different OSes result in a few byte differences.
 #   e.g. windows.c.obj, a_utf8.c.obj. But not a_octet.c.obj.
+# - AWS-LC force-sets _WIN32_WINNT to _WIN32_WINNT_WIN7. The Windows target
+#   should be up to the builder and not something for the project to set
+#   unconditionally. If the selected version is too old, the build should
+#   bail out. Either way, AWS-LC requires Win7, which is higher than the
+#   Vista curl-for-win guarantees. But only for MinGW builds, as a way
+#   to bump up the default, possibly as a workaround.
+
+# https://github.com/aws/aws-lc
 
 # https://boringssl.googlesource.com/boringssl/
 # https://bugs.chromium.org/p/boringssl/issues/list
@@ -48,7 +57,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
 
 export _NAM _VER _OUT _BAS _DST
 
-_NAM="$(basename "$0" | cut -f 1 -d '.')"
+_NAM="$(basename "$0" | cut -f 1 -d '.')"; [ -n "${2:-}" ] && _NAM="$2"
 _VER="$1"
 
 (
@@ -57,6 +66,7 @@ _VER="$1"
   [ "${CW_DEV_INCREMENTAL:-}" != '1' ] && rm -r -f "${_PKGDIR:?}" "${_BLDDIR:?}"
 
   CFLAGS="-ffile-prefix-map=$(pwd)="
+  CPPFLAGS=''
   LIBS='-lpthread'  # for tests
   options=''
 
@@ -92,24 +102,39 @@ _VER="$1"
   fi
 
   if [ "${CW_DEV_INCREMENTAL:-}" != '1' ] || [ ! -d "${_BLDDIR}" ]; then
-    # Patch the build to omit debug info. This results in 50% smaller footprint
-    # for each ${_BLDDIR}. As of llvm 14.0.6, llvm-strip does an imperfect job
-    # when deleting -ggdb debug info and ends up having ~100 bytes of metadata
-    # different (e.g. in windows.c.obj, a_utf8.c.obj, but not a_octet.c.obj)
-    # across build host platforms. Fixed either by patching out this flag here,
-    # or by running binutils strip on the result. binutils strip do not support
-    # ARM64, so patch it out in that case.
-    # Enable it for all targets for consistency.
-    sed -i.bak 's/ -ggdb//g' ./CMakeLists.txt
-
-    # Skip building test components
-    echo 'set_target_properties(decrepit bssl_shim test_fips boringssl_gtest test_support_lib urandom_test crypto_test ssl_test decrepit_test all_tests pki pki_test run_tests PROPERTIES EXCLUDE_FROM_ALL TRUE)' >> ./CMakeLists.txt
+    if [ "${_NAM}" = 'awslc' ]; then
+      options+=' -DBUILD_TESTING=OFF'
+      options+=' -DBUILD_TOOL=OFF'
+      options+=' -DDISABLE_GO=ON'
+      options+=' -DDISABLE_PERL=ON'
+
+      if [ "${_OS}" = 'win' ]; then
+        # Avoid deprecation warning triggered by mingw-w64 inside clang 19
+        CPPFLAGS+=' -D_CLANG_DISABLE_CRT_DEPRECATION_WARNINGS'
+      fi
+
+      # Patch out to avoid redefinition errors
+      sed -i.bak 's/-D_WIN32_WINNT=_WIN32_WINNT_WIN7//g' ./CMakeLists.txt
+    else
+      # Patch the build to omit debug info. This results in 50% smaller footprint
+      # for each ${_BLDDIR}. As of llvm 14.0.6, llvm-strip does an imperfect job
+      # when deleting -ggdb debug info and ends up having ~100 bytes of metadata
+      # different (e.g. in windows.c.obj, a_utf8.c.obj, but not a_octet.c.obj)
+      # across build host platforms. Fixed either by patching out this flag here,
+      # or by running binutils strip on the result. binutils strip do not support
+      # ARM64, so patch it out in that case.
+      # Enable it for all targets for consistency.
+      sed -i.bak 's/ -ggdb//g' ./CMakeLists.txt
+
+      # Skip building test components
+      echo 'set_target_properties(decrepit bssl_shim test_fips boringssl_gtest test_support_lib urandom_test crypto_test ssl_test decrepit_test all_tests pki pki_test run_tests PROPERTIES EXCLUDE_FROM_ALL TRUE)' >> ./CMakeLists.txt
+    fi
 
     # shellcheck disable=SC2086
     cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_CXX_GLOBAL} ${options} \
       '-DBUILD_SHARED_LIBS=OFF' \
-      "-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
-      "-DCMAKE_CXX_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
+      "-DCMAKE_C_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS}" \
+      "-DCMAKE_CXX_FLAGS=${_CFLAGS_GLOBAL_CMAKE} ${_CFLAGS_GLOBAL} ${_CPPFLAGS_GLOBAL} ${CFLAGS} ${CPPFLAGS} ${_LDFLAGS_GLOBAL} ${LIBS} ${_CXXFLAGS_GLOBAL} ${_LDFLAGS_CXX_GLOBAL}"
   fi
 
   cmake --build "${_BLDDIR}"  # --verbose

curl.sh

@@ -195,10 +195,14 @@ _VER="$1"
       fi
     fi
     options+=' -DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG=ON'
-    if [ "${_OPENSSL}" = 'boringssl' ]; then
-      CPPFLAGS+=" -DCURL_BORINGSSL_VERSION=\\\"${BORINGSSL_VER_}\\\""
-      options+=' -DUSE_HTTPSRR=ON -DUSE_ECH=ON'
-      options+=' -DHAVE_BORINGSSL=1 -DHAVE_AWSLC=0'  # fast-track configuration
+    if [ "${_OPENSSL}" = 'boringssl' ] || [ "${_OPENSSL}" = 'awslc' ]; then
+      if [ "${_OPENSSL}" = 'boringssl' ]; then
+        CPPFLAGS+=" -DCURL_BORINGSSL_VERSION=\\\"${BORINGSSL_VER_}\\\""
+        options+=' -DUSE_HTTPSRR=ON -DUSE_ECH=ON'
+        options+=' -DHAVE_BORINGSSL=1 -DHAVE_AWSLC=0'  # fast-track configuration
+      else
+        options+=' -DHAVE_BORINGSSL=0 -DHAVE_AWSLC=1'  # fast-track configuration
+      fi
       LIBS+=' -lpthread'
       h3=1
     else

libssh.sh

@@ -41,7 +41,7 @@ _VER="$1"
 
   if [ -n "${_OPENSSL}" ] && [ -d "../${_OPENSSL}/${_PP}" ]; then
     options+=" -DOPENSSL_ROOT_DIR=${_TOP}/${_OPENSSL}/${_PP}"
-    if [ "${_OPENSSL}" = 'boringssl' ]; then
+    if [ "${_OPENSSL}" = 'boringssl' ] || [ "${_OPENSSL}" = 'awslc' ]; then
 
       # FIXME (upstream):
       # - It collides with wincrypt.h macros. Workaround:

libssh2.sh

@@ -28,7 +28,7 @@ _VER="$1"
   if [ -n "${_OPENSSL}" ] && [ -d "../${_OPENSSL}/${_PP}" ]; then
     options+=' -DCRYPTO_BACKEND=OpenSSL'
     options+=" -DOPENSSL_ROOT_DIR=${_TOP}/${_OPENSSL}/${_PP}"
-    if [ "${_OPENSSL}" = 'boringssl' ]; then
+    if [ "${_OPENSSL}" = 'boringssl' ] || [ "${_OPENSSL}" = 'awslc' ]; then
       LIBS+=' -lpthread'
     fi
     if [ "${_OS}" = 'win' ]; then

ngtcp2.sh

@@ -29,7 +29,7 @@ _VER="$1"
   # prevents building examples, which may fail for reasons or just take extra time.
   options+=' -DLIBEV_INCLUDE_DIR='
 
-  if [ "${_OPENSSL}" = 'boringssl' ]; then
+  if [ "${_OPENSSL}" = 'boringssl' ] || [ "${_OPENSSL}" = 'awslc' ]; then
     options+=' -DENABLE_OPENSSL=OFF'
     options+=' -DENABLE_BORINGSSL=ON'
     options+=" -DBORINGSSL_INCLUDE_DIR=${_TOP}/${_OPENSSL}/${_PP}/include"