From patchwork Tue May 12 23:32:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 11544285 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD92C92A for ; Tue, 12 May 2020 23:36:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BC1042312A for ; Tue, 12 May 2020 23:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589326571; bh=BMIktPcgJbdPblvIseR4lM4hwfbtMoRDGR8MWk2qSuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K+yBnWtF+Y4K+LIk0korfiyhXBOS/Zk3lXFYnF5CsN/MT6rV8rvIWyjl6ixuvBndq 1bO4TpIydjptDAcJ95uEhY1AF2501/ylHUoMz3OeZWS000HuyMdDwsEUIRS02gkb0r CUcpqf6flpiXurVASRN2jSPFkbQaktsZlSWCMYz4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731660AbgELXgL (ORCPT ); Tue, 12 May 2020 19:36:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:33990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725938AbgELXgL (ORCPT ); Tue, 12 May 2020 19:36:11 -0400 Received: from sol.hsd1.ca.comcast.net (c-107-3-166-239.hsd1.ca.comcast.net [107.3.166.239]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8CF1723129; Tue, 12 May 2020 23:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589326570; bh=BMIktPcgJbdPblvIseR4lM4hwfbtMoRDGR8MWk2qSuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JZUdY+nHskjaq8Rsyn8OOMyKPHfjHj9JfV6Acwi+Pma0bvRssHQzAdfIvl+EIT/Dy +psLT83lyG4cNCQ7eI5/F4O3Yasm/+j3M7hxHcDOmv+55sx1xtHVwfWgMmbYPEx7/v zAV3sSEE8wyJr+mJq0JhLATesRFun5o3llaIdmxc= From: Eric Biggers To: linux-fscrypt@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim , "Theodore Y . Ts'o" , Daniel Rosenberg Subject: [PATCH 4/4] fscrypt: make test_dummy_encryption use v2 by default Date: Tue, 12 May 2020 16:32:51 -0700 Message-Id: <20200512233251.118314-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512233251.118314-1-ebiggers@kernel.org> References: <20200512233251.118314-1-ebiggers@kernel.org> MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org From: Eric Biggers 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). Signed-off-by: Eric Biggers Reviewed-by: Jaegeuk Kim Signed-off-by: Theodore Ts'o --- fs/crypto/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index ca0ee337c9627f..cb7fd8f7f0eca1 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -632,7 +632,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;