diff options
| author | marius <marius@FreeBSD.org> | 2014-06-25 10:17:00 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2014-06-25 10:17:00 +0000 |
| commit | 06338f8ccc465d1d0a07fee8fd62b6d1ec836b21 (patch) | |
| tree | 0bf100057abff6cc0c4dbbf9aeea1e959e2b77fb /sys/geom | |
| parent | 810c9620cc2ab59308ebd8040f6e2b62833773ad (diff) | |
| download | FreeBSD-src-06338f8ccc465d1d0a07fee8fd62b6d1ec836b21.zip FreeBSD-src-06338f8ccc465d1d0a07fee8fd62b6d1ec836b21.tar.gz | |
MFC: r267145
Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/10
in r266749).
PR: 185084
Submitted by: fk@fabiankeil.de
Reviewed by: pjd
Diffstat (limited to 'sys/geom')
| -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; } |
