socsvn commit: r257646 - in soc2013/def/crashdump-head: sbin/dumpkey sbin/savecore sys/kern sys/sys

[def at FreeBSD.org]

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

Log:
  Remove kerneldumpkey.keysize because dumpkey and savecore use constants anyway.

Modified:
  soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c
  soc2013/def/crashdump-head/sbin/savecore/dumpfile.c
  soc2013/def/crashdump-head/sbin/savecore/dumpfile.h
  soc2013/def/crashdump-head/sys/kern/kern_shutdown.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 14:18:34 2013	(r257645)
+++ soc2013/def/crashdump-head/sbin/dumpkey/dumpkey.c	Mon Sep 23 15:20:33 2013	(r257646)
@@ -86,8 +86,6 @@
 		key->encrypted_key, public_key, RSA_PKCS1_PADDING) == -1)
 		return (-1);
 
-	key->keysize = RSA_size(public_key);
-
 	return (0);
 }
 

Modified: soc2013/def/crashdump-head/sbin/savecore/dumpfile.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Sep 23 14:18:34 2013	(r257645)
+++ soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Sep 23 15:20:33 2013	(r257646)
@@ -45,7 +45,6 @@
 	fd = (dumpFile *)malloc(sizeof(dumpFile));
 	fd->fp = fp;
 
-	fd->keysize = h->keysize;
 	memcpy(fd->encrypted_key, h->encrypted_key, KERNELDUMP_ENCRYPTED_KEY_SIZE);
 
 	save_key_for(fd, keyname);

Modified: soc2013/def/crashdump-head/sbin/savecore/dumpfile.h
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/dumpfile.h	Mon Sep 23 14:18:34 2013	(r257645)
+++ soc2013/def/crashdump-head/sbin/savecore/dumpfile.h	Mon Sep 23 15:20:33 2013	(r257646)
@@ -5,7 +5,6 @@
 
 typedef struct _dumpFile {
 	FILE		*fp;
-	int		keysize;
 	char		encrypted_key[KERNELDUMP_ENCRYPTED_KEY_SIZE];
 #define	PEFS_SECTOR_SIZE	4096
 	char		buf[PEFS_SECTOR_SIZE];

Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Mon Sep 23 14:18:34 2013	(r257645)
+++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c	Mon Sep 23 15:20:33 2013	(r257646)
@@ -971,7 +971,6 @@
 	strncpy(kdh->versionstring, version, sizeof(kdh->versionstring));
 	if (panicstr != NULL)
 		strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
-	kdh->keysize = dumper.kdk->keysize;
 	memcpy(kdh->encrypted_key, dumper.kdk->encrypted_key, KERNELDUMP_ENCRYPTED_KEY_SIZE);
 	kdh->parity = kerneldump_parity(kdh);
 }

Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h
==============================================================================
--- soc2013/def/crashdump-head/sys/sys/kerneldump.h	Mon Sep 23 14:18:34 2013	(r257645)
+++ soc2013/def/crashdump-head/sys/sys/kerneldump.h	Mon Sep 23 15:20:33 2013	(r257646)
@@ -83,9 +83,8 @@
 	uint64_t	dumptime;
 	uint32_t	blocksize;
 	char		hostname[64];
-	char		versionstring[62];
-	char		panicstring[62];
-	int		keysize;
+	char		versionstring[64];
+	char		panicstring[64];
 	char		encrypted_key[KERNELDUMP_ENCRYPTED_KEY_SIZE];
 	uint32_t	parity;
 };
@@ -109,7 +108,6 @@
 }
 
 struct kerneldumpkey {
-	int		keysize;
 	char		encrypted_key[KERNELDUMP_ENCRYPTED_KEY_SIZE];
 	char		tweak[KERNELDUMP_TWEAK_SIZE];
 	struct xts_ctx	data_ctx;