diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-09 15:12:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:18 +0100 |
| commit | e109a662c77ec8f6db42c940d6c82c00d2f9f5d9 (patch) | |
| tree | c113c6b13dbb881972c7a7501670cecad649fb10 | |
| parent | f3da18f635f43fdd4438213750ee97af74400ec0 (diff) | |
| download | mariadb-git-e109a662c77ec8f6db42c940d6c82c00d2f9f5d9.tar.gz | |
mtr check for openssl support for AES_CTR
| -rw-r--r-- | mysql-test/include/have_openssl_ctr.inc | 3 | ||||
| -rw-r--r-- | mysql-test/include/have_openssl_ctr.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_encryption-page-compression.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_encryption.test | 1 |
6 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/include/have_openssl_ctr.inc b/mysql-test/include/have_openssl_ctr.inc new file mode 100644 index 00000000000..546cc1b9b93 --- /dev/null +++ b/mysql-test/include/have_openssl_ctr.inc @@ -0,0 +1,3 @@ +# +# See suite.pm for the actual check +# diff --git a/mysql-test/include/have_openssl_ctr.opt b/mysql-test/include/have_openssl_ctr.opt new file mode 100644 index 00000000000..a88a4224c9c --- /dev/null +++ b/mysql-test/include/have_openssl_ctr.opt @@ -0,0 +1 @@ +--encryption-algorithm=aes_ctr diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index b063f32c506..8101173b508 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -66,6 +66,10 @@ 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' + unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/ + and $1 ge "1.0.1"; + %skip; } diff --git a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt index ca65825a82c..f00ecb411d8 100644 --- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt +++ b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.opt @@ -1,5 +1,4 @@ --aria-encrypt-tables=ON ---encryption-algorithm=aes_ctr --encrypt-tmp-disk-tables=ON --innodb-encrypt-tables=ON --innodb-encryption-rotate-key-age=15 diff --git a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test index acd23d89585..8b726610364 100644 --- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test +++ b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test @@ -1,4 +1,5 @@ -- source include/have_innodb.inc +-- source include/have_openssl_ctr.inc -- source include/have_example_key_management_plugin.inc # embedded does not support restart diff --git a/mysql-test/suite/innodb/t/innodb_encryption.test b/mysql-test/suite/innodb/t/innodb_encryption.test index 50aca2a7260..ca3a68444a4 100644 --- a/mysql-test/suite/innodb/t/innodb_encryption.test +++ b/mysql-test/suite/innodb/t/innodb_encryption.test @@ -3,6 +3,7 @@ # -- source include/have_innodb.inc -- source include/have_example_key_management_plugin.inc +-- source include/have_openssl_ctr.inc # embedded does not support restart -- source include/not_embedded.inc |