socsvn commit: r257648 - in soc2013/def/crashdump-head: sbin/dumpkey sys/sys

[def at FreeBSD.org]

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.
  */