socsvn commit: r289493 - in soc2013/def/crashdump-head/sys: kern sys

[def at FreeBSD.org]

Author: def
Date: Sun Aug  9 23:11:04 2015
New Revision: 289493
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289493

Log:
  Add algorithm and keysize fields to kerneldumpkey.

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

Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Sun Aug  9 23:07:11 2015	(r289492)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Sun Aug  9 23:11:04 2015	(r289493)
@@ -80,6 +80,8 @@
 #include <machine/pcb.h>
 #include <machine/smp.h>
 
+#include <opencrypto/cryptodev.h>
+
 #include <security/mac/mac_framework.h>
 
 #include <vm/vm.h>
@@ -938,6 +940,8 @@
 		return (ENOMEM);
 
 	kdk->kdk_size = kdksize;
+	kdk->kdk_algorithm = CRYPTO_AES_CBC;
+	kdk->kdk_keysize = KERNELDUMP_KEY_SIZE;
 	bcopy(dumpcrypto.kdc_iv, kdk->kdk_iv, sizeof(kdk->kdk_iv));
 	kdk->kdk_encryptedkeylen = encryptedkeylen;
 

Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sun Aug  9 23:07:11 2015	(r289492)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Sun Aug  9 23:11:04 2015	(r289493)
@@ -93,6 +93,8 @@
 
 struct kerneldumpkey {
 	uint32_t	kdk_size;
+	uint8_t		kdk_algorithm;
+	uint8_t		kdk_keysize;
 	uint8_t		kdk_iv[KERNELDUMP_IV_SIZE];
 	uint32_t	kdk_encryptedkeylen;
 	uint8_t		kdk_encryptedkey[];