[Commits] e7b1d73: Introduce only one combinations file and and rule for aes_ctr to

Jan Lindström jan.lindstrom at mariadb.com
Mon Mar 16 12:48:37 EET 2015


revision-id: e7b1d7350f42a00a9920c704ae9099c2a2fe0821
parent(s): 7c21ea9f502ded155c12a0ee3c5ff0602e9d4c9a
committer: Jan Lindström
branch nick: 10.1-innodb
timestamp: 2015-03-16 12:47:32 +0200
message:

Introduce only one combinations file and and rule for aes_ctr to
suite.pm so that it is not used if not available.

---
 mysql-test/include/encryption_algorithms.combinations            | 8 ++++++++
 mysql-test/include/encryption_algorithms.inc                     | 3 +++
 mysql-test/include/have_example_key_management_plugin.inc        | 2 ++
 mysql-test/include/have_file_key_management_plugin.combinations  | 6 ------
 mysql-test/include/have_file_key_management_plugin.inc           | 2 ++
 mysql-test/include/have_openssl_ctr.combinations                 | 9 ---------
 mysql-test/include/have_openssl_ctr.inc                          | 3 ---
 mysql-test/suite.pm                                              | 2 +-
 .../suite/innodb/t/innodb_encryption-page-compression.test       | 1 -
 mysql-test/suite/innodb/t/innodb_encryption.test                 | 1 -
 mysql-test/suite/innodb/t/innodb_encryption_tables.test          | 1 -
 mysql-test/suite/innodb/t/innodb_scrub.test                      | 1 -
 mysql-test/suite/innodb/t/innodb_scrub_background.test           | 1 -
 13 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/mysql-test/include/encryption_algorithms.combinations b/mysql-test/include/encryption_algorithms.combinations
new file mode 100644
index 0000000..09c1e91
--- /dev/null
+++ b/mysql-test/include/encryption_algorithms.combinations
@@ -0,0 +1,8 @@
+[cbc]
+encryption-algorithm=aes_cbc
+
+[ecb]
+encryption-algorithm=aes_ecb
+
+[ctr]
+encryption-algorithm=aes_ctr
diff --git a/mysql-test/include/encryption_algorithms.inc b/mysql-test/include/encryption_algorithms.inc
new file mode 100644
index 0000000..546cc1b
--- /dev/null
+++ b/mysql-test/include/encryption_algorithms.inc
@@ -0,0 +1,3 @@
+#
+# See suite.pm for the actual check
+#
diff --git a/mysql-test/include/have_example_key_management_plugin.inc b/mysql-test/include/have_example_key_management_plugin.inc
index 622e9a5..3bb4529 100644
--- a/mysql-test/include/have_example_key_management_plugin.inc
+++ b/mysql-test/include/have_example_key_management_plugin.inc
@@ -1,3 +1,5 @@
+-- source encryption_algorithms.inc
+
 if (`select count(*) = 0 from information_schema.plugins
      where plugin_name = 'example_key_management_plugin' and plugin_status='active'`)
 {
diff --git a/mysql-test/include/have_file_key_management_plugin.combinations b/mysql-test/include/have_file_key_management_plugin.combinations
deleted file mode 100644
index 6a63b5a..0000000
--- a/mysql-test/include/have_file_key_management_plugin.combinations
+++ /dev/null
@@ -1,6 +0,0 @@
-[aes_cbc]
-encryption-algorithm=aes_cbc
-
-[aes_ecb]
-encryption-algorithm=aes_ecb
-
diff --git a/mysql-test/include/have_file_key_management_plugin.inc b/mysql-test/include/have_file_key_management_plugin.inc
index fc682a7..3b3eb03 100644
--- a/mysql-test/include/have_file_key_management_plugin.inc
+++ b/mysql-test/include/have_file_key_management_plugin.inc
@@ -1,3 +1,5 @@
+-- source encryption_algorithms.inc
+
 if (`select count(*) = 0 from information_schema.plugins
      where plugin_name = 'file_key_management_plugin' and plugin_status='active'`)
 {
diff --git a/mysql-test/include/have_openssl_ctr.combinations b/mysql-test/include/have_openssl_ctr.combinations
deleted file mode 100644
index 2c49c78..0000000
--- a/mysql-test/include/have_openssl_ctr.combinations
+++ /dev/null
@@ -1,9 +0,0 @@
-[aes_cbc]
-encryption-algorithm=aes_cbc
-
-[aes_ecb]
-encryption-algorithm=aes_ecb
-
-[aes_ctr]
-encryption-algorithm=aes_ctr
-
diff --git a/mysql-test/include/have_openssl_ctr.inc b/mysql-test/include/have_openssl_ctr.inc
deleted file mode 100644
index 546cc1b..0000000
--- a/mysql-test/include/have_openssl_ctr.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# See suite.pm for the actual check
-#
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 8101173..5eafd4e 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";
 
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 ce59cf9..48a9a78 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
@@ -1,5 +1,4 @@
 -- 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 ca3a684..50aca2a 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption.test
@@ -3,7 +3,6 @@
 #
 -- 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
diff --git a/mysql-test/suite/innodb/t/innodb_encryption_tables.test b/mysql-test/suite/innodb/t/innodb_encryption_tables.test
index c630b7d..d192a16 100644
--- a/mysql-test/suite/innodb/t/innodb_encryption_tables.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption_tables.test
@@ -1,6 +1,5 @@
 -- source include/have_innodb.inc
 -- source include/have_example_key_management_plugin.inc
--- source include/have_openssl_ctr.inc
 --source include/not_embedded.inc
 
 --disable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb_scrub.test b/mysql-test/suite/innodb/t/innodb_scrub.test
index 09ece97..4b370b3 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub.test
+++ b/mysql-test/suite/innodb/t/innodb_scrub.test
@@ -1,7 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 -- source include/have_example_key_management_plugin.inc
--- source include/have_openssl_ctr.inc
 
 let $MYSQLD_DATADIR=`select @@datadir`;
 let ib1_IBD = $MYSQLD_DATADIR/ibdata1;
diff --git a/mysql-test/suite/innodb/t/innodb_scrub_background.test b/mysql-test/suite/innodb/t/innodb_scrub_background.test
index 881c124..44cb16b 100644
--- a/mysql-test/suite/innodb/t/innodb_scrub_background.test
+++ b/mysql-test/suite/innodb/t/innodb_scrub_background.test
@@ -1,7 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 -- source include/have_example_key_management_plugin.inc
--- source include/have_openssl_ctr.inc
 
 let $MYSQLD_DATADIR=`select @@datadir`;
 let ib1_IBD = $MYSQLD_DATADIR/ibdata1;


More information about the commits mailing list