diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-03-13 14:18:07 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-03-17 07:00:14 +0200 |
| commit | a3e68b4a558e1dd0ff61e497316cb6a32d3de410 (patch) | |
| tree | 8bf4bc26afe98529219198fb58c55a8d9438f212 /mysql-test/suite.pm | |
| parent | 5e6f12366abb02143ef57b6ff99285d81e3b3a36 (diff) | |
| download | mariadb-git-a3e68b4a558e1dd0ff61e497316cb6a32d3de410.tar.gz | |
MDEV-7772: SIGSEGV on my_aes_encrypt_cbc when -DWITH_SSL=bundled
Two problems:
- Read/Write outside of buffer at memcpy() because of incorrect parameters
. OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx.ctx) == iv_length); // ECB does not use IV, thus incorrect assertion
Added:
mysql-test/include/encryption_algorithms.combinations to run tests with methods cbc, ecb and ctr in
those systems where they are available (see suite.pm).
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 8101173b508..5eafd4e2ffd 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -66,7 +66,7 @@ sub skip_combinations { unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1"; - $skip{'include/have_openssl_ctr.inc'} = 'no or too old openssl' + $skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ] unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ and $1 ge "1.0.1"; |