summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2023-01-16 23:06:38 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2023-01-17 22:46:25 +0100
commit9924466b3b9b3cdc590106e0036e6fb67d9aa4b0 (patch)
tree41f0cd30912a7131d8b2794dad7e20106fababba
parent2b3423c4622971048b09f68dbfb6833df4013397 (diff)
downloadmariadb-git-9924466b3b9b3cdc590106e0036e6fb67d9aa4b0.tar.gz
v5.5.4-stable
-rw-r--r--extra/wolfssl/CMakeLists.txt2
m---------extra/wolfssl/wolfssl0
2 files changed, 2 insertions, 0 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
index 35c3b735bdd..7bd5f1694ed 100644
--- 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
-Subproject f1e2165c591f074feb47872a8ff712713ec411e
+Subproject 4fbd4fd36a21efd9d1a7e17aba390e91c78693b