Merge branch 'main' into support-WASM

Author: justsmth

.github/workflows/actions-ci.yml

@@ -230,14 +230,18 @@ jobs:
         run: cmake --build ./build --target run_tests
 
   compiler-tests:
-    name: x86-64 - ${{ matrix.compiler }} - ${{ (matrix.fips == 1 && 'FIPS') || 'non-FIPS' }}
+    name: >-
+      x86-64 - ${{ matrix.compiler }} -
+      ${{ (matrix.fips == 1 && 'FIPS') || 'non-FIPS' }} -
+      ${{ (matrix.shared == 1 && 'shared') || 'static' }}
     needs: [sanity-test-run]
     env:
       GOFLAGS: "-buildvcs=false"
     strategy:
       fail-fast: false
       matrix:
         fips: [0, 1]
+        shared: [0, 1]
         compiler:
           - "gcc9"
           - "gcc10"
@@ -273,8 +277,8 @@ jobs:
         run: |
           echo "CC=gcc" >> $GITHUB_ENV
           echo "CXX=g++" >> $GITHUB_ENV
-      - name: Setup ${{ (matrix.fips == 1 && 'FIPS') || 'non-FIPS' }} Build
-        run: cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release -DFIPS=${{matrix.fips}}
+      - name: Setup Build
+        run: cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release -DFIPS=${{matrix.fips}} -DBUILD_SHARED_LIBS=${{matrix.shared}}
       - name: Build Project
         run: cmake --build ./build --target all
       - name: Run tests

.github/workflows/check-test-vectors.yml

@@ -46,7 +46,7 @@ jobs:
         if: steps.check_vectors.outputs.vectors_outdated == 'true'
         run: |
           previous_issue_number=$(gh issue list \
-            --label "$LABELS" \
+            --label 'vectors' \
             --json number \
             --jq '.[0].number')
           if [[ -n $previous_issue_number ]]; then

CMakeLists.txt

@@ -79,7 +79,7 @@ function(target_add_awslc_include_paths)
 
   add_dependencies(${arg_TARGET} boringssl_prefix_symbols)
   target_include_directories(${arg_TARGET} BEFORE ${arg_SCOPE}
-    $<$<BOOL:INCLUDE_PREFIX_HEADERS>:$<BUILD_INTERFACE:${AWSLC_BINARY_DIR}/symbol_prefix_include>>
+    $<$<BOOL:${INCLUDE_PREFIX_HEADERS}>:$<BUILD_INTERFACE:${AWSLC_BINARY_DIR}/symbol_prefix_include>>
     $<BUILD_INTERFACE:${AWSLC_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>)
 endfunction()
@@ -344,10 +344,13 @@ elseif(BORINGSSL_PREFIX AND BORINGSSL_PREFIX_HEADERS)
           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
           COMPONENT Development
   )
+elseif(BORINGSSL_PREFIX AND BORINGSSL_PREFIX_SYMBOLS AND NOT GO_EXECUTABLE)
+  # This case is reached when both BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS are set,
+  # but GO_EXECUTABLE is not available (checked after the first if-branch).
+  message(FATAL_ERROR "Must have Go installed when using BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS")
 elseif(BORINGSSL_PREFIX OR BORINGSSL_PREFIX_SYMBOLS)
+  # Only one of BORINGSSL_PREFIX or BORINGSSL_PREFIX_SYMBOLS is set
   message(FATAL_ERROR "Must specify both or neither of BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS")
-elseif((BORINGSSL_PREFIX AND BORINGSSL_PREFIX_SYMBOLS) AND NOT GO_EXECUTABLE)
-  message(FATAL_ERROR "Must have Go installed when using BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS")
 else()
   add_custom_target(boringssl_prefix_symbols)
 
@@ -1341,7 +1344,7 @@ if(BUILD_TESTING)
           DEPENDS all_tests
           ${MAYBE_USES_TERMINAL})
     else()
-      add_custom_command(
+      add_custom_target(
           run_minimal_tests
           COMMAND crypto/crypto_test
           COMMAND crypto/urandom_test

crypto/err/evp.errordata

@@ -10,6 +10,7 @@ EVP,107,EXPECTING_AN_RSA_KEY
 EVP,139,EXPECTING_A_DH_KEY
 EVP,108,EXPECTING_A_DSA_KEY
 EVP,106,EXPECTING_A_EC_KEY_KEY
+EVP,140,EXPECTING_A_PQDSA_KEY
 EVP,109,ILLEGAL_OR_UNSUPPORTED_PADDING_MODE
 EVP,137,INVALID_BUFFER_SIZE
 EVP,110,INVALID_DIGEST_LENGTH

crypto/evp_extra/p_pqdsa_test.cc

@@ -1696,6 +1696,7 @@ TEST_P(PQDSAParameterTest, KeyGen) {
   ASSERT_TRUE(EVP_PKEY_keygen_init(ctx.get()));
   ASSERT_TRUE(EVP_PKEY_keygen(ctx.get(), &raw));
   ASSERT_TRUE(raw);
+  ASSERT_EQ(EVP_PKEY_pqdsa_get_type(raw), nid);
   bssl::UniquePtr<EVP_PKEY> pkey(raw);
 
   // ---- 2. Test key generation with PKEY as a template ----

crypto/fipsmodule/CMakeLists.txt

@@ -15,11 +15,11 @@ if(ANDROID)
   # Clang reports that argument as unused. We remove the flag only for the FIPS build of Android.
   string(FIND ${CMAKE_CXX_FLAGS} "noexecstack" CXX_EXTRA_WA)
   string(FIND ${CMAKE_C_FLAGS} "noexecstack" C_EXTRA_WA)
-  if(NOT ${CXX_EXTRA_WA} EQUAL '-1')
-    string( REPLACE "-Wa,--noexecstack" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
+  if(NOT CXX_EXTRA_WA EQUAL -1)
+    string(REPLACE "-Wa,--noexecstack" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   endif()
-  if(NOT ${C_EXTRA_WA} EQUAL '-1')
-    string( REPLACE "-Wa,--noexecstack" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" )
+  if(NOT C_EXTRA_WA EQUAL -1)
+    string(REPLACE "-Wa,--noexecstack" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
   endif()
 endif()
 
@@ -551,6 +551,18 @@ elseif(FIPS_SHARED)
   target_compile_definitions(bcm_library PRIVATE BORINGSSL_IMPLEMENTATION S2N_BN_HIDE_SYMBOLS )
   target_add_awslc_include_paths(TARGET bcm_library SCOPE PRIVATE)
   target_include_directories(bcm_library PRIVATE "${S2N_BIGNUM_INCLUDE_DIR}")
+
+  # On GCC 14+ the Superword Level Parallelism (SLP) vectorizer causes the
+  # compiler to aggressively store static function pointer addresses in the
+  # .data.rel.ro.local section which is discarded by our linker script and
+  # results in undefined references when linking libcrypto.
+  if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
+     CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "14" AND
+     CMAKE_SYSTEM_NAME STREQUAL "Linux" AND
+     ARCH STREQUAL "x86_64")
+    target_compile_options(bcm_library PRIVATE -fno-tree-slp-vectorize)
+  endif()
+
   if (APPLE)
     set(BCM_NAME bcm.o)
     # The linker on macOS doesn't have the ability to process linker scripts,

crypto/fipsmodule/evp/evp.c

@@ -72,6 +72,7 @@
 #include "../../pem/internal.h"
 #include "../../console/internal.h"
 #include "../../internal.h"
+#include "../pqdsa/internal.h"
 #include "internal.h"
 
 
@@ -293,6 +294,18 @@ int EVP_PKEY_id(const EVP_PKEY *pkey) {
   return pkey->type;
 }
 
+int EVP_PKEY_pqdsa_get_type(const EVP_PKEY *pkey) {
+  SET_DIT_AUTO_RESET;
+  if (pkey->type != EVP_PKEY_PQDSA) {
+    OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_A_PQDSA_KEY);
+    return 0;
+  }
+  if (!pkey->pkey.pqdsa_key || !pkey->pkey.pqdsa_key->pqdsa) {
+    return 0;
+  }
+  return pkey->pkey.pqdsa_key->pqdsa->nid;
+}
+
 int EVP_MD_get_pkey_type(const EVP_MD *md) {
   if (md) {
     int sig_nid = 0;

crypto/fipsmodule/evp/internal.h

@@ -150,7 +150,7 @@ struct evp_pkey_st {
     DH *dh;
     EC_KEY *ec;
     KEM_KEY *kem_key;
-    PQDSA_KEY * pqdsa_key;
+    PQDSA_KEY *pqdsa_key;
   } pkey;
 
   // ameth contains a pointer to a method table that contains many ASN.1