Merge pull request #3176 from dutow/ps-5.7-ps5610

PS-5610: Fix keyring redo encryption in 32 bit builds (5.7)
percona · May 14, 2019 · 0796b5d · 0796b5d
2 parents f91a9f2 + 98c1c2d
commit 0796b5d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
@@ -919,7 +919,7 @@ fsp_header_fill_encryption_info(
 
 	/* Write master key id. */
 	mach_write_to_4(ptr, key_version);
-	ptr += sizeof(ulint);
+	ptr += 4;
 
 	/* Write server uuid. */
 	memcpy(ptr, Encryption::uuid, ENCRYPTION_SERVER_UUID_LEN);

diff --git a/storage/innobase/log/log0log.cc b/storage/innobase/log/log0log.cc
@@ -1139,7 +1139,7 @@ log_read_encryption()
 		unsigned char* info_ptr = log_block_buf + LOG_HEADER_CREATOR_END + ENCRYPTION_MAGIC_SIZE;
 	        uint version = mach_read_from_4(info_ptr);
 
-		memcpy(iv, info_ptr + ENCRYPTION_SERVER_UUID_LEN + 8, ENCRYPTION_KEY_LEN);
+		memcpy(iv, info_ptr + ENCRYPTION_SERVER_UUID_LEN + 4, ENCRYPTION_KEY_LEN);
 
 #ifdef UNIV_ENCRYPT_DEBUG
 			fprintf(stderr, "Using redo log encryption key version: %u\n", version);