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
4c0d391c
Commit
4c0d391c
authored
Sep 08, 2018
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows : fix broken build with OpenSSL
parent
5a1868b5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
include/ssl_compat.h
include/ssl_compat.h
+2
-2
libmariadb
libmariadb
+1
-1
mysys_ssl/openssl.c
mysys_ssl/openssl.c
+2
-1
vio/viossl.c
vio/viossl.c
+1
-1
No files found.
include/ssl_compat.h
View file @
4c0d391c
...
...
@@ -30,9 +30,9 @@
#define EVP_CIPHER_CTX_SIZE 176
#define EVP_MD_CTX_SIZE 48
#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 {
memset((X), 0
, EVP_MD_CTX_SIZE); EVP_MD_CTX_reset(X); } while(0)
#undef EVP_CIPHER_CTX_init
#define EVP_CIPHER_CTX_init(X) do {
bzero((X)
, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0)
#define EVP_CIPHER_CTX_init(X) do {
memset((X), 0
, EVP_CIPHER_CTX_SIZE); EVP_CIPHER_CTX_reset(X); } while(0)
/*
Macros below are deprecated. OpenSSL 1.1 may define them or not,
...
...
libmariadb
@
17d0e531
Subproject commit
b948553b3464d37240c4d129fae47ce147e6dabc
Subproject commit
17d0e5317604718fc059ee1ad4bd2ea36494226b
mysys_ssl/openssl.c
View file @
4c0d391c
...
...
@@ -32,7 +32,8 @@ int check_openssl_compatibility()
#else
#include <openssl/evp.h>
static
uint
testing
,
alloc_size
,
alloc_count
;
static
uint
testing
;
size_t
alloc_size
,
alloc_count
;
static
void
*
coc_malloc
(
size_t
size
,
const
char
*
f
__attribute__
((
unused
)),
int
l
__attribute__
((
unused
)))
...
...
vio/viossl.c
View file @
4c0d391c
...
...
@@ -335,7 +335,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, long timeout,
DBUG_PRINT
(
"info"
,
(
"ssl: %p timeout: %ld"
,
ssl
,
timeout
));
SSL_clear
(
ssl
);
SSL_SESSION_set_timeout
(
SSL_get_session
(
ssl
),
timeout
);
SSL_set_fd
(
ssl
,
sd
);
SSL_set_fd
(
ssl
,
(
int
)
sd
);
/*
Since yaSSL does not support non-blocking send operations, use
...
...
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