From owner-svn-soc-all@FreeBSD.ORG Sun Jun 7 17:40:50 2015 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69CBDA8 for ; Sun, 7 Jun 2015 17:40:50 +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 3DBF913BA for ; Sun, 7 Jun 2015 17:40:50 +0000 (UTC) (envelope-from def@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57Heo4K065495 for ; Sun, 7 Jun 2015 17:40:50 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t57HenYM065492 for svn-soc-all@FreeBSD.org; Sun, 7 Jun 2015 17:40:49 GMT (envelope-from def@FreeBSD.org) Date: Sun, 7 Jun 2015 17:40:49 GMT Message-Id: <201506071740.t57HenYM065492@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: r286797 - in soc2013/def/crashdump-head: sbin/cryptcore sys/kern 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: Sun, 07 Jun 2015 17:40:50 -0000 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;