Date: Mon, 4 May 2015 16:50:21 GMT 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 Message-ID: <201505041650.t44GoLuZ091632@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041650.t44GoLuZ091632>