InnoDB/XtraDB Encryption cleanup.

Step 1:
-- Remove page encryption from dictionary (per table
encryption will be handled by storing crypt_data to page 0)
-- Remove encryption/compression from os0file and all functions
before that (compression will be added to buf0buf.cc)
-- Use same CRYPT_SCHEME_1 for all encryption methods
-- Do some code cleanups to confort InnoDB coding style

1 files changed, 4 insertions, 33 deletions

diff --git a/storage/xtradb/include/dict0dict.ic b/storage/xtradb/include/dict0dict.ic
index c480b3c6216..e5f4ec21bd2 100644
--- a/storage/xtradb/include/dict0dict.ic
+++ b/storage/xtradb/include/dict0dict.ic
@@ -543,9 +543,6 @@ dict_tf_is_valid(
 	ulint	data_dir = DICT_TF_HAS_DATA_DIR(flags);
 	ulint	atomic_writes = DICT_TF_GET_ATOMIC_WRITES(flags);
 
-	ulint	page_encryption = DICT_TF_GET_PAGE_ENCRYPTION(flags);
-	ulint	page_encryption_key = DICT_TF_GET_PAGE_ENCRYPTION_KEY(flags);
-
 	/* Make sure there are no bits that we do not know about. */
 	if (unused != 0) {
 
@@ -556,12 +553,10 @@ dict_tf_is_valid(
 			"InnoDB: compact %ld atomic_blobs %ld\n"
 			"InnoDB: unused %ld data_dir %ld zip_ssize %ld\n"
 			"InnoDB: page_compression %ld page_compression_level %ld\n"
-			"InnoDB: atomic_writes %ld\n"
-			"InnoDB: page_encryption %ld page_encryption_key %ld\n",
+			"InnoDB: atomic_writes %ld\n",
 			unused,
 			compact, atomic_blobs, unused, data_dir, zip_ssize,
-			page_compression, page_compression_level, atomic_writes,
-			page_encryption, page_encryption_key
+			page_compression, page_compression_level, atomic_writes
 		);
 
 		return(false);
@@ -861,9 +856,7 @@ dict_tf_set(
 					pages */
 	ulint		page_compression_level, /*!< in: table page compression
 						 level */
-	ulint		atomic_writes,  /*!< in: table atomic writes setup */
-	bool		page_encrypted, /*!< in: table uses page encryption */
-	ulint		page_encryption_key /*!< in: page encryption key */)
+	ulint		atomic_writes)  /*!< in: table atomic writes setup */
 {
 	atomic_writes_t awrites = (atomic_writes_t)atomic_writes;
 
@@ -904,11 +897,6 @@ dict_tf_set(
 
 	*flags |= (atomic_writes << DICT_TF_POS_ATOMIC_WRITES);
 	ut_a(dict_tf_get_atomic_writes(*flags) == awrites);
-
-	if (page_encrypted) {
-		*flags |= (1 << DICT_TF_POS_PAGE_ENCRYPTION)
-               | (page_encryption_key << DICT_TF_POS_PAGE_ENCRYPTION_KEY);
-	}
 }
 
 /********************************************************************//**
@@ -931,11 +919,6 @@ dict_tf_to_fsp_flags(
 	ulint fsp_flags;
 	ulint page_compression = DICT_TF_GET_PAGE_COMPRESSION(table_flags);
 	ulint page_compression_level = DICT_TF_GET_PAGE_COMPRESSION_LEVEL(table_flags);
-
-	ulint page_encryption = DICT_TF_GET_PAGE_ENCRYPTION(table_flags);
-        /* Keys are limited to 255 values */
-	ulint page_encryption_key = DICT_TF_GET_PAGE_ENCRYPTION_KEY(table_flags);
-
 	ulint atomic_writes = DICT_TF_GET_ATOMIC_WRITES(table_flags);
 
 	DBUG_EXECUTE_IF("dict_tf_to_fsp_flags_failure",
@@ -963,14 +946,6 @@ dict_tf_to_fsp_flags(
 	if page compression is used for this table. */
 	fsp_flags |= FSP_FLAGS_SET_PAGE_COMPRESSION_LEVEL(fsp_flags, page_compression_level);
 
-	/* In addition, tablespace flags also contain if the page
-	encryption is used for this table. */
-	fsp_flags |= FSP_FLAGS_SET_PAGE_ENCRYPTION(fsp_flags, page_encryption);
-
-	/* In addition, tablespace flags also contain page encryption key if the page
-	encryption is used for this table. */
-	fsp_flags |= FSP_FLAGS_SET_PAGE_ENCRYPTION_KEY(fsp_flags, page_encryption_key);
-
 	/* In addition, tablespace flags also contain flag if atomic writes
 	is used for this table */
 	fsp_flags |= FSP_FLAGS_SET_ATOMIC_WRITES(fsp_flags, atomic_writes);
@@ -1012,8 +987,6 @@ dict_sys_tables_type_to_tf(
 			 | DICT_TF_MASK_PAGE_COMPRESSION
 			 | DICT_TF_MASK_PAGE_COMPRESSION_LEVEL
 			 | DICT_TF_MASK_ATOMIC_WRITES
-		         | DICT_TF_MASK_PAGE_ENCRYPTION
-		         | DICT_TF_MASK_PAGE_ENCRYPTION_KEY
 
 	);
 
@@ -1050,9 +1023,7 @@ dict_tf_to_sys_tables_type(
 			 | DICT_TF_MASK_DATA_DIR
 			 | DICT_TF_MASK_PAGE_COMPRESSION
 			 | DICT_TF_MASK_PAGE_COMPRESSION_LEVEL
-		         | DICT_TF_MASK_ATOMIC_WRITES
-		         | DICT_TF_MASK_PAGE_ENCRYPTION
-		         | DICT_TF_MASK_PAGE_ENCRYPTION_KEY);
+			 | DICT_TF_MASK_ATOMIC_WRITES);
 
 	return(type);
 }