From ec58140a27de259f4e6caec0e32bb4f954d784f9 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Wed, 4 Jul 2012 17:43:25 +0000 Subject: [PATCH] Correct a comment and correct style of a flag check. MFC after: 3 days --- sys/geom/eli/g_eli_key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/geom/eli/g_eli_key.c b/sys/geom/eli/g_eli_key.c index 3696e2e9c4b9..d4103746278e 100644 --- a/sys/geom/eli/g_eli_key.c +++ b/sys/geom/eli/g_eli_key.c @@ -197,7 +197,7 @@ g_eli_mkey_propagate(struct g_eli_softc *sc, const unsigned char *mkey) mkey += sizeof(sc->sc_ivkey); /* - * The authentication key is: akey = HMAC_SHA512(Master-Key, 0x11) + * The authentication key is: akey = HMAC_SHA512(Data-Key, 0x11) */ if ((sc->sc_flags & G_ELI_FLAG_AUTH) != 0) { g_eli_crypto_hmac(mkey, G_ELI_MAXKEYLEN, "\x11", 1, @@ -209,7 +209,7 @@ g_eli_mkey_propagate(struct g_eli_softc *sc, const unsigned char *mkey) /* Initialize encryption keys. */ g_eli_key_init(sc); - if (sc->sc_flags & G_ELI_FLAG_AUTH) { + if ((sc->sc_flags & G_ELI_FLAG_AUTH) != 0) { /* * Precalculate SHA256 for HMAC key generation. * This is expensive operation and we can do it only once now or