From owner-svn-soc-all@freebsd.org Tue Aug 18 16:01:38 2015 Return-Path: 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 5F8249BC671 for ; Tue, 18 Aug 2015 16:01:38 +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 50821896 for ; Tue, 18 Aug 2015 16:01:38 +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 t7IG1cCB065380 for ; Tue, 18 Aug 2015 16:01:38 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7IG1bAd065369 for svn-soc-all@FreeBSD.org; Tue, 18 Aug 2015 16:01:37 GMT (envelope-from def@FreeBSD.org) Date: Tue, 18 Aug 2015 16:01:37 GMT Message-Id: <201508181601.t7IG1bAd065369@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: r289888 - soc2013/def/crashdump-head/sys/kern 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 16:01:38 -0000 Author: def Date: Tue Aug 18 16:01:37 2015 New Revision: 289888 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289888 Log: Remove a message. Set dumpkey after a key is initialized. Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Modified: soc2013/def/crashdump-head/sys/kern/kern_shutdown.c ============================================================================== --- soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Tue Aug 18 15:50:02 2015 (r289887) +++ soc2013/def/crashdump-head/sys/kern/kern_shutdown.c Tue Aug 18 16:01:37 2015 (r289888) @@ -863,11 +863,6 @@ { int error; - if (kdc == NULL) { - printf("Attempt to use an invalid kernel dump crypto."); - return (EINVAL); - } - error = rijndael_makeKey(&kdc->kdc_ki, DIR_ENCRYPT, 8 * KERNELDUMP_KEY_SIZE, kdc->kdc_key); if (error <= 0) @@ -945,11 +940,15 @@ return (error); } + error = kerneldump_crypto_init(&dumper, &dumpcrypto, kdk); + if (error != 0) { + free(kdk, M_KDK); + return (error); + } + free(dumpkey, M_KDK); dumpkey = kdk; - dumper.kdk = dumpkey; - - return (kerneldump_crypto_init(&dumper, &dumpcrypto, dumpkey)); + return (0); } #endif /* EKCD */