summaryrefslogtreecommitdiffstats
path: root/fs/crypto
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2020-05-12 16:32:51 -0700
committerEric Biggers <ebiggers@google.com>2020-05-18 20:21:48 -0700
commit0ca2ddb0cd3c587ca50a29af7969bbfecbc3d663 (patch)
treeeb8992d35bd0d6c128a6fd389643557df0011cf3 /fs/crypto
parented318a6cc0b620440e65f48eb527dc3df7269ce4 (diff)
downloadlinux-stable-0ca2ddb0cd3c587ca50a29af7969bbfecbc3d663.tar.gz
linux-stable-0ca2ddb0cd3c587ca50a29af7969bbfecbc3d663.tar.bz2
linux-stable-0ca2ddb0cd3c587ca50a29af7969bbfecbc3d663.zip
fscrypt: make test_dummy_encryption use v2 by default
Since v1 encryption policies are deprecated, make test_dummy_encryption test v2 policies by default. Note that this causes ext4/023 and ext4/028 to start failing due to known bugs in those tests (see previous commit). Link: https://lore.kernel.org/r/20200512233251.118314-5-ebiggers@kernel.org Reviewed-by: Jaegeuk Kim <jaegeuk@kernel.org> Reviewed-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto')
-rw-r--r--fs/crypto/policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index bcab94b29d10..a15aec8e068c 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -643,7 +643,7 @@ int fscrypt_set_test_dummy_encryption(struct super_block *sb,
const substring_t *arg,
struct fscrypt_dummy_context *dummy_ctx)
{
- const char *argstr = "v1";
+ const char *argstr = "v2";
const char *argstr_to_free = NULL;
struct fscrypt_key_specifier key_spec = { 0 };
int version;