From owner-svn-soc-all@FreeBSD.ORG Mon May 4 16:50:22 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C6F1D372 for ; Mon, 4 May 2015 16:50:22 +0000 (UTC) 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 9C67B174B for ; Mon, 4 May 2015 16:50:22 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t44GoMw0091644 for ; Mon, 4 May 2015 16:50:22 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t44GoLuZ091632 for svn-soc-all@FreeBSD.org; Mon, 4 May 2015 16:50:21 GMT (envelope-from def@FreeBSD.org) Date: Mon, 4 May 2015 16:50:21 GMT Message-Id: <201505041650.t44GoLuZ091632@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: r284993 - in soc2013/def/crashdump-head: sbin/cryptcore sbin/savecore sys/amd64/conf 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2015 16:50:22 -0000 Author: def Date: Mon May 4 16:50:20 2015 New Revision: 284993 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=284993 Log: Style. Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c soc2013/def/crashdump-head/sbin/savecore/savecore.c soc2013/def/crashdump-head/sys/amd64/conf/GENERIC Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Mon May 4 15:04:39 2015 (r284992) +++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Mon May 4 16:50:20 2015 (r284993) @@ -73,11 +73,11 @@ if (RSA_public_encrypt(KERNELDUMP_KEY_SIZE + KERNELDUMP_IV_SIZE, buf, ciphertext, pubkey, RSA_PKCS1_PADDING) != pubkeysize) { - pjdlog_exit(1, "Unable to encrypt an one-time key"); + pjdlog_exit(1, "Unable to encrypt the one-time key"); } /* - * From this moment keys have to be erased before exit. + * From this moment on keys have to be erased before exit. */ if (sysctlbyname("kern.ekcd.keymaterial", NULL, NULL, buf, KERNELDUMP_KEY_SIZE) != 0) { @@ -149,7 +149,7 @@ pjdlog_exit(1, "Unable to read data from %s", privkeyfile); } /* - * From this moment keys have to be erased before exit. + * From this moment on keys have to be erased before exit. */ privkeysize = RSA_size(privkey); if (RSA_size(privkey) > 8 * KERNELDUMP_CIPHERTEXT_SIZE) { Modified: soc2013/def/crashdump-head/sbin/savecore/savecore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/savecore/savecore.c Mon May 4 15:04:39 2015 (r284992) +++ soc2013/def/crashdump-head/sbin/savecore/savecore.c Mon May 4 16:50:20 2015 (r284993) @@ -190,12 +190,12 @@ fd = open(keyname, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd == -1) { - syslog(LOG_ERR, "Unable to open %s to write a key.", keyname); + syslog(LOG_ERR, "Unable to open %s to write the key.", keyname); exit(1); } if (write(fd, kdh->ciphertext, KERNELDUMP_CIPHERTEXT_SIZE) != KERNELDUMP_CIPHERTEXT_SIZE) { - syslog(LOG_ERR, "Unable to write a key to %s.", keyname); + syslog(LOG_ERR, "Unable to write the key to %s.", keyname); exit(1); } close(fd); Modified: soc2013/def/crashdump-head/sys/amd64/conf/GENERIC ============================================================================== --- soc2013/def/crashdump-head/sys/amd64/conf/GENERIC Mon May 4 15:04:39 2015 (r284992) +++ soc2013/def/crashdump-head/sys/amd64/conf/GENERIC Mon May 4 16:50:20 2015 (r284993) @@ -354,5 +354,5 @@ # Netmap provides direct access to TX/RX rings on supported NICs device netmap # netmap(4) support -# Unattended encrypted kernel crash dumps +# Unattended encrypted kernel crash dumps options EKCD