diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-27 09:45:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-09 18:42:43 +0200 |
| commit | 9ccafffc29526ea30151eb3e62901bfdb77aaf84 (patch) | |
| tree | eaece68c95f89b79898c903340948b968c479035 /plugin | |
| parent | 6d3dace7d95bfa9627e524787d076124afc7e773 (diff) | |
| download | mariadb-git-9ccafffc29526ea30151eb3e62901bfdb77aaf84.tar.gz | |
rename "encryption key management plugin" to "encryption plugin"
because it's going to do more than just key management
Diffstat (limited to 'plugin')
3 files changed, 12 insertions, 12 deletions
diff --git a/plugin/debug_key_management/debug_key_management_plugin.cc b/plugin/debug_key_management/debug_key_management_plugin.cc index 7ade1b8fde7..9843c08d8bf 100644 --- a/plugin/debug_key_management/debug_key_management_plugin.cc +++ b/plugin/debug_key_management/debug_key_management_plugin.cc @@ -24,7 +24,7 @@ */ #include <my_global.h> -#include <mysql/plugin_encryption_key_management.h> +#include <mysql/plugin_encryption.h> #include <string.h> #include <myisampack.h> @@ -61,8 +61,8 @@ static unsigned int get_key(unsigned int version, unsigned char* dstbuf, unsigne return 0; } -struct st_mariadb_encryption_key_management debug_key_management_plugin= { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_INTERFACE_VERSION, +struct st_mariadb_encryption debug_key_management_plugin= { + MariaDB_ENCRYPTION_INTERFACE_VERSION, get_latest_key_version, get_key }; @@ -72,7 +72,7 @@ struct st_mariadb_encryption_key_management debug_key_management_plugin= { */ maria_declare_plugin(debug_key_management) { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, + MariaDB_ENCRYPTION_PLUGIN, &debug_key_management_plugin, "debug_key_management", "Sergei Golubchik", diff --git a/plugin/example_key_management/example_key_management_plugin.cc b/plugin/example_key_management/example_key_management_plugin.cc index 28cae3c311e..5ced65a7088 100644 --- a/plugin/example_key_management/example_key_management_plugin.cc +++ b/plugin/example_key_management/example_key_management_plugin.cc @@ -28,7 +28,7 @@ #include <my_global.h> #include <my_pthread.h> #include <my_aes.h> -#include <mysql/plugin_encryption_key_management.h> +#include <mysql/plugin_encryption.h> #include <my_md5.h> #include <my_rnd.h> #include "sql_class.h" @@ -101,8 +101,8 @@ static int example_key_management_plugin_deinit(void *p) return 0; } -struct st_mariadb_encryption_key_management example_key_management_plugin= { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_INTERFACE_VERSION, +struct st_mariadb_encryption example_key_management_plugin= { + MariaDB_ENCRYPTION_INTERFACE_VERSION, get_latest_key_version, get_key }; @@ -112,7 +112,7 @@ struct st_mariadb_encryption_key_management example_key_management_plugin= { */ maria_declare_plugin(example_key_management) { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, + MariaDB_ENCRYPTION_PLUGIN, &example_key_management_plugin, "example_key_management", "Jonas Oreland", diff --git a/plugin/file_key_management/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc index 60007e4487d..be623706051 100644 --- a/plugin/file_key_management/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.cc @@ -16,7 +16,7 @@ #include "parser.h" #include <mysql_version.h> -#include <mysql/plugin_encryption_key_management.h> +#include <mysql/plugin_encryption.h> #include <string.h> static char* filename; @@ -94,8 +94,8 @@ static int file_key_management_plugin_init(void *p) return parser.parse(&keys); } -struct st_mariadb_encryption_key_management file_key_management_plugin= { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_INTERFACE_VERSION, +struct st_mariadb_encryption file_key_management_plugin= { + MariaDB_ENCRYPTION_INTERFACE_VERSION, get_highest_key_used_in_key_file, get_key_from_key_file }; @@ -105,7 +105,7 @@ struct st_mariadb_encryption_key_management file_key_management_plugin= { */ maria_declare_plugin(file_key_management) { - MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, + MariaDB_ENCRYPTION_PLUGIN, &file_key_management_plugin, "file_key_management", "Denis Endro eperi GmbH", |