database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-24 19:42:23 +03:00
Code Activity

MDEV-22221: MariaDB with WolfSSL doesn't support AES-GCM cipher for SSL

Browse Source 
Enable AES-GCM for SSL (only).

AES-GCM for encryption plugins remains disabled (aes-t fails, on some bug
in GCM or CTR padding)
This commit is contained in:
Vladislav Vaintroub
2021-06-09 13:27:00 +02:00
parent dbe3161b6d
commit b81803f065
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extra/wolfssl/CMakeLists.txt
View File

@ -134,6 +134,7 @@ IF(WOLFSSL_X86_64_BUILD)
SET(USE_INTEL_SPEEDUP 1) SET(USE_INTEL_SPEEDUP 1)
LIST(APPEND WOLFCRYPT_SOURCES LIST(APPEND WOLFCRYPT_SOURCES
${WOLFCRYPT_SRCDIR}/aes_asm.S ${WOLFCRYPT_SRCDIR}/aes_asm.S
${WOLFCRYPT_SRCDIR}/aes_gcm_asm.S
${WOLFCRYPT_SRCDIR}/sha512_asm.S ${WOLFCRYPT_SRCDIR}/sha512_asm.S
${WOLFCRYPT_SRCDIR}/sha256_asm.S) ${WOLFCRYPT_SRCDIR}/sha256_asm.S)
ADD_DEFINITIONS(-maes -msse4.2 -mpclmul) ADD_DEFINITIONS(-maes -msse4.2 -mpclmul)

1
extra/wolfssl/user_settings.h.in
View File

@ -17,6 +17,7 @@
#define WC_RSA_BLINDING #define WC_RSA_BLINDING
#define HAVE_TLS_EXTENSIONS #define HAVE_TLS_EXTENSIONS
#define HAVE_AES_ECB #define HAVE_AES_ECB
#define HAVE_AESGCM
#define WOLFSSL_AES_COUNTER #define WOLFSSL_AES_COUNTER
#define NO_WOLFSSL_STUB #define NO_WOLFSSL_STUB
#define OPENSSL_ALL #define OPENSSL_ALL

2
include/mysql/service_my_crypt.h
View File

@ -45,7 +45,7 @@ extern "C" {
/* The max key length of all supported algorithms */ /* The max key length of all supported algorithms */
#define MY_AES_MAX_KEY_LENGTH 32 #define MY_AES_MAX_KEY_LENGTH 32
#define MY_AES_CTX_SIZE 640 #define MY_AES_CTX_SIZE 656
enum my_aes_mode { enum my_aes_mode {
MY_AES_ECB, MY_AES_CBC MY_AES_ECB, MY_AES_CBC

1
mysql-test/main/wolfssl.opt Normal file
View File

@ -0,0 +1 @@
--ssl_cipher=ECDHE-RSA-AES256-GCM-SHA384

6
mysql-test/main/wolfssl.test Normal file
View File

@ -0,0 +1,6 @@
#
# Various tests that require WolfSSL
#
--source include/have_ssl_communication.inc
--source include/not_embedded.inc
SELECT @@ssl_cipher;