Deleted Added
full compact
28c28
< __FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_ctl.c 214118 2010-10-20 20:50:55Z pjd $");
---
> __FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_ctl.c 214225 2010-10-22 22:13:11Z pjd $");
885,902d884
< bzero(mkey, sizeof(mkey));
< bzero(&md, sizeof(md));
< /* Restore sc_akeyctx. */
< if (sc->sc_flags & G_ELI_FLAG_AUTH) {
< SHA256_Init(&sc->sc_akeyctx);
< SHA256_Update(&sc->sc_akeyctx, sc->sc_akey,
< sizeof(sc->sc_akey));
< }
< /* Restore sc_ivctx. */
< switch (sc->sc_ealgo) {
< case CRYPTO_AES_XTS:
< break;
< default:
< SHA256_Init(&sc->sc_ivctx);
< SHA256_Update(&sc->sc_ivctx, sc->sc_ivkey,
< sizeof(sc->sc_ivkey));
< break;
< }
904a887,888
> bzero(mkey, sizeof(mkey));
> bzero(&md, sizeof(md));