1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik 2014-11-20 16:27:16 +01:00
commit dbbe365132
8 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/yassl/src/buffer.cpp
View File

@ -165,7 +165,7 @@ void input_buffer::set_error()
void input_buffer::set_current(uint i) void input_buffer::set_current(uint i)
{ {
if (error_ == 0 && i && check(i - 1, size_) == 0) if (error_ == 0 && (i == 0 || check(i - 1, size_) == 0))
current_ = i; current_ = i;
else else
error_ = -1; error_ = -1;

0
mysql-test/r/openssl-poodle_6975,sslv3.result → mysql-test/r/openssl_6975,tlsv10.result
View File

0
mysql-test/r/openssl-poodle_6975,tlsv12.result → mysql-test/r/openssl_6975,tlsv12.result
View File

2
mysql-test/suite.pm
View File

@ -52,7 +52,7 @@ sub skip_combinations {
} }
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
$skip{'t/openssl-poodle_6975.test'} = 'no or too old openssl' $skip{'t/openssl_6975.test'} = 'no or too old openssl'
unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null"; unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null";
%skip; %skip;

2
mysql-test/t/openssl-poodle_6975.combinations → mysql-test/t/openssl_6975.combinations
View File

@ -1,6 +1,6 @@
[tlsv12] [tlsv12]
loose-ssl-cipher=TLSv1.2 loose-ssl-cipher=TLSv1.2
[sslv3] [tlsv10]
loose-ssl-cipher=SSLv3 loose-ssl-cipher=SSLv3

0
mysql-test/t/openssl-poodle_6975.test → mysql-test/t/openssl_6975.test
View File

2
vio/viossl.c
View File

@ -288,7 +288,7 @@ int vio_ssl_close(Vio *vio)
break; break;
default: /* Shutdown failed */ default: /* Shutdown failed */
DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d", DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
SSL_get_error(ssl, r))); (int)SSL_get_error(ssl, r)));
break; break;
} }
} }

2
vio/viosslfactories.c
View File

@ -203,6 +203,8 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
DBUG_RETURN(0); DBUG_RETURN(0);
} }
SSL_CTX_set_options(ssl_fd->ssl_context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
/* /*
Set the ciphers that can be used Set the ciphers that can be used
NOTE: SSL_CTX_set_cipher_list will return 0 if NOTE: SSL_CTX_set_cipher_list will return 0 if