From owner-svn-soc-all@FreeBSD.ORG  Sat Jul 13 17:42:52 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 21DDF799
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 17:42:52 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 13AF81A9A
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 17:42:52 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6DHgpu2049632
 for <svn-soc-all@FreeBSD.org>; Sat, 13 Jul 2013 17:42:51 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6DHgpmN049630
 for svn-soc-all@FreeBSD.org; Sat, 13 Jul 2013 17:42:51 GMT
 (envelope-from def@FreeBSD.org)
Date: Sat, 13 Jul 2013 17:42:51 GMT
Message-Id: <201307131742.r6DHgpmN049630@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254758 - soc2013/def/crashdump-head/sys/sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2013 17:42:52 -0000

Author: def
Date: Sat Jul 13 17:42:51 2013
New Revision: 254758
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254758

Log:
  Change the kernel dump header format to store a key, a tweak and their sizes. Define a constant AES key for encryption.

Modified:
  soc2013/def/crashdump-head/sys/sys/kerneldump.h

Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sat Jul 13 17:38:58 2013	(r254757)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sat Jul 13 17:42:51 2013	(r254758)
@@ -75,22 +75,33 @@
 #define	KERNELDUMP_POWERPC_VERSION	1
 #define	KERNELDUMP_SPARC64_VERSION	1
 #define	KERNELDUMP_TEXT_VERSION		1
-#define KERNELDUMP_MAX_KEY_SIZE		256
-#define KERNELDUMP_MAX_IV_SIZE		128
+#define	KERNELDUMP_KEY_SIZE		32
+#define	KERNELDUMP_TWEAK_SIZE		8
 	uint64_t	dumplength;		/* excl headers */
 	uint64_t	dumptime;
 	uint32_t	blocksize;
 	char		hostname[64];
-	char		versionstring[164];
-	char		panicstring[164];
-	int		keyLen;
-	char		keyMaterial[KERNELDUMP_MAX_KEY_SIZE >> 3];
-	u_int8_t	mode;
-	u_int8_t	IV[KERNELDUMP_MAX_IV_SIZE >> 3];
+	char		versionstring[168];
+	char		panicstring[168];
+	int		keysize;
+	char		key[KERNELDUMP_KEY_SIZE];
+	int		tweaksize;
+	char		tweak[KERNELDUMP_TWEAK_SIZE];
 	uint32_t	parity;
 };
 
 /*
+ * Constant key for kernel crash dumps.
+ */
+static const char kerneldumpkey[32] = {
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41,
+	0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41
+};
+
+static char kerneldumptweak[KERNELDUMP_TWEAK_SIZE];
+
+/*
  * Parity calculation is endian insensitive.
  */
 static __inline u_int32_t