Use latest EMSDK

Author: justsmth

.github/workflows/wasm.yml .github/workflows/emscripten.yml.github/workflows/wasm.yml renamed to .github/workflows/emscripten.yml

@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 env:
-  EMSDK_VERSION: "3.1.51"
+  EMSDK_VERSION: "4.0.23"
 
 jobs:
   wasm-build-test:
@@ -43,8 +43,8 @@ jobs:
           emcc --version
           node --version
 
-      - name: Run WASM tests
+      - name: Run Emscripten tests
         env:
           EMSDK_PATH: ${{ env.EMSDK }}
         run: |
-          ./tests/ci/run_wasm_tests.sh
+          ./tests/ci/run_emscripten_tests.sh

.gitignore

@@ -3,7 +3,7 @@ cmake-build-debug/
 build/
 build32/
 build64/
-build-fips/
+build-*/
 *_BUILD_ROOT/
 ssl/test/runner/runner
 *.pyc

crypto/CMakeLists.txt

@@ -702,8 +702,9 @@ endif()
 #
 # For now we assume embedded OSes do not have threads. Additionally, the Threads
 # package does not work with Android, but Android does not require any extra
-# parameters to link pthreads.
-if(NOT CMAKE_SYSTEM_NAME MATCHES "^(Generic|Android)$")
+# parameters to link pthreads. Emscripten provides its own pthread implementation
+# via Web Workers and SharedArrayBuffer, configured through compiler flags.
+if(NOT CMAKE_SYSTEM_NAME MATCHES "^(Generic|Android|Emscripten)$")
   find_package(Threads REQUIRED)
   target_link_libraries(crypto PUBLIC Threads::Threads)
 endif()

tests/ci/run_wasm_tests.sh tests/ci/run_emscripten_tests.shtests/ci/run_wasm_tests.sh renamed to tests/ci/run_emscripten_tests.sh

@@ -2,7 +2,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR ISC
 
-# CI script for testing AWS-LC WASM builds using Emscripten
+# CI script for testing AWS-LC Emscripten builds
 #
 # This script builds AWS-LC for WebAssembly and runs the crypto_test and ssl_test
 # test binaries using Node.js.
@@ -96,7 +96,7 @@ function run_wasm_build {
 
     ${CMAKE_COMMAND} \
         -GNinja \
-        -DCMAKE_TOOLCHAIN_FILE="${SRC_ROOT}/util/wasm-toolchain.cmake" \
+        -DCMAKE_TOOLCHAIN_FILE="${SRC_ROOT}/util/emscripten-toolchain.cmake" \
         -DCMAKE_BUILD_TYPE="${build_type}" \
         -DDISABLE_CPU_JITTER_ENTROPY=ON \
         -DDISABLE_GO=ON \
@@ -129,11 +129,11 @@ function verify_wasm_artifacts {
     fi
     echo "Found: ${BUILD_ROOT}/ssl/libssl.a"
 
-    # Check for test executables (Emscripten generates JS wrapper files without extension)
+    # Check for test executables (Emscripten generates .js wrapper files and .wasm binaries)
     local test_binaries=(
-        "crypto/crypto_test"
-        "crypto/urandom_test"
-        "ssl/ssl_test"
+        "crypto/crypto_test.js"
+        "crypto/urandom_test.js"
+        "ssl/ssl_test.js"
     )
 
     for test_binary in "${test_binaries[@]}"; do
@@ -193,17 +193,17 @@ function run_wasm_tests {
     local failed_tests=()
 
     # Run crypto_test (excluding fork and socket tests)
-    if ! run_single_wasm_test "crypto/crypto_test" --gtest_filter="${WASM_GTEST_FILTER}"; then
+    if ! run_single_wasm_test "crypto/crypto_test.js" --gtest_filter="${WASM_GTEST_FILTER}"; then
         failed_tests+=("crypto_test")
     fi
 
     # Run urandom_test
-    if ! run_single_wasm_test "crypto/urandom_test"; then
+    if ! run_single_wasm_test "crypto/urandom_test.js"; then
         failed_tests+=("urandom_test")
     fi
 
     # Run ssl_test (excluding fork and socket tests)
-    if ! run_single_wasm_test "ssl/ssl_test" --gtest_filter="${WASM_GTEST_FILTER}"; then
+    if ! run_single_wasm_test "ssl/ssl_test.js" --gtest_filter="${WASM_GTEST_FILTER}"; then
         failed_tests+=("ssl_test")
     fi
 

util/wasm-toolchain.cmake util/emscripten-toolchain.cmakeutil/wasm-toolchain.cmake renamed to util/emscripten-toolchain.cmake

@@ -1,11 +1,11 @@
-# AWS-LC WASM Toolchain File
+# AWS-LC Emscripten Toolchain File
 #
 # This is a wrapper toolchain file for building AWS-LC with Emscripten.
 # It includes the standard Emscripten toolchain and configures pthread support
 # for multithreaded WASM builds.
 #
 # Usage:
-#   cmake -DCMAKE_TOOLCHAIN_FILE=util/wasm-toolchain.cmake ...
+#   cmake -DCMAKE_TOOLCHAIN_FILE=util/emscripten-toolchain.cmake ...
 #
 # Prerequisites:
 #   - EMSDK environment must be sourced before running cmake
@@ -27,20 +27,16 @@ if(NOT EXISTS "${EMSCRIPTEN_TOOLCHAIN_FILE}")
     message(FATAL_ERROR "Emscripten toolchain file not found at: ${EMSCRIPTEN_TOOLCHAIN_FILE}")
 endif()
 
+# The Emscripten toolchain file defaults CMAKE_SYSTEM_PROCESSOR to "x86" via
+# EMSCRIPTEN_SYSTEM_PROCESSOR. We must set this BEFORE including the toolchain
+# to ensure AWS-LC's architecture detection uses "generic" instead of x86,
+# which would add incompatible flags like -msse2.
+set(EMSCRIPTEN_SYSTEM_PROCESSOR wasm32)
+
 # Include the standard Emscripten toolchain file
+# This sets CMAKE_SYSTEM_NAME to "Emscripten" and CMAKE_CROSSCOMPILING to TRUE.
 include("${EMSCRIPTEN_TOOLCHAIN_FILE}")
 
-# Override CMAKE_SYSTEM_NAME to "Generic" so AWS-LC treats this as an embedded
-# target and skips the pthread requirement check in its CMakeLists.txt.
-# The Emscripten toolchain sets this to "Emscripten" but AWS-LC's CMakeLists.txt
-# only recognizes "Generic" and "Android" as systems that don't require pthreads
-# validation (we handle pthreads via Emscripten's own implementation).
-set(CMAKE_SYSTEM_NAME Generic)
-set(CMAKE_SYSTEM_PROCESSOR wasm32)
-
-# Ensure cross-compiling is still set
-set(CMAKE_CROSSCOMPILING TRUE)
-
 # Enable pthread support for multithreaded WASM builds.
 # Emscripten implements pthreads using Web Workers and SharedArrayBuffer.
 # This requires:
@@ -83,4 +79,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 #   - The main browser thread cannot block (Atomics.wait doesn't work there)
 #   - Moving main() to a worker allows proper blocking on mutexes, joins, etc.
 #   - The main thread remains responsive for handling proxied operations
-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sENVIRONMENT=node,worker -sNODERAWFS=1 -sEXIT_RUNTIME=1 -sALLOW_MEMORY_GROWTH=1 -sINITIAL_MEMORY=134217728 -sASSERTIONS=1 -sSTACK_SIZE=1048576 -pthread -sPTHREAD_POOL_SIZE=8 -sPROXY_TO_PTHREAD -Wno-pthreads-mem-growth")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -sENVIRONMENT=node,worker -sNODERAWFS=1 -sEXIT_RUNTIME=1 -sALLOW_MEMORY_GROWTH=1 -sINITIAL_MEMORY=134217728 -sASSERTIONS=1 -sSTACK_SIZE=1048576 -pthread -sPTHREAD_POOL_SIZE=8 -sPROXY_TO_PTHREAD -Wno-pthreads-mem-growth")