From owner-svn-src-all@FreeBSD.ORG  Fri Jun  6 03:17:37 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E44255C1;
 Fri,  6 Jun 2014 03:17:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 D1B312B15;
 Fri,  6 Jun 2014 03:17:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s563HbA7059215;
 Fri, 6 Jun 2014 03:17:37 GMT (envelope-from brd@svn.freebsd.org)
Received: (from brd@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s563HbcP059214;
 Fri, 6 Jun 2014 03:17:37 GMT (envelope-from brd@svn.freebsd.org)
Message-Id: <201406060317.s563HbcP059214@svn.freebsd.org>
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 6 Jun 2014 03:17:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267145 - head/sys/geom/eli
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jun 2014 03:17:38 -0000

Author: brd (doc committer)
Date: Fri Jun  6 03:17:37 2014
New Revision: 267145
URL: http://svnweb.freebsd.org/changeset/base/267145

Log:
  - Fix the keyfile being cleared prematurely after r259428
  
  PR:		185084
  Submitted by:	fk@fabiankeil.de
  Reviewed by:	pjd@

Modified:
  head/sys/geom/eli/g_eli.c

Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c	Fri Jun  6 02:55:18 2014	(r267144)
+++ head/sys/geom/eli/g_eli.c	Fri Jun  6 03:17:37 2014	(r267145)
@@ -990,7 +990,6 @@ g_eli_keyfiles_load(struct hmac_ctx *ctx
 		G_ELI_DEBUG(1, "Loaded keyfile %s for %s (type: %s).", file,
 		    provider, name);
 		g_eli_crypto_hmac_update(ctx, data, size);
-		bzero(data, size);
 	}
 }
 
@@ -1140,6 +1139,7 @@ g_eli_taste(struct g_class *mp, struct g
 			g_eli_keyfiles_clear(pp->name);
 			return (NULL);
 		}
+		g_eli_keyfiles_clear(pp->name);
 		G_ELI_DEBUG(1, "Using Master Key %u for %s.", nkey, pp->name);
 		break;
 	}