svn commit: r267862 - releng/9.3/sys/geom/eli
Marius Strobl
marius at FreeBSD.org
Wed Jun 25 10:27:17 UTC 2014
Author: marius
Date: Wed Jun 25 10:27:17 2014
New Revision: 267862
URL: http://svnweb.freebsd.org/changeset/base/267862
Log:
MFC: r267145
Fix the keyfile being cleared prematurely after r259428 (MFCed to stable/9
in r266750).
PR: 185084
Submitted by: fk at fabiankeil.de
Reviewed by: pjd
Approved by: re (glebius)
Modified:
releng/9.3/sys/geom/eli/g_eli.c
Directory Properties:
releng/9.3/sys/ (props changed)
Modified: releng/9.3/sys/geom/eli/g_eli.c
==============================================================================
--- releng/9.3/sys/geom/eli/g_eli.c Wed Jun 25 10:17:10 2014 (r267861)
+++ releng/9.3/sys/geom/eli/g_eli.c Wed Jun 25 10:27:17 2014 (r267862)
@@ -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;
}
More information about the svn-src-releng
mailing list