Merge branch '10.4' into 10.5

86059fd1 · Oleksandr Byelkin · ff72a943 · 9924466b · 86059fd1 · 4fbd4fd3
Commit 86059fd1 authored Jan 18, 2023 by Oleksandr Byelkin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

extra/wolfssl/CMakeLists.txt extra/wolfssl/CMakeLists.txt +2 -0

extra/wolfssl/wolfssl extra/wolfssl/wolfssl +1 -1

No files found.
--- 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()


--- a/wolfssl @ 4fbd4fd3
+++ b/wolfssl @ 4fbd4fd3
-Subproject commit f1e2165c591f074feb47872a8ff712713ec411e1
+Subproject commit 4fbd4fd36a21efd9d1a7e17aba390e91c78693b1