diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-24 09:49:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-24 09:49:48 +0300 |
| commit | f00ac20b0304f169c9436f36d7aaf3e88910738a (patch) | |
| tree | 9ec252989a22e1e2fa50cabea0b6c7b19d567d0f /include | |
| parent | 2577ff2667dee3f5b0fd589c360e22b2fb555ee2 (diff) | |
| parent | 571a8f4a086470d5cf6fc4ccd3ec755ee67f87d7 (diff) | |
| download | mariadb-git-f00ac20b0304f169c9436f36d7aaf3e88910738a.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/service_my_crypt.h | 2 | ||||
| -rw-r--r-- | include/ssl_compat.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/mysql/service_my_crypt.h b/include/mysql/service_my_crypt.h index 2a232117ca1..bb038aaa295 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 672 enum my_aes_mode { MY_AES_ECB, MY_AES_CBC diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 8dc1225407e..6db1baab9b5 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -24,7 +24,7 @@ #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) #define ERR_remove_state(X) ERR_clear_error() #define EVP_CIPHER_CTX_SIZE 176 -#define EVP_MD_CTX_SIZE 48 +#define EVP_MD_CTX_SIZE 72 #undef EVP_MD_CTX_init #define EVP_MD_CTX_init(X) do { memset((X), 0, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0) #undef EVP_CIPHER_CTX_init @@ -77,7 +77,6 @@ #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) #endif -#define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) |