mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
fb641b0cd1
MyCTX used an EVP_CIPHER_CTX in a stack buffer instead of allocating it with EVP_CIPHER_CTX_new(). OpenSSL 4.0 rejects a context that was not created that way for ciphers that use an IV: EVP_CipherInit_ex() fails with "invalid iv length", so AES_ENCRYPT() and KDF() in CBC/CTR/GCM modes return NULL. ECB has no IV and still works, which is why only the non-ECB modes broke. Allocate the context with EVP_CIPHER_CTX_new()/EVP_CIPHER_CTX_free(), and on an init error free and null it, so a later update()/finish() from a caller that ignored the error is a safe no-op, not a double free. Remove check_openssl_compatibility() and the EVP_CIPHER_CTX_SIZE and EVP_CIPHER_CTX_init macros. my_md5() used the same stack-buffer-sized-by-EVP_MD_CTX_SIZE hack, whose only guard was check_openssl_compatibility(). MD5_CTX is a concrete struct in both OpenSSL and WolfSSL, so use it directly with MD5_Init/Update/Final on a caller-owned context, like my_sha.inl does for SHA*_CTX; this removes the EVP_MD_CTX hack and EVP_MD_CTX_SIZE. The exception is OpenSSL 1.0.x, which aborts on the low-level MD5 API in FIPS mode (MDEV-7788): there, and only there, keep the EVP path with the non-FIPS flag. 1.1.0 removed the FIPS Object Module and 3.0+ low-level MD5 bypasses the provider, so the concrete MD5_CTX is correct on every other version. SHA is unaffected, it already used concrete SHA*_CTX structs. Verified against OpenSSL 4.0.1: the mysys aes-t test fails on the CBC/CTR/GCM cases with the stack buffer and passes with EVP_CIPHER_CTX_new(). The 1.0.x MD5 path verified against a FIPS build of OpenSSL 1.0.2u: the EVP path computes MD5, the low-level path aborts. No visible performance degradation: the extra allocation costs ~12 ns/call (WolfSSL) and ~30 ns (OpenSSL) on Windows at a 30-byte payload, nothing at 16 KB, and nothing on Linux/glibc; sysbench OLTP over encrypted tables and redo log is unchanged. Tests main.tlsv13 and main.ssl_crl: OpenSSL 4.0.3 reports TLS alerts as "tls alert ..." (was "ssl/tls alert ..."), accept both. Assisted-by: Claude:claude-opus-4-8
86 lines
2.6 KiB
C
86 lines
2.6 KiB
C
/*
|
|
Copyright (c) 2016, 2022, MariaDB Corporation.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include <openssl/opensslv.h>
|
|
|
|
/* OpenSSL version specific definitions */
|
|
#if defined(OPENSSL_VERSION_NUMBER)
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
|
|
!(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
|
|
#define HAVE_OPENSSL11 1
|
|
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
|
|
#define ERR_remove_state(X) ERR_clear_error()
|
|
|
|
/*
|
|
Macros below are deprecated. OpenSSL 1.1 may define them or not,
|
|
depending on how it was built.
|
|
*/
|
|
#undef ERR_free_strings
|
|
#define ERR_free_strings()
|
|
#undef EVP_cleanup
|
|
#define EVP_cleanup()
|
|
#undef CRYPTO_cleanup_all_ex_data
|
|
#define CRYPTO_cleanup_all_ex_data()
|
|
#undef SSL_load_error_strings
|
|
#define SSL_load_error_strings()
|
|
|
|
#else
|
|
#define HAVE_OPENSSL10 1
|
|
#ifdef HAVE_WOLFSSL
|
|
#define SSL_LIBRARY "WolfSSL " WOLFSSL_VERSION
|
|
#else
|
|
#define SSL_LIBRARY SSLeay_version(SSLEAY_VERSION)
|
|
#endif
|
|
|
|
#ifdef HAVE_WOLFSSL
|
|
#undef ERR_remove_state
|
|
#define ERR_remove_state(x) do {} while(0)
|
|
#undef SSL_get_cipher
|
|
#define SSL_get_cipher(ssl) (SSL_version(ssl) == TLS1_3_VERSION ? wolfSSL_get_cipher(ssl) : wolfSSL_get_cipher_name(ssl))
|
|
#undef SSL_get_cipher_list
|
|
#define SSL_get_cipher_list(ctx,i) wolfSSL_get_cipher_list(i)
|
|
#elif defined (HAVE_ERR_remove_thread_state)
|
|
#define ERR_remove_state(X) ERR_remove_thread_state(NULL)
|
|
#endif /* HAVE_ERR_remove_thread_state */
|
|
|
|
#endif /* HAVE_OPENSSL11 */
|
|
#endif
|
|
|
|
#ifndef HAVE_OPENSSL11
|
|
#ifndef ASN1_STRING_get0_data
|
|
#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
|
|
#endif
|
|
|
|
#ifndef DH_set0_pqg
|
|
#define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G))
|
|
#endif
|
|
|
|
#define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt)
|
|
|
|
#ifndef HAVE_WOLFSSL
|
|
#define OPENSSL_init_ssl(X,Y) SSL_library_init()
|
|
#define EVP_MD_CTX_reset(X) EVP_MD_CTX_cleanup(X)
|
|
#define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X)
|
|
#define X509_get0_notBefore(X) X509_get_notBefore(X)
|
|
#define X509_get0_notAfter(X) X509_get_notAfter(X)
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef TLS1_3_VERSION
|
|
#define SSL_CTX_set_ciphersuites(X,Y) 0
|
|
#endif
|