From owner-svn-soc-all@freebsd.org  Mon Aug 17 17:44:07 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B51DB9BBAA8
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 17 Aug 2015 17:44:07 +0000 (UTC) (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A5F6E188E
 for <svn-soc-all@FreeBSD.org>; Mon, 17 Aug 2015 17:44:07 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7HHi7d8096509
 for <svn-soc-all@FreeBSD.org>; Mon, 17 Aug 2015 17:44:07 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7HHi7mh096484
 for svn-soc-all@FreeBSD.org; Mon, 17 Aug 2015 17:44:07 GMT
 (envelope-from def@FreeBSD.org)
Date: Mon, 17 Aug 2015 17:44:07 GMT
Message-Id: <201508171744.t7HHi7mh096484@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: r289830 - soc2013/def/crashdump-head/sbin/cryptcore
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.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2015 17:44:07 -0000

Author: def
Date: Mon Aug 17 17:44:06 2015
New Revision: 289830
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289830

Log:
  Use a variable instead of a structure name to calculate size.

Modified:
  soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c

Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c	Mon Aug 17 16:51:37 2015	(r289829)
+++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c	Mon Aug 17 17:44:06 2015	(r289830)
@@ -111,20 +111,20 @@
 		pjdlog_exitx(1, "Unable to allocate an RSA structure.");
 	EVP_CIPHER_CTX_init(&ctx);
 
-	kdk = calloc(1, sizeof(struct kerneldumpkey));
+	kdk = calloc(1, sizeof(*kdk));
 	if (kdk == NULL)
 		pjdlog_exit(1, "Unable to allocate kernel dump key");
 
 	fd = open(keyfile, O_RDONLY);
 	if (fd == -1)
 		pjdlog_exit(1, "Unable to open %s", keyfile);
-	size = read(fd, kdk, sizeof(struct kerneldumpkey));
-	if (size == (ssize_t)sizeof(struct kerneldumpkey)) {
+	size = read(fd, kdk, sizeof(*kdk));
+	if (size == (ssize_t)sizeof(*kdk)) {
 		kdk = realloc(kdk, kdk->kdk_size);
 		if (kdk == NULL)
 			pjdlog_exit(1, "Unable to reallocate kernel dump key");
 		size += read(fd, &kdk->kdk_encryptedkey,
-		    kdk->kdk_size - sizeof(struct kerneldumpkey));
+		    kdk->kdk_size - sizeof(*kdk));
 	}
 	err = errno;
 	close(fd);