MDEV-8041: InnoDB redo log encryption

Merged new version of InnoDB/XtraDB redo log encryption from Google
provided by Jonas Oreland.

Author: Jan Lindström

storage/innobase/include/log0crypt.h

@@ -9,69 +9,21 @@ Created 11/25/2013 Minli Zhu
 
 #include "univ.i"
 #include "ut0byte.h"
-#include "ut0lst.h"
-#include "ut0rnd.h"
 #include "my_crypt.h"
 
-#define PURPOSE_BYTE_LEN	MY_AES_BLOCK_SIZE - 1
-#define PURPOSE_BYTE_OFFSET	0
-#define UNENCRYPTED_KEY_VER	ENCRYPTION_KEY_NOT_ENCRYPTED
-
 typedef int Crypt_result;
 
 /* If true, enable redo log encryption. */
 extern my_bool srv_encrypt_log;
-/* Plain text used by AES_ECB to generate redo log crypt key. */
-extern byte redo_log_crypt_msg[MY_AES_BLOCK_SIZE];
-/* IV to concatenate with counter used by AES_CTR for redo log crypto. */
-extern byte aes_ctr_nonce[MY_AES_BLOCK_SIZE];
-
-/*********************************************************************//**
-Generate a 128-bit random message used to generate redo log crypto key.
-Init AES-CTR iv/nonce with random number.
-It is called only when clean startup (i.e., redo logs do not exist). */
-UNIV_INTERN
-void
-log_init_crypt_msg_and_nonce(void);
-/*===============================*/
-/*********************************************************************//**
-Init log_sys redo log crypto key. */
-UNIV_INTERN
-void
-log_init_crypt_key(
-/*===============*/
-	const byte* crypt_msg,		/*< in: crypt msg */
-	const uint crypt_ver,		/*< in: mysqld key version */
-	byte* crypt_key);		/*< out: crypt struct with key and iv */
-/*********************************************************************//**
-Encrypt log blocks. */
-UNIV_INTERN
-Crypt_result
-log_blocks_encrypt(
-/*===============*/
-	const byte* blocks,		/*!< in: blocks before encryption */
-	const ulint size,		/*!< in: size of blocks, must be multiple of a log block */
-	byte* dst_blocks);		/*!< out: blocks after encryption */
 
-/*********************************************************************//**
-Decrypt log blocks. */
-UNIV_INTERN
-Crypt_result
-log_blocks_decrypt(
-/*===============*/
-	const byte* blocks,		/*!< in: blocks before decryption */
-	const ulint size,		/*!< in: size of blocks, must be multiple of a log block */
-	byte* dst_blocks);		/*!< out: blocks after decryption */
-
-/*********************************************************************//**
-Set next checkpoint's key version to latest one, and generate current
-key. Key version 0 means no encryption. */
+/***********************************************************************
+Set next checkpoint's key version to latest one, and generate new key */
 UNIV_INTERN
 void
 log_crypt_set_ver_and_key(
 /*======================*/
-	uint& key_ver,			/*!< out: latest key version */
-	byte* crypt_key);		/*!< out: crypto key */
+	ib_uint64_t next_checkpoint_no);
+
 
 /*********************************************************************//**
 Writes the crypto (version, msg and iv) info, which has been used for
@@ -83,4 +35,34 @@ log_crypt_write_checkpoint_buf(
 /*===========================*/
 	byte*	buf);			/*!< in/out: checkpoint buffer */
 
+/*********************************************************************//**
+Read the crypto (version, msg and iv) info, which has been used for
+log blocks with lsn <= this checkpoint's lsn, from a log header's
+checkpoint buf. */
+UNIV_INTERN
+void
+log_crypt_read_checkpoint_buf(
+/*===========================*/
+	const byte*	buf);			/*!< in: checkpoint buffer */
+
+/********************************************************
+Encrypt one or more log block before it is flushed to disk */
+UNIV_INTERN
+void
+log_encrypt_before_write(
+/*===========================*/
+	ib_uint64_t next_checkpoint_no,	/*!< in: log group to be flushed */
+	byte* block,			/*!< in/out: pointer to a log block */
+	const ulint size);		/*!< in: size of log blocks */
+
+/********************************************************
+Decrypt a specified log segment after they are read from a log file to a buffer.
+*/
+UNIV_INTERN
+void
+log_decrypt_after_read(
+/*==========================*/
+	byte* frame,	/*!< in/out: log segment */
+	const ulint size);	/*!< in: log segment size */
+
 #endif  // log0crypt.h

storage/innobase/include/log0log.h

@@ -677,19 +677,15 @@ extern log_t*	log_sys;
 #endif
 #define LOG_CHECKPOINT_OFFSET_HIGH32	(16 + LOG_CHECKPOINT_ARRAY_END)
 #define LOG_CRYPT_VER			(20 + LOG_CHECKPOINT_ARRAY_END)
-					/*!< 32-bit key version. Corresponding
-					key has been used for log records with                                        
-					lsn <= the checkpoint' lsn */
-#define LOG_CRYPT_MSG			(24 + LOG_CHECKPOINT_ARRAY_END)
-					/*!< a 128-bit value used to
-					derive cryto key for redo log.
-					It is generated via the concatenation
-					of 1 purpose byte T (0x02) and a
-					15-byte random number.*/
-#define LOG_CRYPT_IV			(40 + LOG_CHECKPOINT_ARRAY_END)
-					/*!< a 128-bit random number used as
-					AES-CTR iv/nonce for redo log */
-#define LOG_CHECKPOINT_SIZE		(56 + LOG_CHECKPOINT_ARRAY_END)
+
+#define LOG_CRYPT_MAX_ENTRIES           (5)
+#define LOG_CRYPT_ENTRY_SIZE            (4 + 4 + 2 * MY_AES_BLOCK_SIZE)
+#define LOG_CRYPT_SIZE                  (1 + 1 +			\
+					 (LOG_CRYPT_MAX_ENTRIES *	\
+					  LOG_CRYPT_ENTRY_SIZE))
+
+#define LOG_CHECKPOINT_SIZE		(20 + LOG_CHECKPOINT_ARRAY_END + \
+					 LOG_CRYPT_SIZE)
 
 /* Offsets of a log file header */
 #define LOG_GROUP_ID		0	/* log group number */
@@ -794,10 +790,6 @@ struct log_t{
 	lsn_t		lsn;		/*!< log sequence number */
 	ulint		buf_free;	/*!< first free offset within the log
 					buffer */
-	uint		redo_log_crypt_ver;
-					/*!< 32-bit crypto ver */
-	byte		redo_log_crypt_key[MY_AES_BLOCK_SIZE];
-					/*!< crypto key to encrypt redo log */
 #ifndef UNIV_HOTBACKUP
 	ib_mutex_t		mutex;		/*!< mutex protecting the log */
 

storage/innobase/include/log0recv.h

@@ -434,11 +434,6 @@ struct recv_sys_t{
 				scan find a corrupt log block, or a corrupt
 				log record, or there is a log parsing
 				buffer overflow */
-	uint		recv_log_crypt_ver;
-				/*!< mysqld key version to generate redo
-				log crypt key for recovery */
-	byte		recv_log_crypt_key[MY_AES_BLOCK_SIZE];
-				/*!< crypto key to decrypt redo log for recovery */
 #ifdef UNIV_LOG_ARCHIVE
 	log_group_t*	archive_group;
 				/*!< in archive recovery: the log group whose