From owner-svn-soc-all@FreeBSD.ORG  Mon Sep 23 15:41:39 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 95416A3E
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 15:41:39 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8054D25E7
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 15:41:39 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NFfd7P045757
 for <svn-soc-all@FreeBSD.org>; Mon, 23 Sep 2013 15:41:39 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8NFfdwM045748
 for svn-soc-all@FreeBSD.org; Mon, 23 Sep 2013 15:41:39 GMT
 (envelope-from def@FreeBSD.org)
Date: Mon, 23 Sep 2013 15:41:39 GMT
Message-Id: <201309231541.r8NFfdwM045748@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: r257648 - in soc2013/def/crashdump-head: sbin/dumpkey
 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: Mon, 23 Sep 2013 15:41:39 -0000

Author: def
Date: Mon Sep 23 15:41:39 2013
New Revision: 257648
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257648

Log:
  dumpkey is in charge of setting properly a kernel dump key so kerneldump_magic shouldn't be in kernel.

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

Modified: soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c	Mon Sep 23 15:31:52 2013	(r257647)
+++ soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c	Mon Sep 23 15:41:39 2013	(r257648)
@@ -15,6 +15,8 @@
 #define	PATH_DEVRANDOM		"/dev/random"
 #define	PEFS_SECTOR_SIZE	4096
 
+static const char kerneldump_magic[] = "PEFSKEY-V1";
+
 static void
 hkdf_expand(struct xts_ctx *ctx, const uint8_t *masterkey, uint8_t *key,
     int idx, const uint8_t *magic, size_t magicsize)

Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/kerneldump.h	Mon Sep 23 15:31:52 2013	(r257647)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Mon Sep 23 15:41:39 2013	(r257648)
@@ -89,8 +89,6 @@
 	uint32_t	parity;
 };
 
-static const char kerneldump_magic[] = "PEFSKEY-V1";
-
 /*
  * Parity calculation is endian insensitive.
  */