socsvn commit: r294616 - soc2013/def/crashdump-head/sys/sys

[def at FreeBSD.org]

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[];
 };