diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2020-03-12 07:42:38 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2020-03-12 07:42:38 +0000 |
| commit | c2bd9677788989f8289b28cec5eb2524f7b0b514 (patch) | |
| tree | 83beb3ec44646f7c59693dce1ae56106a4b73eca /databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc | |
| parent | x11-drivers/xorgxrdp: disable DRI3 option by default again (diff) | |
This fix a Problem, when MySQL build with libressl
/var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:230:25: error: use of undeclared identifier 'SSL_OP_NO_TLSv1_3'
SSL_OP_NO_TLSv1_3 |
^
/var/ports/usr/ports/databases/mysql56-client/work/mysql-5.6.47/vio/viosslfactories.c:275:12: warning: implicit declaration of function 'SSL_CTX_set_ciphersuites' is invalid in C99 [-Wimplicit-function-declaration]
if (0 == SSL_CTX_set_ciphersuites(ssl_fd->ssl_context, ""))
Special thanks for his help to: fluffy
PR: 244320
MFH: 2020Q1
Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc')
| -rw-r--r-- | databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc new file mode 100644 index 000000000000..0d1dea6cf6cb --- /dev/null +++ b/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc @@ -0,0 +1,74 @@ +--- mysys_ssl/my_aes_openssl.cc.orig 2019-11-26 16:53:45 UTC ++++ mysys_ssl/my_aes_openssl.cc +@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + const unsigned char *key, uint32 key_length, + enum my_aes_opmode mode, const unsigned char *iv) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX stack_ctx; + EVP_CIPHER_CTX *ctx= &stack_ctx; + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ +@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) + return MY_AES_BAD_DATA; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_init(ctx); + #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + +@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len)) + goto aes_error; /* Error */ + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); +@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32 + aes_error: + /* need to explicitly clean up the error if we want to ignore it */ + ERR_clear_error(); +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + EVP_CIPHER_CTX_cleanup(ctx); + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + EVP_CIPHER_CTX_free(ctx); |