Commit fe4f6c80 authored Dec 27, 2016 by Theodore Ts'o

fscrypt: fix the test_dummy_encryption mount option



Commit f1c131b4: "crypto: xts - Convert to skcipher" now fails
the setkey operation if the AES key is the same as the tweak key.
Previously this check was only done if FIPS mode is enabled.  Now this
check is also done if weak key checking was requested.  This is
reasonable, but since we were using the dummy key which was a constant
series of 0x42 bytes, it now caused dummy encrpyption test mode to
fail.

Fix this by using 0x42... and 0x24... for the two keys, so they are
different.

Fixes: f1c131b4
Cc: stable@vger.kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

parent 7ce7d89f

fs/crypto/keyinfo.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,8 @@ retry:
		goto out;

		if (fscrypt_dummy_context_enabled(inode)) {
		memset(raw_key, 0x42, FS_AES_256_XTS_KEY_SIZE);
		memset(raw_key, 0x42, keysize/2);
		memset(raw_key+keysize/2, 0x24, keysize - (keysize/2));
		goto got_key;
		}

Admin message