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
24a6dd64
Commit
24a6dd64
authored
Apr 10, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update implementation of new function 'mysql_get_ssl_cipher' after review
parent
042e2f81
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
client/mysql.cc
client/mysql.cc
+2
-2
libmysql/libmysql.def
libmysql/libmysql.def
+1
-0
sql-common/client.c
sql-common/client.c
+1
-1
No files found.
client/mysql.cc
View file @
24a6dd64
...
@@ -3212,9 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
...
@@ -3212,9 +3212,9 @@ com_status(String *buffer __attribute__((unused)),
mysql_free_result
(
result
);
mysql_free_result
(
result
);
}
}
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
if
(
mysql_get_ssl_cipher
(
&
mysql
))
if
(
(
status
=
mysql_get_ssl_cipher
(
&
mysql
)
))
tee_fprintf
(
stdout
,
"SSL:
\t\t\t
Cipher in use is %s
\n
"
,
tee_fprintf
(
stdout
,
"SSL:
\t\t\t
Cipher in use is %s
\n
"
,
mysql_get_ssl_cipher
(
&
mysql
)
);
status
);
else
else
#endif
/* HAVE_OPENSSL */
#endif
/* HAVE_OPENSSL */
tee_puts
(
"SSL:
\t\t\t
Not in use"
,
stdout
);
tee_puts
(
"SSL:
\t\t\t
Not in use"
,
stdout
);
...
...
libmysql/libmysql.def
View file @
24a6dd64
...
@@ -65,6 +65,7 @@ EXPORTS
...
@@ -65,6 +65,7 @@ EXPORTS
mysql_get_proto_info
mysql_get_proto_info
mysql_get_server_info
mysql_get_server_info
mysql_get_client_version
mysql_get_client_version
mysql_get_ssl_cipher
mysql_info
mysql_info
mysql_init
mysql_init
mysql_insert_id
mysql_insert_id
...
...
sql-common/client.c
View file @
24a6dd64
...
@@ -1552,7 +1552,7 @@ mysql_get_ssl_cipher(MYSQL *mysql)
...
@@ -1552,7 +1552,7 @@ mysql_get_ssl_cipher(MYSQL *mysql)
{
{
DBUG_ENTER
(
"mysql_get_ssl_cipher"
);
DBUG_ENTER
(
"mysql_get_ssl_cipher"
);
if
(
mysql
->
net
.
vio
&&
mysql
->
net
.
vio
->
ssl_arg
)
if
(
mysql
->
net
.
vio
&&
mysql
->
net
.
vio
->
ssl_arg
)
SSL_get_cipher_name
((
SSL
*
)
mysql
->
net
.
vio
->
ssl_arg
);
DBUG_RETURN
(
SSL_get_cipher_name
((
SSL
*
)
mysql
->
net
.
vio
->
ssl_arg
)
);
DBUG_RETURN
(
NULL
);
DBUG_RETURN
(
NULL
);
}
}
...
...
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