socsvn commit: r269954 - soc2013/def/crashdump-head/sbin/savecore

[def at FreeBSD.org]

Author: def
Date: Mon Jun 23 23:15:54 2014
New Revision: 269954
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269954

Log:
  Use new variable names in savecore.

Modified:
  soc2013/def/crashdump-head/sbin/savecore/dumpfile.c
  soc2013/def/crashdump-head/sbin/savecore/dumpfile.h

Modified: soc2013/def/crashdump-head/sbin/savecore/dumpfile.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Jun 23 22:40:33 2014	(r269953)
+++ soc2013/def/crashdump-head/sbin/savecore/dumpfile.c	Mon Jun 23 23:15:54 2014	(r269954)
@@ -14,8 +14,8 @@
 	if (fp == NULL)
 		return (-1);
 
-	if (fwrite(fd->encrypted_key, 1, KERNELDUMP_ENCRYPTED_KEY_SIZE, fp)
-		!= KERNELDUMP_ENCRYPTED_KEY_SIZE) {
+	if (fwrite(fd->ciphertext, 1, KERNELDUMP_CIPHERTEXT_SIZE, fp)
+		!= KERNELDUMP_CIPHERTEXT_SIZE) {
 		fclose(fp);
 
 		return (-1);
@@ -46,7 +46,7 @@
 	fd->fp = fp;
 	fd->buf_used = 0;
 
-	memcpy(fd->encrypted_key, h->encrypted_key, KERNELDUMP_ENCRYPTED_KEY_SIZE);
+	memcpy(fd->ciphertext, h->ciphertext, KERNELDUMP_CIPHERTEXT_SIZE);
 
 	if (save_key_for(fd, keyname)) {
 		free(fd);
@@ -65,12 +65,12 @@
 
 	saved = 0;
 
-	while (size + fd->buf_used >= PEFS_SECTOR_SIZE) {
-		resid = PEFS_SECTOR_SIZE - fd->buf_used;
+	while (size + fd->buf_used >= DEVBLK_SIZE) {
+		resid = DEVBLK_SIZE - fd->buf_used;
 		memcpy(fd->buf + fd->buf_used, data, resid);
 		fd->buf_used += resid;
 
-		if (fwrite(fd->buf, 1, PEFS_SECTOR_SIZE, fd->fp) != PEFS_SECTOR_SIZE) {
+		if (fwrite(fd->buf, 1, DEVBLK_SIZE, fd->fp) != DEVBLK_SIZE) {
 			fd->buf_used -= resid;
 
 			return (saved);

Modified: soc2013/def/crashdump-head/sbin/savecore/dumpfile.h
==============================================================================
--- soc2013/def/crashdump-head/sbin/savecore/dumpfile.h	Mon Jun 23 22:40:33 2014	(r269953)
+++ soc2013/def/crashdump-head/sbin/savecore/dumpfile.h	Mon Jun 23 23:15:54 2014	(r269954)
@@ -5,9 +5,9 @@
 
 typedef struct _dumpFile {
 	FILE		*fp;
-	char		encrypted_key[KERNELDUMP_ENCRYPTED_KEY_SIZE];
-#define	PEFS_SECTOR_SIZE	4096
-	char		buf[PEFS_SECTOR_SIZE];
+	char		ciphertext[KERNELDUMP_CIPHERTEXT_SIZE];
+#define	DEVBLK_SIZE	512
+	char		buf[DEVBLK_SIZE];
 	int		buf_used;
 } dumpFile;