remove get_iv() from the key management plugin API

now IVs are always handled internally

7 files changed, 0 insertions, 23 deletions

diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp
index 8a04186ff77..22bd8d52a30 100644
--- a/include/mysql/plugin_audit.h.pp
+++ b/include/mysql/plugin_audit.h.pp
@@ -203,13 +203,11 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp
index 8fbd7cd38c2..e14d5359c19 100644
--- a/include/mysql/plugin_auth.h.pp
+++ b/include/mysql/plugin_auth.h.pp
@@ -203,13 +203,11 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_encryption_key_management.h b/include/mysql/plugin_encryption_key_management.h
index af7730e5ee7..b989fa14db1 100644
--- a/include/mysql/plugin_encryption_key_management.h
+++ b/include/mysql/plugin_encryption_key_management.h
@@ -59,15 +59,6 @@ struct st_mariadb_encryption_key_management
     @return 0 on success, non-zero on failure
   */
   int (*get_key)(unsigned int version, unsigned char* key, unsigned int keybufsize);
-
-  /**
-    function returning an IV for a key version
-
-    the IV is put in 'iv' buffer, that has size of 'ivbufsize' bytes.
-
-    @return 0 on success, non-zero on failure
-  */
-  int (*get_iv)(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 };
 #endif
 
diff --git a/include/mysql/plugin_encryption_key_management.h.pp b/include/mysql/plugin_encryption_key_management.h.pp
index fc162e143c6..9012fe9252b 100644
--- a/include/mysql/plugin_encryption_key_management.h.pp
+++ b/include/mysql/plugin_encryption_key_management.h.pp
@@ -203,13 +203,11 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
@@ -373,5 +371,4 @@ struct st_mariadb_encryption_key_management
   unsigned int (*has_key_version)(unsigned int version);
   unsigned int (*get_key_size)(unsigned int version);
   int (*get_key)(unsigned int version, unsigned char* key, unsigned int keybufsize);
-  int (*get_iv)(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 };
diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp
index 16374df7936..bd9ec23c811 100644
--- a/include/mysql/plugin_ftparser.h.pp
+++ b/include/mysql/plugin_ftparser.h.pp
@@ -203,13 +203,11 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/plugin_password_validation.h.pp b/include/mysql/plugin_password_validation.h.pp
index 2902a368985..b417dbb5e6d 100644
--- a/include/mysql/plugin_password_validation.h.pp
+++ b/include/mysql/plugin_password_validation.h.pp
@@ -203,13 +203,11 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 struct st_mysql_xid {
   long formatID;
   long gtrid_length;
diff --git a/include/mysql/service_encryption_keys.h b/include/mysql/service_encryption_keys.h
index 69cbcb70592..063f3444f5f 100644
--- a/include/mysql/service_encryption_keys.h
+++ b/include/mysql/service_encryption_keys.h
@@ -30,7 +30,6 @@ extern struct encryption_keys_service_st {
   unsigned int (*has_encryption_key_func)(unsigned int);
   unsigned int (*get_encryption_key_size_func)(unsigned int);
   int (*get_encryption_key_func)(unsigned int, unsigned char*, unsigned int);
-  int (*get_encryption_iv_func)(unsigned int, unsigned char*, unsigned int);
 } *encryption_keys_service;
 
 #ifdef MYSQL_DYNAMIC_PLUGIN
@@ -39,7 +38,6 @@ extern struct encryption_keys_service_st {
 #define has_encryption_key(V) encryption_keys_service->has_encryption_key_func(V)
 #define get_encryption_key_size(V) encryption_keys_service->get_encryption_key_size_func(V)
 #define get_encryption_key(V,K,S) encryption_keys_service->get_encryption_key_func((V), (K), (S))
-#define get_encryption_iv(V, I, S) encryption_keys_service->get_encryption_iv_func((V), (I), (S))
 
 #else
 
@@ -47,7 +45,6 @@ unsigned int get_latest_encryption_key_version();
 unsigned int has_encryption_key(unsigned int version);
 unsigned int get_encryption_key_size(unsigned int version);
 int get_encryption_key(unsigned int version, unsigned char* key, unsigned int keybufsize);
-int get_encryption_iv(unsigned int version, unsigned char* iv, unsigned int ivbufsize);
 
 #endif