Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b4db59ba
Commit
b4db59ba
authored
Jun 18, 2018
by
Georg Richter
Committed by
Sergei Golubchik
Jun 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-15596 10.2 doesn't work with openssl 1.1.1
parent
1db1340c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
include/ssl_compat.h
include/ssl_compat.h
+5
-1
vio/viosslfactories.c
vio/viosslfactories.c
+1
-0
No files found.
include/ssl_compat.h
View file @
b4db59ba
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#define HAVE_OPENSSL11 1
#define HAVE_OPENSSL11 1
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
#define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
#define ERR_remove_state(X) ERR_clear_error()
#define ERR_remove_state(X) ERR_clear_error()
#define EVP_CIPHER_CTX_SIZE 1
68
#define EVP_CIPHER_CTX_SIZE 1
76
#define EVP_MD_CTX_SIZE 48
#define EVP_MD_CTX_SIZE 48
#undef EVP_MD_CTX_init
#undef EVP_MD_CTX_init
#define EVP_MD_CTX_init(X) do { bzero((X), EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
#define EVP_MD_CTX_init(X) do { bzero((X), EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
...
@@ -77,6 +77,10 @@
...
@@ -77,6 +77,10 @@
#define X509_get0_notAfter(X) X509_get_notAfter(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
#ifdef __cplusplus
#ifdef __cplusplus
extern
"C"
{
extern
"C"
{
#endif
/* __cplusplus */
#endif
/* __cplusplus */
...
...
vio/viosslfactories.c
View file @
b4db59ba
...
@@ -211,6 +211,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
...
@@ -211,6 +211,7 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
none of the provided ciphers could be selected
none of the provided ciphers could be selected
*/
*/
if
(
cipher
&&
if
(
cipher
&&
SSL_CTX_set_ciphersuites
(
ssl_fd
->
ssl_context
,
cipher
)
==
0
&&
SSL_CTX_set_cipher_list
(
ssl_fd
->
ssl_context
,
cipher
)
==
0
)
SSL_CTX_set_cipher_list
(
ssl_fd
->
ssl_context
,
cipher
)
==
0
)
{
{
*
error
=
SSL_INITERR_CIPHERS
;
*
error
=
SSL_INITERR_CIPHERS
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment