diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
index 826587df242..69f7801d4e3 100644
--- a/extra/wolfssl/CMakeLists.txt
+++ b/extra/wolfssl/CMakeLists.txt
@@ -102,6 +102,9 @@ ${WOLFCRYPT_SRCDIR}/rsa.c
 ${WOLFCRYPT_SRCDIR}/sha.c
 ${WOLFCRYPT_SRCDIR}/sha256.c
 ${WOLFCRYPT_SRCDIR}/sha512.c
+${WOLFCRYPT_SRCDIR}/poly1305.c
+${WOLFCRYPT_SRCDIR}/chacha.c
+${WOLFCRYPT_SRCDIR}/chacha20_poly1305.c
 ${WOLFCRYPT_SRCDIR}/wc_port.c
 ${WOLFCRYPT_SRCDIR}/wc_encrypt.c
 ${WOLFCRYPT_SRCDIR}/hash.c
@@ -159,6 +162,8 @@ IF(WOLFSSL_X86_64_BUILD)
     LIST(APPEND WOLFCRYPT_SOURCES
       ${WOLFCRYPT_SRCDIR}/aes_asm.S
       ${WOLFCRYPT_SRCDIR}/aes_gcm_asm.S
+      ${WOLFCRYPT_SRCDIR}/chacha_asm.S
+      ${WOLFCRYPT_SRCDIR}/poly1305_asm.S
       ${WOLFCRYPT_SRCDIR}/sha512_asm.S
       ${WOLFCRYPT_SRCDIR}/sha256_asm.S)
     ADD_DEFINITIONS(-maes -msse4.2 -mpclmul)
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in
index 2355fd1691c..425f6f154b9 100644
--- a/extra/wolfssl/user_settings.h.in
+++ b/extra/wolfssl/user_settings.h.in
@@ -19,11 +19,15 @@
 #define HAVE_TLS_EXTENSIONS
 #define HAVE_AES_ECB
 #define HAVE_AESGCM
+#define HAVE_CHACHA
+#define HAVE_POLY1305
 #define WOLFSSL_AES_COUNTER
 #define NO_WOLFSSL_STUB
 #define OPENSSL_ALL
 #define WOLFSSL_ALLOW_TLSV10
 #define NO_OLD_TIMEVAL_NAME
+#define HAVE_SECURE_RENEGOTIATION
+#define HAVE_EXTENDED_MASTER
 
 /* TLSv1.3 definitions (all needed to build) */
 #define WOLFSSL_TLS13
diff --git a/include/mysql/service_my_crypt.h b/include/mysql/service_my_crypt.h
index 2a232117ca1..ac8e427231d 100644
--- a/include/mysql/service_my_crypt.h
+++ b/include/mysql/service_my_crypt.h
@@ -45,7 +45,7 @@ extern "C" {
 /* The max key length of all supported algorithms */
 #define MY_AES_MAX_KEY_LENGTH 32
 
-#define MY_AES_CTX_SIZE 656
+#define MY_AES_CTX_SIZE 1024
 
 enum my_aes_mode {
     MY_AES_ECB, MY_AES_CBC