Date: Tue, 18 Aug 2015 16:01:37 GMT From: def@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r289888 - soc2013/def/crashdump-head/sys/kern Message-ID: <201508181601.t7IG1bAd065369@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508181601.t7IG1bAd065369>