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: f...@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;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
