diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-02 22:53:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-10 10:21:18 +0100 |
| commit | 21430e43786edaf5b689c8b4aed49341bb7021c8 (patch) | |
| tree | d3d094c02cd596d66da0b5c23c3f89698c5ed7d9 /storage | |
| parent | cf8bf0b68e1c4281535813d4087680296138271c (diff) | |
| download | mariadb-git-21430e43786edaf5b689c8b4aed49341bb7021c8.tar.gz | |
encryption keys service
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 1 | ||||
| -rw-r--r-- | storage/innobase/include/fsp0pageencryption.ic | 1 | ||||
| -rw-r--r-- | storage/innobase/include/log0crypt.h | 1 | ||||
| -rw-r--r-- | storage/xtradb/fil/fil0crypt.cc | 1 | ||||
| -rw-r--r-- | storage/xtradb/include/fsp0pageencryption.ic | 1 | ||||
| -rw-r--r-- | storage/xtradb/include/log0crypt.h | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index c12bc385720..9d4c66d4343 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -13,7 +13,6 @@ #include "fil0pageencryption.h" #include <my_crypt.h> -#include <my_crypt_key_management.h> #include <my_aes.h> #include <math.h> diff --git a/storage/innobase/include/fsp0pageencryption.ic b/storage/innobase/include/fsp0pageencryption.ic index e2bd76679ee..b5c3f5ab666 100644 --- a/storage/innobase/include/fsp0pageencryption.ic +++ b/storage/innobase/include/fsp0pageencryption.ic @@ -25,7 +25,6 @@ Created 08/28/2014 #include "fsp0fsp.h" #include "fil0pageencryption.h" -#include <my_crypt_key_management.h> /********************************************************************//** diff --git a/storage/innobase/include/log0crypt.h b/storage/innobase/include/log0crypt.h index 0c0d046c471..9c7c0229ba4 100644 --- a/storage/innobase/include/log0crypt.h +++ b/storage/innobase/include/log0crypt.h @@ -12,7 +12,6 @@ Created 11/25/2013 Minli Zhu #include "ut0lst.h" #include "ut0rnd.h" #include "my_aes.h" -#include <my_crypt_key_management.h> #define PURPOSE_BYTE_LEN MY_AES_BLOCK_SIZE - 1 #define PURPOSE_BYTE_OFFSET 0 diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc index be0c120c6c7..1bda5d9aab7 100644 --- a/storage/xtradb/fil/fil0crypt.cc +++ b/storage/xtradb/fil/fil0crypt.cc @@ -13,7 +13,6 @@ #include "fil0pageencryption.h" #include <my_crypt.h> -#include <my_crypt_key_management.h> #include <my_aes.h> #include <math.h> diff --git a/storage/xtradb/include/fsp0pageencryption.ic b/storage/xtradb/include/fsp0pageencryption.ic index 311618e905a..d3137001fc5 100644 --- a/storage/xtradb/include/fsp0pageencryption.ic +++ b/storage/xtradb/include/fsp0pageencryption.ic @@ -25,7 +25,6 @@ Created 08/28/2014 #include "fsp0fsp.h" #include "fil0pageencryption.h" -#include <my_crypt_key_management.h> /********************************************************************//** Determine if the tablespace is page encrypted from dict_table_t::flags. diff --git a/storage/xtradb/include/log0crypt.h b/storage/xtradb/include/log0crypt.h index 0c0d046c471..9c7c0229ba4 100644 --- a/storage/xtradb/include/log0crypt.h +++ b/storage/xtradb/include/log0crypt.h @@ -12,7 +12,6 @@ Created 11/25/2013 Minli Zhu #include "ut0lst.h" #include "ut0rnd.h" #include "my_aes.h" -#include <my_crypt_key_management.h> #define PURPOSE_BYTE_LEN MY_AES_BLOCK_SIZE - 1 #define PURPOSE_BYTE_OFFSET 0 |