From owner-svn-soc-all@freebsd.org  Mon Nov 30 22:00:57 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 032A6A3DF17
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 30 Nov 2015 22:00:57 +0000 (UTC) (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E87DB1D55
 for <svn-soc-all@FreeBSD.org>; Mon, 30 Nov 2015 22:00:56 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id tAUM0uOF042618
 for <svn-soc-all@FreeBSD.org>; Mon, 30 Nov 2015 22:00:56 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tAUM0uZQ042406
 for svn-soc-all@FreeBSD.org; Mon, 30 Nov 2015 22:00:56 GMT
 (envelope-from def@FreeBSD.org)
Date: Mon, 30 Nov 2015 22:00:56 GMT
Message-Id: <201511302200.tAUM0uZQ042406@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: r294616 - 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.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Nov 2015 22:00:57 -0000

Author: def
Date: Mon Nov 30 22:00:55 2015
New Revision: 294616
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294616

Log:
  Add macros for encryption algorithms. Fix size macros.

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	Mon Nov 30 22:00:55 2015	(r294615)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Mon Nov 30 22:00:55 2015	(r294616)
@@ -55,9 +55,14 @@
 #define	htod64(x)	(x)
 #endif
 
+#define	KERNELDUMP_ENC_NONE		0
+#define	KERNELDUMP_ENC_AES_256_CBC	1
+
 #define	KERNELDUMP_BLOCK_SIZE		512
-#define	KERNELDUMP_IV_SIZE		16
-#define	KERNELDUMP_KEY_SIZE		32
+#define	KERNELDUMP_IV_MAX_SIZE		32
+#define	KERNELDUMP_KEY_MAX_SIZE		64
+
+#define	KERNELDUMP_ENCKEYLEN_MAX	(16384 / 8)
 
 /*
  * All uintX_t fields are in dump byte order, which is the same as
@@ -92,8 +97,8 @@
 };
 
 struct kerneldumpkey {
-	uint8_t		kdk_algorithm;
-	uint8_t		kdk_iv[KERNELDUMP_IV_SIZE];
+	uint8_t		kdk_encryption;
+	uint8_t		kdk_iv[KERNELDUMP_IV_MAX_SIZE];
 	uint32_t	kdk_encryptedkeysize;
 	uint8_t		kdk_encryptedkey[];
 };