summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-05-10 20:57:16 +0200
committerSergei Golubchik <serg@mariadb.org>2015-05-13 14:27:17 +0200
commitacd992d4b7fafa40a1c7a85b64238829b831e0bf (patch)
tree39901de3e2b30eabac9ce48796abe5e199ddd526 /plugin
parentbea3f30d46c7611db26ebeb6143cd0ef96d91695 (diff)
downloadmariadb-git-acd992d4b7fafa40a1c7a85b64238829b831e0bf.tar.gz
MDEV-8022 Assertion `rc == 0' failed in ma_encrypt on dropping an encrypted Aria table
fix encryption of the last partial block * now really encrypt it, using key and iv * support the case of very short plaintext (less than one block) * recommend aes_ctr over aes_cbc, because the former doesn't have problems with partial blocks
Diffstat (limited to 'plugin')
-rw-r--r--plugin/file_key_management/file_key_management_plugin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc
index 08c0c9b74c8..666a5190860 100644
--- a/plugin/file_key_management/file_key_management_plugin.cc
+++ b/plugin/file_key_management/file_key_management_plugin.cc
@@ -50,7 +50,7 @@ static MYSQL_SYSVAR_STR(filekey, filekey,
static MYSQL_SYSVAR_ENUM(encryption_algorithm, encryption_algorithm,
PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
- "Encryption algorithm to use.",
+ "Encryption algorithm to use, aes_ctr is the recommended one.",
NULL, NULL, 0, &encryption_algorithm_typelib);
static struct st_mysql_sys_var* settings[] = {