From patchwork Tue Nov 22 07:06:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianjia Zhang X-Patchwork-Id: 24172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2049564wrr; Mon, 21 Nov 2022 23:12:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf7Jy0vsJ1Mj2cbOu8W36azHK45WfSiWCYXsL0N+b8zU5KqM7qj9Lzl63bZ3v0LJEuon28IG X-Received: by 2002:a63:d19:0:b0:476:adaa:371b with SMTP id c25-20020a630d19000000b00476adaa371bmr3784414pgl.61.1669101159504; Mon, 21 Nov 2022 23:12:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669101159; cv=none; d=google.com; s=arc-20160816; b=rqFFiQJ26gg+sc7+LYmjr+cOGAc//2PZpJTOpKB9HwIg0Kq3umjU39AcshnUdbpIcL +5LNALd3D07LQGWpO4H1HxdrWiD17AFaWGmK5Bvem5W6cZHzdQiAH/HZ4vgHb4/wFOlC KHO0ZFIE2VeBVh81iCsA2uYNWq6UYhS82YgHemtkuI9dleYku9Qk+gtEXhrvVhfx+2fj 1ggailI6PQrwgVjU4A0G/qdWrlRHhFnxnHBPdXQ8gCAbU43fVjeLcVMhCghZaBhhM0f4 Z8uOJe804K9Hhq2rEL6lxol3YRG8kaekm1D9iay9uMwx8IdzaKfVPhsHk6RUduivUBY8 cTsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=KXC6ndaP6ADZibJWPAkUNAHRBtaAc+Q4rhZVxpLqmGI=; b=ihBR0Wr4oPYL4+noqZm3WznR7vf8fsDrd4UzUpZ2xLobRPRzQ//EJevYQde0EvJZXR I60Irb38WtavFxh8L7RU44QMTuD0Hx5F2tnPrF8ivjS6Bw9wuadqeuK5SbkjNbB1Fv0K 04BC4uU7uQKf4FB4O2Y89jangtz7xNmTODZa/5YutLPZRzEw/LXVd9A/IhLITt+MumZ8 JJr2UqcoIxYXh9XjTD4E8vMwpqlzbVeY3fX5ln1CP0j4SHvAI1x4Ga2GVC5GHfgEs0/u d5OgUTa3qIHVmMTDbXHGbqddBr530DgKILsODZgfmaYr/zFsx7iKBOvJqrZfjM28Ghwf A4og== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p18-20020a631e52000000b00476e022bf0esi14538229pgm.643.2022.11.21.23.12.25; Mon, 21 Nov 2022 23:12:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232392AbiKVHG4 (ORCPT + 99 others); Tue, 22 Nov 2022 02:06:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231583AbiKVHGp (ORCPT ); Tue, 22 Nov 2022 02:06:45 -0500 Received: from out199-6.us.a.mail.aliyun.com (out199-6.us.a.mail.aliyun.com [47.90.199.6]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4887F2A97E; Mon, 21 Nov 2022 23:06:42 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=tianjia.zhang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VVR3yub_1669100796; Received: from localhost(mailfrom:tianjia.zhang@linux.alibaba.com fp:SMTPD_---0VVR3yub_1669100796) by smtp.aliyun-inc.com; Tue, 22 Nov 2022 15:06:37 +0800 From: Tianjia Zhang To: "Theodore Y. Ts o" , Jaegeuk Kim , Eric Biggers , Jonathan Corbet , Jens Axboe , Ard Biesheuvel , linux-fscrypt@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Cc: Tianjia Zhang Subject: [PATCH v2 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Date: Tue, 22 Nov 2022 15:06:32 +0800 Message-Id: <20221122070632.21910-3-tianjia.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20221122070632.21910-1-tianjia.zhang@linux.alibaba.com> References: <20221122070632.21910-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750179417873283395?= X-GMAIL-MSGID: =?utf-8?q?1750179417873283395?= SM4 is a symmetric algorithm widely used in China, this patch enables to use SM4-XTS mode to encrypt file content, and use SM4-CBC-CTS to encrypt filename. Signed-off-by: Tianjia Zhang --- Documentation/filesystems/fscrypt.rst | 1 + fs/crypto/keysetup.c | 15 +++++++++++++++ fs/crypto/policy.c | 4 ++++ include/uapi/linux/fscrypt.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst index 5ba5817c17c2..af27e7b2c74f 100644 --- a/Documentation/filesystems/fscrypt.rst +++ b/Documentation/filesystems/fscrypt.rst @@ -336,6 +336,7 @@ Currently, the following pairs of encryption modes are supported: - AES-256-XTS for contents and AES-256-CTS-CBC for filenames - AES-128-CBC for contents and AES-128-CTS-CBC for filenames +- SM4-XTS for contents and SM4-CTS-CBC for filenames - Adiantum for both contents and filenames - AES-256-XTS for contents and AES-256-HCTR2 for filenames (v2 policies only) diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index f7407071a952..24e55c95abc3 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -44,6 +44,21 @@ struct fscrypt_mode fscrypt_modes[] = { .security_strength = 16, .ivsize = 16, }, + [FSCRYPT_MODE_SM4_XTS] = { + .friendly_name = "SM4-XTS", + .cipher_str = "xts(sm4)", + .keysize = 32, + .security_strength = 16, + .ivsize = 16, + .blk_crypto_mode = BLK_ENCRYPTION_MODE_SM4_XTS, + }, + [FSCRYPT_MODE_SM4_CTS] = { + .friendly_name = "SM4-CTS", + .cipher_str = "cts(cbc(sm4))", + .keysize = 16, + .security_strength = 16, + .ivsize = 16, + }, [FSCRYPT_MODE_ADIANTUM] = { .friendly_name = "Adiantum", .cipher_str = "adiantum(xchacha12,aes)", diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 46757c3052ef..8e69bc0c35cd 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -71,6 +71,10 @@ static bool fscrypt_valid_enc_modes_v1(u32 contents_mode, u32 filenames_mode) filenames_mode == FSCRYPT_MODE_AES_128_CTS) return true; + if (contents_mode == FSCRYPT_MODE_SM4_XTS && + filenames_mode == FSCRYPT_MODE_SM4_CTS) + return true; + if (contents_mode == FSCRYPT_MODE_ADIANTUM && filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h index a756b29afcc2..47dbd1994bfe 100644 --- a/include/uapi/linux/fscrypt.h +++ b/include/uapi/linux/fscrypt.h @@ -26,6 +26,8 @@ #define FSCRYPT_MODE_AES_256_CTS 4 #define FSCRYPT_MODE_AES_128_CBC 5 #define FSCRYPT_MODE_AES_128_CTS 6 +#define FSCRYPT_MODE_SM4_XTS 7 +#define FSCRYPT_MODE_SM4_CTS 8 #define FSCRYPT_MODE_ADIANTUM 9 #define FSCRYPT_MODE_AES_256_HCTR2 10 /* If adding a mode number > 10, update FSCRYPT_MODE_MAX in fscrypt_private.h */