Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg

With changes:

* update tests to pass (new encryption/encryption_key_id syntax).
* not merged the code that makes engine aware of the encryption mode
  (CRYPT_SCHEME_1_CBC, CRYPT_SCHEME_1_CTR, storing it on disk, etc),
  because now the encryption plugin is handling it.
* compression+encryption did not work in either branch before the
  merge - and it does not work after the merge. it might be more
  broken after the merge though - some of that code was not merged.
* page checksumming code was not moved (moving of page checksumming
  from fil_space_encrypt() to fil_space_decrypt was not merged).
* restored deleted lines in buf_page_get_frame(), otherwise
  innodb_scrub test failed.

1 files changed, 69 insertions, 0 deletions

diff --git a/storage/innobase/include/fil0crypt.ic b/storage/innobase/include/fil0crypt.ic
new file mode 100644
index 00000000000..80912009e5b
--- /dev/null
+++ b/storage/innobase/include/fil0crypt.ic
@@ -0,0 +1,69 @@
+/*****************************************************************************
+
+Copyright (c) 2015, MariaDB Corporation.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
+
+*****************************************************************************/
+
+/**************************************************//**
+@file include/fil0fil.h
+The low-level file system encryption support functions
+
+Created 04/01/2015 Jan Lindström
+*******************************************************/
+
+/*******************************************************************//**
+Find out whether the page is page encrypted
+@return	true if page is page encrypted, false if not */
+UNIV_INLINE
+bool
+fil_page_is_encrypted(
+/*==================*/
+	const byte *buf)	/*!< in: page */
+{
+	return(mach_read_from_4(buf+FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION) != 0);
+}
+
+/*******************************************************************//**
+Find out whether the page can be decrypted.
+The function for decrypting the page should already be executed before this.
+@return	1 if key provider not available or key is not available
+	0 if decryption should be possible
+*/
+UNIV_INLINE
+bool
+fil_page_encryption_status(
+/*===================*/
+	const byte *buf,	/*!< in: page */
+	ulint space_id)		/*!< in: space_id */
+{
+	ulint page_type = mach_read_from_2(buf+FIL_PAGE_TYPE);
+
+	if (page_type == FIL_PAGE_TYPE_FSP_HDR) {
+		fil_space_crypt_t *crypt_data = fil_space_get_crypt_data(space_id);
+
+		if (crypt_data != NULL) {
+			if (!encryption_key_exists(crypt_data->keys[0].key_version)) {
+				/* accessing table would surely fail, because no key or no key provider available */
+				return 1;
+			}
+		}
+	} else {
+		ulint key = mach_read_from_4(buf + FIL_PAGE_FILE_FLUSH_LSN_OR_KEY_VERSION);
+		if (!encryption_key_exists(key)) {
+			return 1;
+		}
+	}
+	return 0;
+}