From a5114235e8f2017849790304843935ccc9440cd8 Mon Sep 17 00:00:00 2001 From: marius Date: Wed, 25 Jun 2014 10:27:17 +0000 Subject: [PATCH] MFC: r267145 Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/9 in r266750). PR: 185084 Submitted by: fk@fabiankeil.de Reviewed by: pjd Approved by: re (glebius) git-svn-id: svn://svn.freebsd.org/base/releng/9.3@267862 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/eli/g_eli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index e09abbf47..33311a675 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -984,7 +984,6 @@ g_eli_keyfiles_load(struct hmac_ctx *ctx, const char *provider) 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); } } @@ -1133,6 +1132,7 @@ g_eli_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) 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; } -- 2.45.0