From owner-svn-soc-all@freebsd.org  Wed Dec  2 01:58:46 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 04736A3E1FE
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Wed,  2 Dec 2015 01:58:46 +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 E893F14A6
 for <svn-soc-all@FreeBSD.org>; Wed,  2 Dec 2015 01:58:45 +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 tB21wjQB076259
 for <svn-soc-all@FreeBSD.org>; Wed, 2 Dec 2015 01:58:45 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id tB21wjMq076071
 for svn-soc-all@FreeBSD.org; Wed, 2 Dec 2015 01:58:45 GMT
 (envelope-from def@FreeBSD.org)
Date: Wed, 2 Dec 2015 01:58:45 GMT
Message-Id: <201512020158.tB21wjMq076071@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: r294740 - 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: Wed, 02 Dec 2015 01:58:46 -0000

Author: def
Date: Wed Dec  2 01:58:44 2015
New Revision: 294740
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=294740

Log:
  We always encrypt KERNELDUMP_KEY_MAX_SIZE bytes.

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	Wed Dec  2 01:26:59 2015	(r294739)
+++ soc2013/def/crashdump-head/sbin/decryptcore/decryptcore.c	Wed Dec  2 01:58:44 2015	(r294740)
@@ -203,7 +203,7 @@
 
 	if (RSA_private_decrypt(kdk->kdk_encryptedkeysize,
 	    kdk->kdk_encryptedkey, key, privkey,
-	    RSA_PKCS1_PADDING) != EVP_CIPHER_key_length(cipher)) {
+	    RSA_PKCS1_PADDING) != sizeof(key)) {
 		pjdlog_error("Unable to decrypt key: %s",
 		    ERR_error_string(ERR_get_error(), NULL));
 		goto failed;