Merge branch '10.4' into 10.5

MariaDB · Jan 18, 2023 · 86059fd · 86059fd
2 parents ff72a94 + 9924466
commit 86059fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
@@ -157,6 +157,8 @@ IF(WOLFSSL_X86_64_BUILD)
       ${WOLFCRYPT_SRCDIR}/sha512_asm.S
       ${WOLFCRYPT_SRCDIR}/sha256_asm.S)
     ADD_DEFINITIONS(-maes -msse4.2 -mpclmul)
+    # WolfSSL 5.5.4 bug - user_settings.h not included into aes_asm.S
+    SET_PROPERTY(SOURCE ${WOLFCRYPT_SRCDIR}/aes_asm.S APPEND PROPERTY COMPILE_OPTIONS "-DWOLFSSL_X86_64_BUILD")
   ENDIF()
 ENDIF()
 

diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl