diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-31 19:32:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-09 18:42:43 +0200 |
| commit | bb1b61b312088ba9f5f2cb606594b6f33c284402 (patch) | |
| tree | c5b433d19434e194fb82d2407adbbfee759dfd31 /mysql-test/include | |
| parent | 9ccafffc29526ea30151eb3e62901bfdb77aaf84 (diff) | |
| download | mariadb-git-bb1b61b312088ba9f5f2cb606594b6f33c284402.tar.gz | |
encryption plugin controls the encryption
* no --encryption-algorithm option anymore
* encrypt/decrypt methods in the encryption plugin
* ecnrypt/decrypt methods in the encryption_km service
* file_km plugin has --file-key-management-encryption-algorithm
* debug_km always uses aes_cbc
* example_km changes between aes_cbc and aes_ecb for different key versions
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/encryption_algorithms.combinations | 7 | ||||
| -rw-r--r-- | mysql-test/include/have_example_key_management_plugin.inc | 2 | ||||
| -rw-r--r-- | mysql-test/include/have_file_key_management_plugin.inc | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/include/encryption_algorithms.combinations b/mysql-test/include/encryption_algorithms.combinations index 09c1e91e1cd..f8598401e5f 100644 --- a/mysql-test/include/encryption_algorithms.combinations +++ b/mysql-test/include/encryption_algorithms.combinations @@ -1,8 +1,5 @@ [cbc] -encryption-algorithm=aes_cbc - -[ecb] -encryption-algorithm=aes_ecb +file-key-management-encryption-algorithm=aes_cbc [ctr] -encryption-algorithm=aes_ctr +file-key-management-encryption-algorithm=aes_ctr diff --git a/mysql-test/include/have_example_key_management_plugin.inc b/mysql-test/include/have_example_key_management_plugin.inc index d04aad2532f..a87d3256ee0 100644 --- a/mysql-test/include/have_example_key_management_plugin.inc +++ b/mysql-test/include/have_example_key_management_plugin.inc @@ -1,5 +1,3 @@ --- source encryption_algorithms.inc - if (!$EXAMPLE_KEY_MANAGEMENT_SO) { --skip Needs example_key_management diff --git a/mysql-test/include/have_file_key_management_plugin.inc b/mysql-test/include/have_file_key_management_plugin.inc index f85214332f7..baada3a7d47 100644 --- a/mysql-test/include/have_file_key_management_plugin.inc +++ b/mysql-test/include/have_file_key_management_plugin.inc @@ -1,4 +1,4 @@ --- source encryption_algorithms.inc +--source encryption_algorithms.inc if (!$FILE_KEY_MANAGEMENT_SO) { |