Author: marius
Date: Wed Jun 25 10:17:10 2014
New Revision: 267861
URL: http://svnweb.freebsd.org/changeset/base/267861
Log:
MFC: r267145
Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/9
in r266750).
PR: 185084
Submitted by: f...@fabiankeil.de
Reviewed by: pjd
Modified:
stable/9/sys/geom/eli/g_eli.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/geom/eli/g_eli.c
==============================================================================
--- stable/9/sys/geom/eli/g_eli.c Wed Jun 25 10:17:00 2014
(r267860)
+++ stable/9/sys/geom/eli/g_eli.c Wed Jun 25 10:17:10 2014
(r267861)
@@ -984,7 +984,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);
}
}
@@ -1133,6 +1132,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-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
