From owner-svn-soc-all@freebsd.org  Tue Dec  1 22:35:11 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEA7FA3CEDB
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue,  1 Dec 2015 22:35:11 +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 B05BF19D5
 for <svn-soc-all@FreeBSD.org>; Tue,  1 Dec 2015 22:35:11 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id tB1MZBAK080203
 for <svn-soc-all@FreeBSD.org>; Tue, 1 Dec 2015 22:35:11 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tB1MZBKD080181
 for svn-soc-all@FreeBSD.org; Tue, 1 Dec 2015 22:35:11 GMT
 (envelope-from def@FreeBSD.org)
Date: Tue, 1 Dec 2015 22:35:11 GMT
Message-Id: <201512012235.tB1MZBKD080181@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: r294716 - soc2013/def/crashdump-head/sbin/decryptcore
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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Dec 2015 22:35:11 -0000

Author: def
Date: Tue Dec  1 22:35:10 2015
New Revision: 294716
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294716

Log:
  Change decryptcore arguments.

Modified:
  soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c

Modified: soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Tue Dec  1 22:14:46 2015	(r294715)
+++ soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Tue Dec  1 22:35:10 2015	(r294716)
@@ -23,7 +23,7 @@
 usage(void)
 {
 
-	pjdlog_exitx(1, "usage: decryptcore [-Lv] -p privatekey -k encryptedkey -i encryptedcore -o decryptedcore");
+	pjdlog_exitx(1, "usage: decryptcore [-Lv] privatekey encryptedkey encryptedcore decryptedcore");
 }
 
 static int
@@ -273,23 +273,11 @@
 	debug = 0;
 	rsakeyfile = NULL;
 	usesyslog = false;
-	while ((ch = getopt(argc, argv, "Li:k:o:p:v")) != -1) {
+	while ((ch = getopt(argc, argv, "Lv")) != -1) {
 		switch (ch) {
 		case 'L':
 			usesyslog = true;
 			break;
-		case 'i':
-			input = optarg;
-			break;
-		case 'k':
-			keyfile = optarg;
-			break;
-		case 'o':
-			output = optarg;
-			break;
-		case 'p':
-			rsakeyfile = optarg;
-			break;
 		case 'v':
 			debug++;
 			break;
@@ -300,12 +288,29 @@
 	argc -= optind;
 	argv += optind;
 
-	if (argc != 0)
+	rsakeyfile = *argv;
+	argc--;
+	argv++;
+	if (rsakeyfile == NULL)
 		usage();
-	if (input == NULL || keyfile == NULL || output == NULL ||
-	    rsakeyfile == NULL) {
+	keyfile = *argv;
+	argc--;
+	argv++;
+	if (keyfile == NULL)
+		usage();
+	input = *argv;
+	argc--;
+	argv++;
+	if (input == NULL)
+		usage();
+	output = *argv;
+	argc--;
+	argv++;
+	if (output == NULL)
+		usage();
+
+	if (argc != 0)
 		usage();
-	}
 
 	if (usesyslog)
 		pjdlog_mode_set(PJDLOG_MODE_SYSLOG);