From owner-svn-soc-all@freebsd.org  Sun Nov 29 16:44:27 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 C76D2A3BDD1
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun, 29 Nov 2015 16:44:27 +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 B74D119F0
 for <svn-soc-all@FreeBSD.org>; Sun, 29 Nov 2015 16:44:27 +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 tATGiREk025365
 for <svn-soc-all@FreeBSD.org>; Sun, 29 Nov 2015 16:44:27 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tATGiQGi025345
 for svn-soc-all@FreeBSD.org; Sun, 29 Nov 2015 16:44:26 GMT
 (envelope-from def@FreeBSD.org)
Date: Sun, 29 Nov 2015 16:44:26 GMT
Message-Id: <201511291644.tATGiQGi025345@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: r294539 - in soc2013/def/crashdump-head/sbin:
 decryptcore dumpon
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: Sun, 29 Nov 2015 16:44:27 -0000

Author: def
Date: Sun Nov 29 16:44:26 2015
New Revision: 294539
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294539

Log:
  Fix message format for OpenSSL errors.

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

Modified: soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Sun Nov 29 16:34:53 2015	(r294538)
+++ soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Sun Nov 29 16:44:26 2015	(r294539)
@@ -166,7 +166,7 @@
 
 	privkey = RSA_new();
 	if (privkey == NULL) {
-		pjdlog_error("Unable to allocate an RSA structure. %s",
+		pjdlog_error("Unable to allocate an RSA structure: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}
@@ -195,7 +195,7 @@
 	if (RSA_private_decrypt(kdk->kdk_encryptedkeysize,
 	    kdk->kdk_encryptedkey, key, privkey,
 	    RSA_PKCS1_PADDING) != sizeof(key)) {
-		pjdlog_error("Unable to decrypt key. %s",
+		pjdlog_error("Unable to decrypt key: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}

Modified: soc2013/def/crashdump-head/sbin/dumpon/dumpon.c
==============================================================================
--- soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Sun Nov 29 16:34:53 2015	(r294538)
+++ soc2013/def/crashdump-head/sbin/dumpon/dumpon.c	Sun Nov 29 16:44:26 2015	(r294539)
@@ -125,7 +125,7 @@
 
 	pubkey = RSA_new();
 	if (pubkey == NULL) {
-		warnx("Unable to allocate an RSA structure. %s",
+		warnx("Unable to allocate an RSA structure: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;
 	}