diff options
| author | brd <brd@FreeBSD.org> | 2014-06-06 03:17:37 +0000 |
|---|---|---|
| committer | brd <brd@FreeBSD.org> | 2014-06-06 03:17:37 +0000 |
| commit | f421527aa84ab84ac64bac58860fa8d184a815bb (patch) | |
| tree | bb419514774c607868fc5f6cbd381e6d2e65c854 | |
| parent | e062f6dc122c90f2ea2204bc64da5d2d7c40a5af (diff) | |
| download | FreeBSD-src-f421527aa84ab84ac64bac58860fa8d184a815bb.zip FreeBSD-src-f421527aa84ab84ac64bac58860fa8d184a815bb.tar.gz | |
- Fix the keyfile being cleared prematurely after r259428
PR: 185084
Submitted by: fk@fabiankeil.de
Reviewed by: pjd@
| -rw-r--r-- | sys/geom/eli/g_eli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c index e0d0074..d1f3cd2 100644 --- a/sys/geom/eli/g_eli.c +++ b/sys/geom/eli/g_eli.c @@ -990,7 +990,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); } } @@ -1140,6 +1139,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; } |
