Skip to content

Commit

Permalink
fscrypt: fix the test_dummy_encryption mount option
Browse files Browse the repository at this point in the history
Commit f1c131b: "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: f1c131b
Cc: stable@vger.kernel.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  • Loading branch information
Theodore Ts'o committed Dec 28, 2016
1 parent 7ce7d89 commit fe4f6c8
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/crypto/keyinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ int fscrypt_get_crypt_info(struct inode *inode)
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;
}

Expand Down

0 comments on commit fe4f6c8

Please sign in to comment.