Date: Sun, 7 Jun 2015 17:40:49 GMT From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r286797 - in soc2013/def/crashdump-head: sbin/cryptcore sys/kern Message-ID: <201506071740.t57HenYM065492@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: def Date: Sun Jun 7 17:40:48 2015 New Revision: 286797 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286797 Log: Rename key material to key. Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c ============================================================================== --- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Sun Jun 7 17:12:19 2015 (r286796) +++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c Sun Jun 7 17:40:48 2015 (r286797) @@ -65,9 +65,9 @@ /* * From this moment on keys have to be erased before exit. */ - if (sysctlbyname("security.ekcd.keymaterial", NULL, NULL, key, + if (sysctlbyname("security.ekcd.key", NULL, NULL, key, KERNELDUMP_KEY_SIZE) != 0) { - pjdlog_errno(LOG_ERR, "Unable to set key material"); + pjdlog_errno(LOG_ERR, "Unable to set key"); goto failed; } if (sysctlbyname("security.ekcd.encryptedkey", NULL, NULL, Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c ============================================================================== --- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Sun Jun 7 17:12:19 2015 (r286796) +++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Sun Jun 7 17:40:48 2015 (r286797) @@ -155,7 +155,7 @@ static struct kerneldumpkey *dumpkey; -static int kerneldump_sysctl_keymaterial(SYSCTL_HANDLER_ARGS); +static int kerneldump_sysctl_key(SYSCTL_HANDLER_ARGS); static int kerneldump_sysctl_encryptedkey(SYSCTL_HANDLER_ARGS); SYSCTL_NODE(_security, OID_AUTO, ekcd, CTLFLAG_RW, 0, @@ -164,11 +164,11 @@ SYSCTL_INT(_security_ekcd, OID_AUTO, enable, CTLFLAG_RW, &dumpcrypto.kdc_enable, 0, "Enable encrypted kernel crash dumps"); -SYSCTL_PROC(_security_ekcd, OID_AUTO, keymaterial, CTLTYPE_OPAQUE | CTLFLAG_WR, - NULL, 0, kerneldump_sysctl_keymaterial, "", "Key material"); +SYSCTL_PROC(_security_ekcd, OID_AUTO, key, CTLTYPE_OPAQUE | CTLFLAG_WR, NULL, 0, + kerneldump_sysctl_key, "", "Key"); SYSCTL_PROC(_security_ekcd, OID_AUTO, encryptedkey, CTLTYPE_OPAQUE | CTLFLAG_WR, - NULL, 0, kerneldump_sysctl_encryptedkey, "", "Encrypted key material"); + NULL, 0, kerneldump_sysctl_encryptedkey, "", "Encrypted key"); #endif /* EKCD */ /* @@ -887,7 +887,7 @@ } static int -kerneldump_sysctl_keymaterial(SYSCTL_HANDLER_ARGS) +kerneldump_sysctl_key(SYSCTL_HANDLER_ARGS) { int error;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506071740.t57HenYM065492>