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 /sql/sys_vars.cc | |
| 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 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 9cba8739eee..32935f3404e 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -5168,14 +5168,6 @@ static Sys_var_mybool Sys_encrypt_tmp_disk_tables( GLOBAL_VAR(encrypt_tmp_disk_tables), CMD_LINE(OPT_ARG), DEFAULT(FALSE)); -const char *encryption_algorithm_names[]= -{ "none", "aes_ecb", "aes_cbc", "aes_ctr", 0 }; -static Sys_var_enum Sys_encryption_algorithm( - "encryption_algorithm", - "Which encryption algorithm to use for table encryption. aes_cbc is the recommended one.", - READ_ONLY GLOBAL_VAR(encryption_algorithm),CMD_LINE(REQUIRED_ARG), - encryption_algorithm_names, DEFAULT(0)); - static bool check_pseudo_slave_mode(sys_var *self, THD *thd, set_var *var) { longlong previous_val= thd->variables.pseudo_slave_mode; |