From owner-svn-soc-all@freebsd.org  Sun Aug  9 23:11:06 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 5666899D56B
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun,  9 Aug 2015 23:11:06 +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 4336FF24
 for <svn-soc-all@FreeBSD.org>; Sun,  9 Aug 2015 23:11:06 +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 t79NB6UL083858
 for <svn-soc-all@FreeBSD.org>; Sun, 9 Aug 2015 23:11:06 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t79NB5Ur083853
 for svn-soc-all@FreeBSD.org; Sun, 9 Aug 2015 23:11:05 GMT
 (envelope-from def@FreeBSD.org)
Date: Sun, 9 Aug 2015 23:11:05 GMT
Message-Id: <201508092311.t79NB5Ur083853@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: r289493 - in soc2013/def/crashdump-head/sys: kern 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: <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: Sun, 09 Aug 2015 23:11:06 -0000

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