mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 03:47:17 +02:00
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
This commit is contained in:
commit
230adda1e2
9 changed files with 234 additions and 19 deletions
10
vio/viossl.c
10
vio/viossl.c
|
|
@ -124,6 +124,16 @@ int vio_ssl_close(Vio *vio)
|
|||
|
||||
if (ssl)
|
||||
{
|
||||
/*
|
||||
THE SSL standard says that SSL sockets must send and receive a close_notify
|
||||
alert on socket shutdown to avoid truncation attacks. However, this can
|
||||
cause problems since we often hold a lock during shutdown and this IO can
|
||||
take an unbounded amount of time to complete. Since our packets are self
|
||||
describing with length, we aren't vunerable to these attacks. Therefore,
|
||||
we just shutdown by closing the socket (quiet shutdown).
|
||||
*/
|
||||
SSL_set_quiet_shutdown(ssl, 1);
|
||||
|
||||
switch ((r= SSL_shutdown(ssl))) {
|
||||
case 1:
|
||||
/* Shutdown successful */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue