rename "encryption key management plugin" to "encryption plugin"

because it's going to do more than just key management

4 files changed, 9 insertions, 9 deletions

diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index 6a4e5448fa9..09026514a88 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -92,7 +92,7 @@ typedef struct st_mysql_xid MYSQL_XID;
 
 /* MariaDB plugin types */
 #define MariaDB_PASSWORD_VALIDATION_PLUGIN  8
-#define MariaDB_ENCRYPTION_KEY_MANAGEMENT_PLUGIN 9
+#define MariaDB_ENCRYPTION_PLUGIN 9
 
 /* We use the following strings to define licenses for plugins */
 #define PLUGIN_LICENSE_PROPRIETARY 0
diff --git a/include/mysql/plugin_encryption_key_management.h b/include/mysql/plugin_encryption.h
index a7fc379962b..43697096f04 100644
--- a/include/mysql/plugin_encryption_key_management.h
+++ b/include/mysql/plugin_encryption.h
@@ -1,4 +1,4 @@
-#ifndef MYSQL_PLUGIN_ENCRYPTION_KEY_MANAGEMENT_INCLUDED
+#ifndef MYSQL_PLUGIN_ENCRYPTION_INCLUDED
 /* Copyright (C) 2014 Sergei Golubchik and MariaDB
 
    This program is free software; you can redistribute it and/or modify
@@ -17,25 +17,25 @@
 /**
   @file
 
-  Encryption key Management Plugin API.
+  Encryption Plugin API.
 
   This file defines the API for server plugins that manage encryption
   keys for MariaDB on-disk data encryption.
 */
 
-#define MYSQL_PLUGIN_ENCRYPTION_KEY_MANAGEMENT_INCLUDED
+#define MYSQL_PLUGIN_ENCRYPTION_INCLUDED
 
 #include <mysql/plugin.h>
 
-#define MariaDB_ENCRYPTION_KEY_MANAGEMENT_INTERFACE_VERSION 0x0200
+#define MariaDB_ENCRYPTION_INTERFACE_VERSION 0x0200
 
 #define BAD_ENCRYPTION_KEY_VERSION (~(unsigned int)0)
 #define KEY_BUFFER_TOO_SMALL       (100)
 
 /**
-  Encryption key management plugin descriptor
+  Encryption plugin descriptor
 */
-struct st_mariadb_encryption_key_management
+struct st_mariadb_encryption
 {
   int interface_version;                        /**< version plugin uses */
 
diff --git a/include/mysql/plugin_encryption_key_management.h.pp b/include/mysql/plugin_encryption.h.pp
index fb39b807d1c..a09e0e0543b 100644
--- a/include/mysql/plugin_encryption_key_management.h.pp
+++ b/include/mysql/plugin_encryption.h.pp
@@ -362,7 +362,7 @@ void *thd_get_ha_data(const void* thd, const struct handlerton *hton);
 void thd_set_ha_data(void* thd, const struct handlerton *hton,
                      const void *ha_data);
 void thd_wakeup_subsequent_commits(void* thd, int wakeup_error);
-struct st_mariadb_encryption_key_management
+struct st_mariadb_encryption
 {
   int interface_version;
   unsigned int (*get_latest_key_version)();
diff --git a/include/mysql/service_encryption_keys.h b/include/mysql/service_encryption_keys.h
index 69304899405..f162bba3cff 100644
--- a/include/mysql/service_encryption_keys.h
+++ b/include/mysql/service_encryption_keys.h
@@ -18,7 +18,7 @@
   @file
   encryption keys service
 
-  Functions to get encryption keys and IV from the encryption key management plugin
+  Functions to get encryption keys from the encryption plugin
 */
 
 #ifdef __cplusplus