From owner-svn-soc-all@FreeBSD.ORG Mon Jun 23 23:15:55 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 844DCA23 for ; Mon, 23 Jun 2014 23:15:55 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 56AFB2154 for ; Mon, 23 Jun 2014 23:15:55 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5NNFtRx089226 for ; Mon, 23 Jun 2014 23:15:55 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5NNFsop089049 for svn-soc-all@FreeBSD.org; Mon, 23 Jun 2014 23:15:54 GMT (envelope-from def@FreeBSD.org) Date: Mon, 23 Jun 2014 23:15:54 GMT Message-Id: <201406232315.s5NNFsop089049@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: r269954 - soc2013/def/crashdump-head/sbin/savecore 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.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 23:15:55 -0000 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;