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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9e33fc73
Commit
9e33fc73
authored
Nov 29, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
added SSL_library_init()
parent
57bfc6dd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
vio/viosslfactories.c
vio/viosslfactories.c
+10
-11
No files found.
vio/viosslfactories.c
View file @
9e33fc73
...
@@ -191,9 +191,6 @@ void netware_ssl_cleanup()
...
@@ -191,9 +191,6 @@ void netware_ssl_cleanup()
/* NetWare SSL initialization */
/* NetWare SSL initialization */
static
void
netware_ssl_init
()
static
void
netware_ssl_init
()
{
{
/* initialize OpenSSL library */
SSL_library_init
();
/* cleanup OpenSSL library */
/* cleanup OpenSSL library */
NXVmRegisterExitHandler
(
netware_ssl_cleanup
,
NULL
);
NXVmRegisterExitHandler
(
netware_ssl_cleanup
,
NULL
);
}
}
...
@@ -231,16 +228,17 @@ new_VioSSLConnectorFd(const char* key_file,
...
@@ -231,16 +228,17 @@ new_VioSSLConnectorFd(const char* key_file,
ptr
->
ssl_method
=
0
;
ptr
->
ssl_method
=
0
;
/* FIXME: constants! */
/* FIXME: constants! */
#ifdef __NETWARE__
netware_ssl_init
();
#endif
if
(
!
ssl_algorithms_added
)
if
(
!
ssl_algorithms_added
)
{
{
DBUG_PRINT
(
"info"
,
(
"todo: OpenSSL_add_all_algorithms()"
));
DBUG_PRINT
(
"info"
,
(
"todo: OpenSSL_add_all_algorithms()"
));
ssl_algorithms_added
=
TRUE
;
ssl_algorithms_added
=
TRUE
;
SSL_library_init
();
OpenSSL_add_all_algorithms
();
OpenSSL_add_all_algorithms
();
}
}
#ifdef __NETWARE__
netware_ssl_init
();
#endif
if
(
!
ssl_error_strings_loaded
)
if
(
!
ssl_error_strings_loaded
)
{
{
DBUG_PRINT
(
"info"
,
(
"todo:SSL_load_error_strings()"
));
DBUG_PRINT
(
"info"
,
(
"todo:SSL_load_error_strings()"
));
...
@@ -325,17 +323,18 @@ new_VioSSLAcceptorFd(const char *key_file,
...
@@ -325,17 +323,18 @@ new_VioSSLAcceptorFd(const char *key_file,
/* FIXME: constants! */
/* FIXME: constants! */
ptr
->
session_id_context
=
ptr
;
ptr
->
session_id_context
=
ptr
;
#ifdef __NETWARE__
netware_ssl_init
();
#endif
if
(
!
ssl_algorithms_added
)
if
(
!
ssl_algorithms_added
)
{
{
DBUG_PRINT
(
"info"
,
(
"todo: OpenSSL_add_all_algorithms()"
));
DBUG_PRINT
(
"info"
,
(
"todo: OpenSSL_add_all_algorithms()"
));
ssl_algorithms_added
=
TRUE
;
ssl_algorithms_added
=
TRUE
;
SSL_library_init
();
OpenSSL_add_all_algorithms
();
OpenSSL_add_all_algorithms
();
}
}
#ifdef __NETWARE__
netware_ssl_init
();
#endif
if
(
!
ssl_error_strings_loaded
)
if
(
!
ssl_error_strings_loaded
)
{
{
DBUG_PRINT
(
"info"
,
(
"todo: SSL_load_error_strings()"
));
DBUG_PRINT
(
"info"
,
(
"todo: SSL_load_error_strings()"
));
...
...
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