From 9924466b3b9b3cdc590106e0036e6fb67d9aa4b0 Mon Sep 17 00:00:00 2001
From: Oleksandr Byelkin <sanja@mariadb.com>
Date: Mon, 16 Jan 2023 23:06:38 +0100
Subject: v5.5.4-stable

---
 extra/wolfssl/CMakeLists.txt | 2 ++
 extra/wolfssl/wolfssl        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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
index f1e2165c591..4fbd4fd36a2 160000
--- a/extra/wolfssl/wolfssl
+++ b/extra/wolfssl/wolfssl
@@ -1 +1 @@
-Subproject commit f1e2165c591f074feb47872a8ff712713ec411e1
+Subproject commit 4fbd4fd36a21efd9d1a7e17aba390e91c78693b1
-- 
cgit v1.2.1