From owner-svn-soc-all@FreeBSD.ORG  Sun Sep 22 15:51:23 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DA6B26E6
 for <svn-soc-all@FreeBSD.org>; Sun, 22 Sep 2013 15:51:23 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C744F2805
 for <svn-soc-all@FreeBSD.org>; Sun, 22 Sep 2013 15:51:23 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8MFpNfl072909
 for <svn-soc-all@FreeBSD.org>; Sun, 22 Sep 2013 15:51:23 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8MFpNSt072903
 for svn-soc-all@FreeBSD.org; Sun, 22 Sep 2013 15:51:23 GMT
 (envelope-from def@FreeBSD.org)
Date: Sun, 22 Sep 2013 15:51:23 GMT
Message-Id: <201309221551.r8MFpNSt072903@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: r257613 - soc2013/def/crashdump-head/etc/rc.d
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.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Sep 2013 15:51:23 -0000

Author: def
Date: Sun Sep 22 15:51:23 2013
New Revision: 257613
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257613

Log:
  Change dumpkey to decrypt a symmetric key.

Modified:
  soc2013/def/crashdump-head/etc/rc.d/dumpkey

Modified: soc2013/def/crashdump-head/etc/rc.d/dumpkey
==============================================================================
--- soc2013/def/crashdump-head/etc/rc.d/dumpkey	Sun Sep 22 14:53:07 2013	(r257612)
+++ soc2013/def/crashdump-head/etc/rc.d/dumpkey	Sun Sep 22 15:51:23 2013	(r257613)
@@ -10,6 +10,9 @@
 start_cmd="dumpkey_start"
 start_precmd="dumpkey_prestart"
 stop_cmd=":"
+decrypt_precmd="dumpkey_predecrypt"
+decrypt_cmd="dumpkey_decrypt"
+extra_commands="decrypt"
 
 dumpkey_prestart()
 {
@@ -29,5 +32,22 @@
 	/sbin/dumpkey -p ${dumpkey_pub}
 }
 
+dumpkey_predecrypt()
+{
+	if [ ! -r "${dumpkey_priv}" ]; then
+		warn "The private RSA key doesn't exist. It's not possible to decrypt the symmetric key."
+		return 1
+	fi
+}
+
+dumpkey_decrypt()
+{
+	if [ $# -gt 0 ]; then
+		/usr/bin/openssl rsautl -decrypt -inkey ${dumpkey_priv} -in "$*" -out "$*-decrypted"
+	else
+		echo "You have to specify an encrypted symmetric key."
+	fi
+}
+
 load_rc_config $name
-run_rc_command "$1"
+run_rc_command "$@"