diff --git a/mysql-test/include/have_example_key_management_plugin.inc b/mysql-test/include/have_example_key_management_plugin.inc index 3bb4529b623..756a9e39f3d 100644 --- a/mysql-test/include/have_example_key_management_plugin.inc +++ b/mysql-test/include/have_example_key_management_plugin.inc @@ -1,7 +1,7 @@ -- source encryption_algorithms.inc if (`select count(*) = 0 from information_schema.plugins - where plugin_name = 'example_key_management_plugin' and plugin_status='active'`) + where plugin_name = 'example_key_management' and plugin_status='active'`) { - --skip Needs example_key_management_plugin + --skip Needs example_key_management } diff --git a/mysql-test/include/have_example_key_management_plugin.opt b/mysql-test/include/have_example_key_management_plugin.opt index 581ee1c73b9..ce7f1ddef7e 100644 --- a/mysql-test/include/have_example_key_management_plugin.opt +++ b/mysql-test/include/have_example_key_management_plugin.opt @@ -1,2 +1,2 @@ ---plugin-load-add=$EXAMPLE_KEY_MANAGEMENT_PLUGIN_SO ---loose-example-key-management-plugin +--plugin-load-add=$EXAMPLE_KEY_MANAGEMENT_SO +--loose-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 3b3eb036ede..cd2f9510a53 100644 --- a/mysql-test/include/have_file_key_management_plugin.inc +++ b/mysql-test/include/have_file_key_management_plugin.inc @@ -1,7 +1,7 @@ -- source encryption_algorithms.inc if (`select count(*) = 0 from information_schema.plugins - where plugin_name = 'file_key_management_plugin' and plugin_status='active'`) + where plugin_name = 'file_key_management' and plugin_status='active'`) { - --skip Needs file_key_management_plugin + --skip Needs file_key_management } diff --git a/mysql-test/include/have_file_key_management_plugin.opt b/mysql-test/include/have_file_key_management_plugin.opt index 5aa1ce18b00..76808d02a7a 100644 --- a/mysql-test/include/have_file_key_management_plugin.opt +++ b/mysql-test/include/have_file_key_management_plugin.opt @@ -1,4 +1,4 @@ ---plugin-load-add=$FILE_KEY_MANAGEMENT_PLUGIN_SO ---loose-file-key-management-plugin ---loose-file-key-management-plugin-filename=$MYSQL_TEST_DIR/std_data/keys.txt +--plugin-load-add=$FILE_KEY_MANAGEMENT_SO +--loose-file-key-management +--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys.txt diff --git a/mysql-test/suite/innodb/r/innodb_encryption_debug.result b/mysql-test/suite/innodb/r/innodb_encryption_debug.result index 808ebbf3f74..781796bb69a 100644 --- a/mysql-test/suite/innodb/r/innodb_encryption_debug.result +++ b/mysql-test/suite/innodb/r/innodb_encryption_debug.result @@ -10,10 +10,10 @@ space name min_key_version current_key_version 1 mysql/innodb_table_stats 0 1 2 mysql/innodb_index_stats 0 1 0 NULL 0 1 -set global debug_key_management_plugin_version=10; +set global debug_key_management_version=10; select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption; space name min_key_version current_key_version 1 mysql/innodb_table_stats 0 10 2 mysql/innodb_index_stats 0 10 0 NULL 0 10 -set global debug_key_management_plugin_version=1; +set global debug_key_management_version=1; diff --git a/mysql-test/suite/innodb/t/innodb_encryption_debug.opt b/mysql-test/suite/innodb/t/innodb_encryption_debug.opt index d7c0b5bcd6a..11f1e90d481 100644 --- a/mysql-test/suite/innodb/t/innodb_encryption_debug.opt +++ b/mysql-test/suite/innodb/t/innodb_encryption_debug.opt @@ -2,4 +2,4 @@ --innodb-encryption-rotate-key-age=2 --innodb-encryption-threads=4 --innodb-tablespaces-encryption ---plugin-load-add=$DEBUG_KEY_MANAGEMENT_PLUGIN_SO +--plugin-load-add=$DEBUG_KEY_MANAGEMENT_SO diff --git a/mysql-test/suite/innodb/t/innodb_encryption_debug.test b/mysql-test/suite/innodb/t/innodb_encryption_debug.test index cc455d87945..13c2a786d6a 100644 --- a/mysql-test/suite/innodb/t/innodb_encryption_debug.test +++ b/mysql-test/suite/innodb/t/innodb_encryption_debug.test @@ -1,13 +1,13 @@ -- source include/have_innodb.inc if (`select count(*) = 0 from information_schema.plugins - where plugin_name = 'debug_key_management_plugin' and plugin_status='active'`) + where plugin_name = 'debug_key_management' and plugin_status='active'`) { - --skip Needs debug_key_management_plugin + --skip Needs debug_key_management } show variables like 'innodb_encrypt%'; select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption; -set global debug_key_management_plugin_version=10; +set global debug_key_management_version=10; select space,name,min_key_version,current_key_version from information_schema.innodb_tablespaces_encryption; -set global debug_key_management_plugin_version=1; +set global debug_key_management_version=1; diff --git a/mysql-test/suite/plugins/r/show_all_plugins.result b/mysql-test/suite/plugins/r/show_all_plugins.result index 5fe80e23af0..f656811674e 100644 --- a/mysql-test/suite/plugins/r/show_all_plugins.result +++ b/mysql-test/suite/plugins/r/show_all_plugins.result @@ -21,7 +21,7 @@ Name Status Type Library License EXAMPLE NOT INSTALLED STORAGE ENGINE ha_example.so GPL UNUSABLE NOT INSTALLED DAEMON ha_example.so GPL daemon_example NOT INSTALLED DAEMON libdaemon_example.so GPL -example_key_management_plugin NOT INSTALLED ENCRYPTION KEY MANAGEMENT example_key_management_plugin.so GPL +example_key_management NOT INSTALLED ENCRYPTION KEY MANAGEMENT example_key_management.so GPL three_attempts NOT INSTALLED AUTHENTICATION dialog_examples.so GPL two_questions NOT INSTALLED AUTHENTICATION dialog_examples.so GPL show status like '%libraries%'; diff --git a/mysql-test/suite/plugins/t/show_all_plugins.test b/mysql-test/suite/plugins/t/show_all_plugins.test index 5d57def449b..103b6bead5a 100644 --- a/mysql-test/suite/plugins/t/show_all_plugins.test +++ b/mysql-test/suite/plugins/t/show_all_plugins.test @@ -2,7 +2,7 @@ if (!$DIALOG_EXAMPLES_SO) { skip requires dialog_examples.so; } if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; } if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; } if (!$UDF_EXAMPLE_SO) { skip requires udf_example.so; } -if (!$EXAMPLE_KEY_MANAGEMENT_PLUGIN_SO) { skip requires example_key_management_plugin_so; } +if (!$EXAMPLE_KEY_MANAGEMENT_SO) { skip requires example_key_management.so; } flush status; show status like '%libraries%'; diff --git a/plugin/debug_key_management/CMakeLists.txt b/plugin/debug_key_management/CMakeLists.txt new file mode 100644 index 00000000000..101a790023d --- /dev/null +++ b/plugin/debug_key_management/CMakeLists.txt @@ -0,0 +1,2 @@ +MYSQL_ADD_PLUGIN(DEBUG_KEY_MANAGEMENT debug_key_management_plugin.cc + MODULE_ONLY) diff --git a/plugin/debug_key_management_plugin/debug_key_management_plugin.cc b/plugin/debug_key_management/debug_key_management_plugin.cc similarity index 96% rename from plugin/debug_key_management_plugin/debug_key_management_plugin.cc rename to plugin/debug_key_management/debug_key_management_plugin.cc index 66c76523540..1d332e62381 100644 --- a/plugin/debug_key_management_plugin/debug_key_management_plugin.cc +++ b/plugin/debug_key_management/debug_key_management_plugin.cc @@ -73,11 +73,11 @@ struct st_mariadb_encryption_key_management debug_key_management_plugin= { /* Plugin library descriptor */ -maria_declare_plugin(debug_key_management_plugin) +maria_declare_plugin(debug_key_management) { MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, &debug_key_management_plugin, - "debug_key_management_plugin", + "debug_key_management", "Sergei Golubchik", "Debug key management plugin", PLUGIN_LICENSE_GPL, diff --git a/plugin/debug_key_management_plugin/CMakeLists.txt b/plugin/debug_key_management_plugin/CMakeLists.txt deleted file mode 100644 index d61adf00537..00000000000 --- a/plugin/debug_key_management_plugin/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -MYSQL_ADD_PLUGIN(DEBUG_KEY_MANAGEMENT_PLUGIN debug_key_management_plugin.cc - MODULE_ONLY) diff --git a/plugin/example_key_management/CMakeLists.txt b/plugin/example_key_management/CMakeLists.txt new file mode 100644 index 00000000000..a121e6c1f7d --- /dev/null +++ b/plugin/example_key_management/CMakeLists.txt @@ -0,0 +1,2 @@ +MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT example_key_management_plugin.cc + MODULE_ONLY) diff --git a/plugin/example_key_management_plugin/example_key_management_plugin.cc b/plugin/example_key_management/example_key_management_plugin.cc similarity index 97% rename from plugin/example_key_management_plugin/example_key_management_plugin.cc rename to plugin/example_key_management/example_key_management_plugin.cc index 6ccdfa5f4c5..6548baef20c 100644 --- a/plugin/example_key_management_plugin/example_key_management_plugin.cc +++ b/plugin/example_key_management/example_key_management_plugin.cc @@ -123,11 +123,11 @@ struct st_mariadb_encryption_key_management example_key_management_plugin= { /* Plugin library descriptor */ -maria_declare_plugin(example_key_management_plugin) +maria_declare_plugin(example_key_management) { MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, &example_key_management_plugin, - "example_key_management_plugin", + "example_key_management", "Jonas Oreland", "Example key management plugin", PLUGIN_LICENSE_GPL, diff --git a/plugin/example_key_management_plugin/CMakeLists.txt b/plugin/example_key_management_plugin/CMakeLists.txt deleted file mode 100644 index 95ff433dc43..00000000000 --- a/plugin/example_key_management_plugin/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -MYSQL_ADD_PLUGIN(EXAMPLE_KEY_MANAGEMENT_PLUGIN example_key_management_plugin.cc - MODULE_ONLY) diff --git a/plugin/file_key_management_plugin/CMakeLists.txt b/plugin/file_key_management/CMakeLists.txt similarity index 66% rename from plugin/file_key_management_plugin/CMakeLists.txt rename to plugin/file_key_management/CMakeLists.txt index 8a0429e979e..15c0357f47b 100644 --- a/plugin/file_key_management_plugin/CMakeLists.txt +++ b/plugin/file_key_management/CMakeLists.txt @@ -1,6 +1,6 @@ SET(FILE_KEY_MANAGEMENT_PLUGIN_SOURCES file_key_management_plugin.cc EncKeys.cc KeySingleton.cc) IF(NOT SSL_SOURCES) - MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT_PLUGIN ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES} + MYSQL_ADD_PLUGIN(FILE_KEY_MANAGEMENT ${FILE_KEY_MANAGEMENT_PLUGIN_SOURCES} LINK_LIBRARIES pcre) ENDIF() diff --git a/plugin/file_key_management_plugin/EncKeys.cc b/plugin/file_key_management/EncKeys.cc similarity index 100% rename from plugin/file_key_management_plugin/EncKeys.cc rename to plugin/file_key_management/EncKeys.cc diff --git a/plugin/file_key_management_plugin/EncKeys.h b/plugin/file_key_management/EncKeys.h similarity index 100% rename from plugin/file_key_management_plugin/EncKeys.h rename to plugin/file_key_management/EncKeys.h diff --git a/plugin/file_key_management_plugin/KeySingleton.cc b/plugin/file_key_management/KeySingleton.cc similarity index 100% rename from plugin/file_key_management_plugin/KeySingleton.cc rename to plugin/file_key_management/KeySingleton.cc diff --git a/plugin/file_key_management_plugin/KeySingleton.h b/plugin/file_key_management/KeySingleton.h similarity index 100% rename from plugin/file_key_management_plugin/KeySingleton.h rename to plugin/file_key_management/KeySingleton.h diff --git a/plugin/file_key_management_plugin/file_key_management_plugin.cc b/plugin/file_key_management/file_key_management_plugin.cc similarity index 96% rename from plugin/file_key_management_plugin/file_key_management_plugin.cc rename to plugin/file_key_management/file_key_management_plugin.cc index 17e5dd089b5..806d50938dd 100644 --- a/plugin/file_key_management_plugin/file_key_management_plugin.cc +++ b/plugin/file_key_management/file_key_management_plugin.cc @@ -211,13 +211,13 @@ static int file_key_management_plugin_init(void *p) if (current_aes_dynamic_method == MY_AES_ALGORITHM_NONE) { sql_print_error("No encryption method choosen with --encryption-algorithm. " - "file_key_management_plugin disabled"); + "file_key_management disabled"); return 1; } if (filename == NULL || strcmp("", filename) == 0) { - sql_print_error("Parameter file_key_management_plugin_filename is required"); + sql_print_error("Parameter file_key_management_filename is required"); return 1; } @@ -245,13 +245,13 @@ struct st_mariadb_encryption_key_management file_key_management_plugin= { /* Plugin library descriptor */ -maria_declare_plugin(file_key_management_plugin) +maria_declare_plugin(file_key_management) { MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN, &file_key_management_plugin, - "file_key_management_plugin", + "file_key_management", "Denis Endro eperi GmbH", - "File key management plugin", + "File-based key management plugin", PLUGIN_LICENSE_GPL, file_key_management_plugin_init, /* Plugin Init */ file_key_management_plugin_deinit, /* Plugin Deinit */