From owner-svn-soc-all@freebsd.org  Tue Aug 18 15:26: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 2F1A29BCDA2
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue, 18 Aug 2015 15:26: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 1F840CB0
 for <svn-soc-all@FreeBSD.org>; Tue, 18 Aug 2015 15:26: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 t7IFQAMN076970
 for <svn-soc-all@FreeBSD.org>; Tue, 18 Aug 2015 15:26:10 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7IFQAeO076958
 for svn-soc-all@FreeBSD.org; Tue, 18 Aug 2015 15:26:10 GMT
 (envelope-from def@FreeBSD.org)
Date: Tue, 18 Aug 2015 15:26:10 GMT
Message-Id: <201508181526.t7IFQAeO076958@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: r289883 - soc2013/def/crashdump-head/sbin/cryptcore
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, 18 Aug 2015 15:26:11 -0000

Author: def
Date: Tue Aug 18 15:26:09 2015
New Revision: 289883
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289883

Log:
  Print to stdout by default.

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

Modified: soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c	Tue Aug 18 15:15:04 2015	(r289882)
+++ soc2013/def/crashdump-head/sbin/cryptcore/cryptcore.c	Tue Aug 18 15:26:09 2015	(r289883)
@@ -30,8 +30,8 @@
 {
 
 	pjdlog_exitx(1, "%s\n%s",
-	    "usage: cryptcore genkey [-Fv] -p publickey",
-	    "       cryptcore decrypt [-Fv] -p privatekey -k encryptedkey -i encryptedcore -o decryptedcore");
+	    "usage: cryptcore genkey [-Lv] -p publickey",
+	    "       cryptcore decrypt [-Lv] -p privatekey -k encryptedkey -i encryptedcore -o decryptedcore");
 }
 
 static int
@@ -384,7 +384,7 @@
 	const char *input, *keyfile, *optstr, *output, *rsakeyfile;
 	int cmd, debug;
 	char ch;
-	bool foreground;
+	bool usesyslog;
 
 	pjdlog_init(PJDLOG_MODE_STD);
 	pjdlog_prefix_set("(cryptcore) ");
@@ -395,23 +395,23 @@
 	optstr = NULL;
 	if (strcmp("genkey", argv[1]) == 0) {
 		cmd = CRYPTCORE_CMD_GENKEY;
-		optstr = "Fp:v";
+		optstr = "Lp:v";
 	} else if (strcmp("decrypt", argv[1]) == 0) {
 		cmd = CRYPTCORE_CMD_DECRYPT;
-		optstr = "Fi:k:o:p:v";
+		optstr = "Li:k:o:p:v";
 	} else {
 		usage();
 	}
 	argc--;
 	argv++;
 
-	foreground = false;
 	debug = 0;
 	rsakeyfile = NULL;
+	usesyslog = false;
 	while ((ch = getopt(argc, argv, optstr)) != -1) {
 		switch (ch) {
-		case 'F':
-			foreground = true;
+		case 'L':
+			usesyslog = true;
 			break;
 		case 'i':
 			input = optarg;
@@ -451,7 +451,7 @@
 		break;
 	}
 
-	if (!foreground)
+	if (usesyslog)
 		pjdlog_mode_set(PJDLOG_MODE_SYSLOG);
 	pjdlog_debug_set(debug);