diff options
| author | pjd <pjd@FreeBSD.org> | 2012-07-04 17:43:25 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2012-07-04 17:43:25 +0000 |
| commit | 7c1cf16027583c759240b2393e7bdf03728c6c19 (patch) | |
| tree | 265b08f2679a5094d9f0338b7953b4d36f9094df /sys/geom | |
| parent | 05cc508508c52203b1a7d2098c484c3d06ebb2ce (diff) | |
| download | FreeBSD-src-7c1cf16027583c759240b2393e7bdf03728c6c19.zip FreeBSD-src-7c1cf16027583c759240b2393e7bdf03728c6c19.tar.gz | |
Correct a comment and correct style of a flag check.
MFC after: 3 days
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/eli/g_eli_key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/geom/eli/g_eli_key.c b/sys/geom/eli/g_eli_key.c index 3696e2e..d410374 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 |
