svn commit: r267860 - stable/10/sys/geom/eli

[Marius Strobl]

Author: marius
Date: Wed Jun 25 10:17:00 2014
New Revision: 267860
URL: http://svnweb.freebsd.org/changeset/base/267860

Log:
  MFC: r267145
  
  Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/10
  in r266749).
  
  PR:		185084
  Submitted by:	fk at fabiankeil.de
  Reviewed by:	pjd

Modified:
  stable/10/sys/geom/eli/g_eli.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/geom/eli/g_eli.c
==============================================================================
--- stable/10/sys/geom/eli/g_eli.c	Wed Jun 25 10:01:02 2014	(r267859)
+++ stable/10/sys/geom/eli/g_eli.c	Wed Jun 25 10:17:00 2014	(r267860)
@@ -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;
 	}