* [PATCH 0/2] Add SM4 XTS symmetric algorithm for blk-crypto and fscrypt @ 2022-11-16 8:24 Tianjia Zhang 2022-11-16 8:24 ` [PATCH 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Tianjia Zhang 2022-11-16 8:24 ` [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Tianjia Zhang 0 siblings, 2 replies; 5+ messages in thread From: Tianjia Zhang @ 2022-11-16 8:24 UTC (permalink / raw) To: Theodore Y. Ts o, Jaegeuk Kim, Eric Biggers, Jonathan Corbet, Jens Axboe, linux-fscrypt, linux-doc, linux-kernel, linux-block Cc: Tianjia Zhang SM4 is widely used in China's data encryption software and hardware. This serial of patches enables the SM4-XTS algorithm in blk-crypto and enables the SM4-XTS/CTS algorithm in fscrypt to encrypt file content and filename. Tianjia Zhang (2): blk-crypto: Add support for SM4-XTS blk crypto mode fscrypt: Add SM4 XTS/CTS symmetric algorithm support Documentation/filesystems/fscrypt.rst | 1 + block/blk-crypto.c | 6 ++++++ fs/crypto/fscrypt_private.h | 2 +- fs/crypto/keysetup.c | 15 +++++++++++++++ fs/crypto/policy.c | 4 ++++ include/linux/blk-crypto.h | 1 + include/uapi/linux/fscrypt.h | 4 +++- 7 files changed, 31 insertions(+), 2 deletions(-) -- 2.24.3 (Apple Git-128) ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode 2022-11-16 8:24 [PATCH 0/2] Add SM4 XTS symmetric algorithm for blk-crypto and fscrypt Tianjia Zhang @ 2022-11-16 8:24 ` Tianjia Zhang 2022-11-16 8:24 ` [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Tianjia Zhang 1 sibling, 0 replies; 5+ messages in thread From: Tianjia Zhang @ 2022-11-16 8:24 UTC (permalink / raw) To: Theodore Y. Ts o, Jaegeuk Kim, Eric Biggers, Jonathan Corbet, Jens Axboe, linux-fscrypt, linux-doc, linux-kernel, linux-block Cc: Tianjia Zhang SM4 is a symmetric algorithm widely used in China, and SM4-XTS is also used to encrypt length-preserving data, this patch enables the use of SM4-XTS algorithm in block inline encryption, and provides support for fscrypt. Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com> --- block/blk-crypto.c | 6 ++++++ include/linux/blk-crypto.h | 1 + 2 files changed, 7 insertions(+) diff --git a/block/blk-crypto.c b/block/blk-crypto.c index a496aaef85ba..e44709fc6a08 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c @@ -36,6 +36,12 @@ const struct blk_crypto_mode blk_crypto_modes[] = { .keysize = 32, .ivsize = 32, }, + [BLK_ENCRYPTION_MODE_SM4_XTS] = { + .name = "SM4-XTS", + .cipher_str = "xts(sm4)", + .keysize = 32, + .ivsize = 16, + }, }; /* diff --git a/include/linux/blk-crypto.h b/include/linux/blk-crypto.h index 69b24fe92cbf..26b1b71c3091 100644 --- a/include/linux/blk-crypto.h +++ b/include/linux/blk-crypto.h @@ -13,6 +13,7 @@ enum blk_crypto_mode_num { BLK_ENCRYPTION_MODE_AES_256_XTS, BLK_ENCRYPTION_MODE_AES_128_CBC_ESSIV, BLK_ENCRYPTION_MODE_ADIANTUM, + BLK_ENCRYPTION_MODE_SM4_XTS, BLK_ENCRYPTION_MODE_MAX, }; -- 2.24.3 (Apple Git-128) ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support 2022-11-16 8:24 [PATCH 0/2] Add SM4 XTS symmetric algorithm for blk-crypto and fscrypt Tianjia Zhang 2022-11-16 8:24 ` [PATCH 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Tianjia Zhang @ 2022-11-16 8:24 ` Tianjia Zhang 2022-11-16 17:26 ` Eric Biggers 1 sibling, 1 reply; 5+ messages in thread From: Tianjia Zhang @ 2022-11-16 8:24 UTC (permalink / raw) To: Theodore Y. Ts o, Jaegeuk Kim, Eric Biggers, Jonathan Corbet, Jens Axboe, linux-fscrypt, linux-doc, linux-kernel, linux-block Cc: Tianjia Zhang 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 <tianjia.zhang@linux.alibaba.com> --- Documentation/filesystems/fscrypt.rst | 1 + fs/crypto/fscrypt_private.h | 2 +- fs/crypto/keysetup.c | 15 +++++++++++++++ fs/crypto/policy.c | 4 ++++ include/uapi/linux/fscrypt.h | 4 +++- 5 files changed, 24 insertions(+), 2 deletions(-) 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/fscrypt_private.h b/fs/crypto/fscrypt_private.h index d5f68a0c5d15..e79a701de028 100644 --- a/fs/crypto/fscrypt_private.h +++ b/fs/crypto/fscrypt_private.h @@ -31,7 +31,7 @@ #define FSCRYPT_CONTEXT_V2 2 /* Keep this in sync with include/uapi/linux/fscrypt.h */ -#define FSCRYPT_MODE_MAX FSCRYPT_MODE_AES_256_HCTR2 +#define FSCRYPT_MODE_MAX FSCRYPT_MODE_SM4_CTS struct fscrypt_context_v1 { u8 version; /* FSCRYPT_CONTEXT_V1 */ diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c index f7407071a952..c0a3f882f5a4 100644 --- a/fs/crypto/keysetup.c +++ b/fs/crypto/keysetup.c @@ -59,6 +59,21 @@ struct fscrypt_mode fscrypt_modes[] = { .security_strength = 32, .ivsize = 32, }, + [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, + }, }; static DEFINE_MUTEX(fscrypt_mode_key_setup_mutex); diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 46757c3052ef..4881fd3af6ee 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -75,6 +75,10 @@ static bool fscrypt_valid_enc_modes_v1(u32 contents_mode, u32 filenames_mode) filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; + if (contents_mode == FSCRYPT_MODE_SM4_XTS && + filenames_mode == FSCRYPT_MODE_SM4_CTS) + return true; + return false; } diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h index a756b29afcc2..34d791bd162c 100644 --- a/include/uapi/linux/fscrypt.h +++ b/include/uapi/linux/fscrypt.h @@ -28,7 +28,9 @@ #define FSCRYPT_MODE_AES_128_CTS 6 #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 */ +#define FSCRYPT_MODE_SM4_XTS 11 +#define FSCRYPT_MODE_SM4_CTS 12 +/* If adding a mode number > 12, update FSCRYPT_MODE_MAX in fscrypt_private.h */ /* * Legacy policy version; ad-hoc KDF and no key verification. -- 2.24.3 (Apple Git-128) ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support 2022-11-16 8:24 ` [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Tianjia Zhang @ 2022-11-16 17:26 ` Eric Biggers 2022-11-17 2:58 ` Tianjia Zhang 0 siblings, 1 reply; 5+ messages in thread From: Eric Biggers @ 2022-11-16 17:26 UTC (permalink / raw) To: Tianjia Zhang Cc: Theodore Y. Ts o, Jaegeuk Kim, Jonathan Corbet, Jens Axboe, linux-fscrypt, linux-doc, linux-kernel, linux-block, linux-crypto On Wed, Nov 16, 2022 at 04:24:16PM +0800, Tianjia Zhang wrote: > SM4 is a symmetric algorithm widely used in China So? What is the use case for adding this to fscrypt specifically? Just because an algorithm is widely used doesn't necessarily mean it is useful or appropriate to support with fscrypt. > , 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 <tianjia.zhang@linux.alibaba.com> > --- > Documentation/filesystems/fscrypt.rst | 1 + > fs/crypto/fscrypt_private.h | 2 +- > fs/crypto/keysetup.c | 15 +++++++++++++++ > fs/crypto/policy.c | 4 ++++ > include/uapi/linux/fscrypt.h | 4 +++- > 5 files changed, 24 insertions(+), 2 deletions(-) > > 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/fscrypt_private.h b/fs/crypto/fscrypt_private.h > index d5f68a0c5d15..e79a701de028 100644 > --- a/fs/crypto/fscrypt_private.h > +++ b/fs/crypto/fscrypt_private.h > @@ -31,7 +31,7 @@ > #define FSCRYPT_CONTEXT_V2 2 > > /* Keep this in sync with include/uapi/linux/fscrypt.h */ > -#define FSCRYPT_MODE_MAX FSCRYPT_MODE_AES_256_HCTR2 > +#define FSCRYPT_MODE_MAX FSCRYPT_MODE_SM4_CTS > > struct fscrypt_context_v1 { > u8 version; /* FSCRYPT_CONTEXT_V1 */ > diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c > index f7407071a952..c0a3f882f5a4 100644 > --- a/fs/crypto/keysetup.c > +++ b/fs/crypto/keysetup.c > @@ -59,6 +59,21 @@ struct fscrypt_mode fscrypt_modes[] = { > .security_strength = 32, > .ivsize = 32, > }, > + [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, > + }, > }; > > static DEFINE_MUTEX(fscrypt_mode_key_setup_mutex); > diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c > index 46757c3052ef..4881fd3af6ee 100644 > --- a/fs/crypto/policy.c > +++ b/fs/crypto/policy.c > @@ -75,6 +75,10 @@ static bool fscrypt_valid_enc_modes_v1(u32 contents_mode, u32 filenames_mode) > filenames_mode == FSCRYPT_MODE_ADIANTUM) > return true; > > + if (contents_mode == FSCRYPT_MODE_SM4_XTS && > + filenames_mode == FSCRYPT_MODE_SM4_CTS) > + return true; > + > return false; > } > > diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h > index a756b29afcc2..34d791bd162c 100644 > --- a/include/uapi/linux/fscrypt.h > +++ b/include/uapi/linux/fscrypt.h > @@ -28,7 +28,9 @@ > #define FSCRYPT_MODE_AES_128_CTS 6 > #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 */ > +#define FSCRYPT_MODE_SM4_XTS 11 > +#define FSCRYPT_MODE_SM4_CTS 12 > +/* If adding a mode number > 12, update FSCRYPT_MODE_MAX in fscrypt_private.h */ This might be a good time to reclaim some of the unused mode numbers. Maybe 7-8 which were very briefly used for Speck128/256. (Irony not lost?) - Eric ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support 2022-11-16 17:26 ` Eric Biggers @ 2022-11-17 2:58 ` Tianjia Zhang 0 siblings, 0 replies; 5+ messages in thread From: Tianjia Zhang @ 2022-11-17 2:58 UTC (permalink / raw) To: Eric Biggers Cc: Theodore Y. Ts o, Jaegeuk Kim, Jonathan Corbet, Jens Axboe, linux-fscrypt, linux-doc, linux-kernel, linux-block, linux-crypto Hi Eric, On 11/17/22 1:26 AM, Eric Biggers wrote: > On Wed, Nov 16, 2022 at 04:24:16PM +0800, Tianjia Zhang wrote: >> SM4 is a symmetric algorithm widely used in China > > So? > > What is the use case for adding this to fscrypt specifically? > > Just because an algorithm is widely used doesn't necessarily mean it is useful > or appropriate to support with fscrypt. > We want to provide our users with the ability to encrypt disks and files using SM4-XTS, the ability to sign SM2/3, and the ability to use SM4-GCM/CCM with TLS (of course this belongs to other parts), quite a few users need these features. >> , 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 <tianjia.zhang@linux.alibaba.com> >> --- >> Documentation/filesystems/fscrypt.rst | 1 + >> fs/crypto/fscrypt_private.h | 2 +- >> fs/crypto/keysetup.c | 15 +++++++++++++++ >> fs/crypto/policy.c | 4 ++++ >> include/uapi/linux/fscrypt.h | 4 +++- >> 5 files changed, 24 insertions(+), 2 deletions(-) >> >> 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/fscrypt_private.h b/fs/crypto/fscrypt_private.h >> index d5f68a0c5d15..e79a701de028 100644 >> --- a/fs/crypto/fscrypt_private.h >> +++ b/fs/crypto/fscrypt_private.h >> @@ -31,7 +31,7 @@ >> #define FSCRYPT_CONTEXT_V2 2 >> >> /* Keep this in sync with include/uapi/linux/fscrypt.h */ >> -#define FSCRYPT_MODE_MAX FSCRYPT_MODE_AES_256_HCTR2 >> +#define FSCRYPT_MODE_MAX FSCRYPT_MODE_SM4_CTS >> >> struct fscrypt_context_v1 { >> u8 version; /* FSCRYPT_CONTEXT_V1 */ >> diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c >> index f7407071a952..c0a3f882f5a4 100644 >> --- a/fs/crypto/keysetup.c >> +++ b/fs/crypto/keysetup.c >> @@ -59,6 +59,21 @@ struct fscrypt_mode fscrypt_modes[] = { >> .security_strength = 32, >> .ivsize = 32, >> }, >> + [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, >> + }, >> }; >> >> static DEFINE_MUTEX(fscrypt_mode_key_setup_mutex); >> diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c >> index 46757c3052ef..4881fd3af6ee 100644 >> --- a/fs/crypto/policy.c >> +++ b/fs/crypto/policy.c >> @@ -75,6 +75,10 @@ static bool fscrypt_valid_enc_modes_v1(u32 contents_mode, u32 filenames_mode) >> filenames_mode == FSCRYPT_MODE_ADIANTUM) >> return true; >> >> + if (contents_mode == FSCRYPT_MODE_SM4_XTS && >> + filenames_mode == FSCRYPT_MODE_SM4_CTS) >> + return true; >> + >> return false; >> } >> >> diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h >> index a756b29afcc2..34d791bd162c 100644 >> --- a/include/uapi/linux/fscrypt.h >> +++ b/include/uapi/linux/fscrypt.h >> @@ -28,7 +28,9 @@ >> #define FSCRYPT_MODE_AES_128_CTS 6 >> #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 */ >> +#define FSCRYPT_MODE_SM4_XTS 11 >> +#define FSCRYPT_MODE_SM4_CTS 12 >> +/* If adding a mode number > 12, update FSCRYPT_MODE_MAX in fscrypt_private.h */ > > This might be a good time to reclaim some of the unused mode numbers. Maybe 7-8 > which were very briefly used for Speck128/256. (Irony not lost?) > This looks awesome, I'll reclaim the gaps in the next version if possible. Cheers, Tianjia ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-17 2:58 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-11-16 8:24 [PATCH 0/2] Add SM4 XTS symmetric algorithm for blk-crypto and fscrypt Tianjia Zhang 2022-11-16 8:24 ` [PATCH 1/2] blk-crypto: Add support for SM4-XTS blk crypto mode Tianjia Zhang 2022-11-16 8:24 ` [PATCH 2/2] fscrypt: Add SM4 XTS/CTS symmetric algorithm support Tianjia Zhang 2022-11-16 17:26 ` Eric Biggers 2022-11-17 2:58 ` Tianjia Zhang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox