diff for duplicates of <20171027180637.GC10611@google.com> diff --git a/a/1.txt b/N1/1.txt index 419e939..ce10e90 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ On Mon, Oct 23, 2017 at 02:40:36PM -0700, Eric Biggers wrote: -> From: Eric Biggers <ebiggers@google.com> +> From: Eric Biggers <ebiggers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> > > Update the filesystem encryption kernel code to use the new names for > the UAPI constants rather than the old names. > -> Signed-off-by: Eric Biggers <ebiggers@google.com> +> Signed-off-by: Eric Biggers <ebiggers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> -Reviewed-by: Michael Halcrow <mhalcrow@google.com> +Reviewed-by: Michael Halcrow <mhalcrow-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> > --- > fs/crypto/fname.c | 4 ++-- @@ -158,8 +158,8 @@ in this same expression. > goto out; > > if (S_ISREG(inode->i_mode) && -> - crypt_info->ci_data_mode = FS_ENCRYPTION_MODE_AES_128_CBC) { -> + crypt_info->ci_data_mode = FSCRYPT_MODE_AES_128_CBC) { +> - crypt_info->ci_data_mode == FS_ENCRYPTION_MODE_AES_128_CBC) { +> + crypt_info->ci_data_mode == FSCRYPT_MODE_AES_128_CBC) { > res = init_essiv_generator(crypt_info, raw_key, keysize); > if (res) { > pr_debug("%s: error %d (inode %lu) allocating essiv tfm\n", @@ -171,10 +171,10 @@ in this same expression. > const struct fscrypt_policy *policy) > { > return memcmp(ctx->master_key_descriptor, policy->master_key_descriptor, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (ctx->flags = policy->flags) && -> (ctx->contents_encryption_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (ctx->flags == policy->flags) && +> (ctx->contents_encryption_mode == > policy->contents_encryption_mode) && > @@ -36,13 +36,13 @@ static int create_encryption_context_from_policy(struct inode *inode, > @@ -205,20 +205,20 @@ in this same expression. > > if (parent_ci && child_ci) { > return memcmp(parent_ci->ci_master_key, child_ci->ci_master_key, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (parent_ci->ci_data_mode = child_ci->ci_data_mode) && -> (parent_ci->ci_filename_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (parent_ci->ci_data_mode == child_ci->ci_data_mode) && +> (parent_ci->ci_filename_mode == > child_ci->ci_filename_mode) && > @@ -216,7 +216,7 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child) > > return memcmp(parent_ctx.master_key_descriptor, > child_ctx.master_key_descriptor, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (parent_ctx.contents_encryption_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (parent_ctx.contents_encryption_mode == > child_ctx.contents_encryption_mode) && -> (parent_ctx.filenames_encryption_mode = +> (parent_ctx.filenames_encryption_mode == > @@ -254,7 +254,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child, > ctx.filenames_encryption_mode = ci->ci_filename_mode; > ctx.flags = ci->ci_flags; @@ -236,16 +236,16 @@ in this same expression. > static inline bool fscrypt_valid_enc_modes(u32 contents_mode, > u32 filenames_mode) > { -> - if (contents_mode = FS_ENCRYPTION_MODE_AES_128_CBC && -> - filenames_mode = FS_ENCRYPTION_MODE_AES_128_CTS) -> + if (contents_mode = FSCRYPT_MODE_AES_128_CBC && -> + filenames_mode = FSCRYPT_MODE_AES_128_CTS) +> - if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC && +> - filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS) +> + if (contents_mode == FSCRYPT_MODE_AES_128_CBC && +> + filenames_mode == FSCRYPT_MODE_AES_128_CTS) > return true; > -> - if (contents_mode = FS_ENCRYPTION_MODE_AES_256_XTS && -> - filenames_mode = FS_ENCRYPTION_MODE_AES_256_CTS) -> + if (contents_mode = FSCRYPT_MODE_AES_256_XTS && -> + filenames_mode = FSCRYPT_MODE_AES_256_CTS) +> - if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && +> - filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) +> + if (contents_mode == FSCRYPT_MODE_AES_256_XTS && +> + filenames_mode == FSCRYPT_MODE_AES_256_CTS) > return true; > > return false; diff --git a/a/content_digest b/N1/content_digest index 40b8267..165b92d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\020171023214058.128121-1-ebiggers3@gmail.com\0" "ref\020171023214058.128121-4-ebiggers3@gmail.com\0" "ref\020171023214058.128121-4-ebiggers3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" - "From\0Michael Halcrow <mhalcrow@google.com>\0" + "From\0Michael Halcrow <mhalcrow-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\0" "Subject\0Re: [RFC PATCH 03/25] fscrypt: use FSCRYPT_* definitions, not FS_*\0" - "Date\0Fri, 27 Oct 2017 18:06:37 +0000\0" + "Date\0Fri, 27 Oct 2017 11:06:37 -0700\0" "To\0Eric Biggers <ebiggers3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "Cc\0linux-fscrypt-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org @@ -22,14 +22,14 @@ "\00:1\0" "b\0" "On Mon, Oct 23, 2017 at 02:40:36PM -0700, Eric Biggers wrote:\n" - "> From: Eric Biggers <ebiggers@google.com>\n" + "> From: Eric Biggers <ebiggers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" "> \n" "> Update the filesystem encryption kernel code to use the new names for\n" "> the UAPI constants rather than the old names.\n" "> \n" - "> Signed-off-by: Eric Biggers <ebiggers@google.com>\n" + "> Signed-off-by: Eric Biggers <ebiggers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" "\n" - "Reviewed-by: Michael Halcrow <mhalcrow@google.com>\n" + "Reviewed-by: Michael Halcrow <mhalcrow-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" "\n" "> ---\n" "> fs/crypto/fname.c | 4 ++--\n" @@ -181,8 +181,8 @@ "> \t\tgoto out;\n" "> \n" "> \tif (S_ISREG(inode->i_mode) &&\n" - "> -\t crypt_info->ci_data_mode = FS_ENCRYPTION_MODE_AES_128_CBC) {\n" - "> +\t crypt_info->ci_data_mode = FSCRYPT_MODE_AES_128_CBC) {\n" + "> -\t crypt_info->ci_data_mode == FS_ENCRYPTION_MODE_AES_128_CBC) {\n" + "> +\t crypt_info->ci_data_mode == FSCRYPT_MODE_AES_128_CBC) {\n" "> \t\tres = init_essiv_generator(crypt_info, raw_key, keysize);\n" "> \t\tif (res) {\n" "> \t\t\tpr_debug(\"%s: error %d (inode %lu) allocating essiv tfm\\n\",\n" @@ -194,10 +194,10 @@ "> \t\t\t\tconst struct fscrypt_policy *policy)\n" "> {\n" "> \treturn memcmp(ctx->master_key_descriptor, policy->master_key_descriptor,\n" - "> -\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t(ctx->flags = policy->flags) &&\n" - "> \t\t(ctx->contents_encryption_mode =\n" + "> -\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t(ctx->flags == policy->flags) &&\n" + "> \t\t(ctx->contents_encryption_mode ==\n" "> \t\t policy->contents_encryption_mode) &&\n" "> @@ -36,13 +36,13 @@ static int create_encryption_context_from_policy(struct inode *inode,\n" "> \n" @@ -228,20 +228,20 @@ "> \n" "> \tif (parent_ci && child_ci) {\n" "> \t\treturn memcmp(parent_ci->ci_master_key, child_ci->ci_master_key,\n" - "> -\t\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t\t(parent_ci->ci_data_mode = child_ci->ci_data_mode) &&\n" - "> \t\t\t(parent_ci->ci_filename_mode =\n" + "> -\t\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t\t(parent_ci->ci_data_mode == child_ci->ci_data_mode) &&\n" + "> \t\t\t(parent_ci->ci_filename_mode ==\n" "> \t\t\t child_ci->ci_filename_mode) &&\n" "> @@ -216,7 +216,7 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)\n" "> \n" "> \treturn memcmp(parent_ctx.master_key_descriptor,\n" "> \t\t child_ctx.master_key_descriptor,\n" - "> -\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t(parent_ctx.contents_encryption_mode =\n" + "> -\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t(parent_ctx.contents_encryption_mode ==\n" "> \t\t child_ctx.contents_encryption_mode) &&\n" - "> \t\t(parent_ctx.filenames_encryption_mode =\n" + "> \t\t(parent_ctx.filenames_encryption_mode ==\n" "> @@ -254,7 +254,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child,\n" "> \tctx.filenames_encryption_mode = ci->ci_filename_mode;\n" "> \tctx.flags = ci->ci_flags;\n" @@ -259,16 +259,16 @@ "> static inline bool fscrypt_valid_enc_modes(u32 contents_mode,\n" "> \t\t\t\t\tu32 filenames_mode)\n" "> {\n" - "> -\tif (contents_mode = FS_ENCRYPTION_MODE_AES_128_CBC &&\n" - "> -\t filenames_mode = FS_ENCRYPTION_MODE_AES_128_CTS)\n" - "> +\tif (contents_mode = FSCRYPT_MODE_AES_128_CBC &&\n" - "> +\t filenames_mode = FSCRYPT_MODE_AES_128_CTS)\n" + "> -\tif (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC &&\n" + "> -\t filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS)\n" + "> +\tif (contents_mode == FSCRYPT_MODE_AES_128_CBC &&\n" + "> +\t filenames_mode == FSCRYPT_MODE_AES_128_CTS)\n" "> \t\treturn true;\n" "> \n" - "> -\tif (contents_mode = FS_ENCRYPTION_MODE_AES_256_XTS &&\n" - "> -\t filenames_mode = FS_ENCRYPTION_MODE_AES_256_CTS)\n" - "> +\tif (contents_mode = FSCRYPT_MODE_AES_256_XTS &&\n" - "> +\t filenames_mode = FSCRYPT_MODE_AES_256_CTS)\n" + "> -\tif (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS &&\n" + "> -\t filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS)\n" + "> +\tif (contents_mode == FSCRYPT_MODE_AES_256_XTS &&\n" + "> +\t filenames_mode == FSCRYPT_MODE_AES_256_CTS)\n" "> \t\treturn true;\n" "> \n" "> \treturn false;\n" @@ -276,4 +276,4 @@ "> 2.15.0.rc0.271.g36b669edcc-goog\n" > -731c7e30374809e6fd0a9562a238a9b0e33bbd1697620fad5c6113e998acb339 +e06c71a3b30fa41ad866d6f060226a734d06032b1b5e0c42b95c97266abcc607
diff --git a/a/1.txt b/N2/1.txt index 419e939..a20fade 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -158,8 +158,8 @@ in this same expression. > goto out; > > if (S_ISREG(inode->i_mode) && -> - crypt_info->ci_data_mode = FS_ENCRYPTION_MODE_AES_128_CBC) { -> + crypt_info->ci_data_mode = FSCRYPT_MODE_AES_128_CBC) { +> - crypt_info->ci_data_mode == FS_ENCRYPTION_MODE_AES_128_CBC) { +> + crypt_info->ci_data_mode == FSCRYPT_MODE_AES_128_CBC) { > res = init_essiv_generator(crypt_info, raw_key, keysize); > if (res) { > pr_debug("%s: error %d (inode %lu) allocating essiv tfm\n", @@ -171,10 +171,10 @@ in this same expression. > const struct fscrypt_policy *policy) > { > return memcmp(ctx->master_key_descriptor, policy->master_key_descriptor, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (ctx->flags = policy->flags) && -> (ctx->contents_encryption_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (ctx->flags == policy->flags) && +> (ctx->contents_encryption_mode == > policy->contents_encryption_mode) && > @@ -36,13 +36,13 @@ static int create_encryption_context_from_policy(struct inode *inode, > @@ -205,20 +205,20 @@ in this same expression. > > if (parent_ci && child_ci) { > return memcmp(parent_ci->ci_master_key, child_ci->ci_master_key, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (parent_ci->ci_data_mode = child_ci->ci_data_mode) && -> (parent_ci->ci_filename_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (parent_ci->ci_data_mode == child_ci->ci_data_mode) && +> (parent_ci->ci_filename_mode == > child_ci->ci_filename_mode) && > @@ -216,7 +216,7 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child) > > return memcmp(parent_ctx.master_key_descriptor, > child_ctx.master_key_descriptor, -> - FS_KEY_DESCRIPTOR_SIZE) = 0 && -> + FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 && -> (parent_ctx.contents_encryption_mode = +> - FS_KEY_DESCRIPTOR_SIZE) == 0 && +> + FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 && +> (parent_ctx.contents_encryption_mode == > child_ctx.contents_encryption_mode) && -> (parent_ctx.filenames_encryption_mode = +> (parent_ctx.filenames_encryption_mode == > @@ -254,7 +254,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child, > ctx.filenames_encryption_mode = ci->ci_filename_mode; > ctx.flags = ci->ci_flags; @@ -236,16 +236,16 @@ in this same expression. > static inline bool fscrypt_valid_enc_modes(u32 contents_mode, > u32 filenames_mode) > { -> - if (contents_mode = FS_ENCRYPTION_MODE_AES_128_CBC && -> - filenames_mode = FS_ENCRYPTION_MODE_AES_128_CTS) -> + if (contents_mode = FSCRYPT_MODE_AES_128_CBC && -> + filenames_mode = FSCRYPT_MODE_AES_128_CTS) +> - if (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC && +> - filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS) +> + if (contents_mode == FSCRYPT_MODE_AES_128_CBC && +> + filenames_mode == FSCRYPT_MODE_AES_128_CTS) > return true; > -> - if (contents_mode = FS_ENCRYPTION_MODE_AES_256_XTS && -> - filenames_mode = FS_ENCRYPTION_MODE_AES_256_CTS) -> + if (contents_mode = FSCRYPT_MODE_AES_256_XTS && -> + filenames_mode = FSCRYPT_MODE_AES_256_CTS) +> - if (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS && +> - filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS) +> + if (contents_mode == FSCRYPT_MODE_AES_256_XTS && +> + filenames_mode == FSCRYPT_MODE_AES_256_CTS) > return true; > > return false; diff --git a/a/content_digest b/N2/content_digest index 40b8267..658c306 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,23 @@ "ref\020171023214058.128121-1-ebiggers3@gmail.com\0" "ref\020171023214058.128121-4-ebiggers3@gmail.com\0" - "ref\020171023214058.128121-4-ebiggers3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" "From\0Michael Halcrow <mhalcrow@google.com>\0" "Subject\0Re: [RFC PATCH 03/25] fscrypt: use FSCRYPT_* definitions, not FS_*\0" - "Date\0Fri, 27 Oct 2017 18:06:37 +0000\0" - "To\0Eric Biggers <ebiggers3-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Cc\0linux-fscrypt-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" - linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-ext4-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-f2fs-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org - linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - keyrings-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Theodore Y . Ts'o <tytso-3s7WtUTddSA@public.gmane.org> - Jaegeuk Kim <jaegeuk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - Gwendal Grignou <gwendal-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Ryo Hashimoto <hashimoto-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Sarthak Kukreti <sarthakkukreti-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> - Nick Desaulniers <ndesaulniers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> - " Eric Biggers <ebiggers-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\0" + "Date\0Fri, 27 Oct 2017 11:06:37 -0700\0" + "To\0Eric Biggers <ebiggers3@gmail.com>\0" + "Cc\0linux-fscrypt@vger.kernel.org" + linux-fsdevel@vger.kernel.org + linux-ext4@vger.kernel.org + linux-f2fs-devel@lists.sourceforge.net + linux-mtd@lists.infradead.org + linux-api@vger.kernel.org + keyrings@vger.kernel.org + Theodore Y . Ts'o <tytso@mit.edu> + Jaegeuk Kim <jaegeuk@kernel.org> + Gwendal Grignou <gwendal@chromium.org> + Ryo Hashimoto <hashimoto@chromium.org> + Sarthak Kukreti <sarthakkukreti@chromium.org> + Nick Desaulniers <ndesaulniers@google.com> + " Eric Biggers <ebiggers@google.com>\0" "\00:1\0" "b\0" "On Mon, Oct 23, 2017 at 02:40:36PM -0700, Eric Biggers wrote:\n" @@ -181,8 +180,8 @@ "> \t\tgoto out;\n" "> \n" "> \tif (S_ISREG(inode->i_mode) &&\n" - "> -\t crypt_info->ci_data_mode = FS_ENCRYPTION_MODE_AES_128_CBC) {\n" - "> +\t crypt_info->ci_data_mode = FSCRYPT_MODE_AES_128_CBC) {\n" + "> -\t crypt_info->ci_data_mode == FS_ENCRYPTION_MODE_AES_128_CBC) {\n" + "> +\t crypt_info->ci_data_mode == FSCRYPT_MODE_AES_128_CBC) {\n" "> \t\tres = init_essiv_generator(crypt_info, raw_key, keysize);\n" "> \t\tif (res) {\n" "> \t\t\tpr_debug(\"%s: error %d (inode %lu) allocating essiv tfm\\n\",\n" @@ -194,10 +193,10 @@ "> \t\t\t\tconst struct fscrypt_policy *policy)\n" "> {\n" "> \treturn memcmp(ctx->master_key_descriptor, policy->master_key_descriptor,\n" - "> -\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t(ctx->flags = policy->flags) &&\n" - "> \t\t(ctx->contents_encryption_mode =\n" + "> -\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t(ctx->flags == policy->flags) &&\n" + "> \t\t(ctx->contents_encryption_mode ==\n" "> \t\t policy->contents_encryption_mode) &&\n" "> @@ -36,13 +36,13 @@ static int create_encryption_context_from_policy(struct inode *inode,\n" "> \n" @@ -228,20 +227,20 @@ "> \n" "> \tif (parent_ci && child_ci) {\n" "> \t\treturn memcmp(parent_ci->ci_master_key, child_ci->ci_master_key,\n" - "> -\t\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t\t(parent_ci->ci_data_mode = child_ci->ci_data_mode) &&\n" - "> \t\t\t(parent_ci->ci_filename_mode =\n" + "> -\t\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t\t(parent_ci->ci_data_mode == child_ci->ci_data_mode) &&\n" + "> \t\t\t(parent_ci->ci_filename_mode ==\n" "> \t\t\t child_ci->ci_filename_mode) &&\n" "> @@ -216,7 +216,7 @@ int fscrypt_has_permitted_context(struct inode *parent, struct inode *child)\n" "> \n" "> \treturn memcmp(parent_ctx.master_key_descriptor,\n" "> \t\t child_ctx.master_key_descriptor,\n" - "> -\t\t FS_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) = 0 &&\n" - "> \t\t(parent_ctx.contents_encryption_mode =\n" + "> -\t\t FS_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> +\t\t FSCRYPT_KEY_DESCRIPTOR_SIZE) == 0 &&\n" + "> \t\t(parent_ctx.contents_encryption_mode ==\n" "> \t\t child_ctx.contents_encryption_mode) &&\n" - "> \t\t(parent_ctx.filenames_encryption_mode =\n" + "> \t\t(parent_ctx.filenames_encryption_mode ==\n" "> @@ -254,7 +254,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child,\n" "> \tctx.filenames_encryption_mode = ci->ci_filename_mode;\n" "> \tctx.flags = ci->ci_flags;\n" @@ -259,16 +258,16 @@ "> static inline bool fscrypt_valid_enc_modes(u32 contents_mode,\n" "> \t\t\t\t\tu32 filenames_mode)\n" "> {\n" - "> -\tif (contents_mode = FS_ENCRYPTION_MODE_AES_128_CBC &&\n" - "> -\t filenames_mode = FS_ENCRYPTION_MODE_AES_128_CTS)\n" - "> +\tif (contents_mode = FSCRYPT_MODE_AES_128_CBC &&\n" - "> +\t filenames_mode = FSCRYPT_MODE_AES_128_CTS)\n" + "> -\tif (contents_mode == FS_ENCRYPTION_MODE_AES_128_CBC &&\n" + "> -\t filenames_mode == FS_ENCRYPTION_MODE_AES_128_CTS)\n" + "> +\tif (contents_mode == FSCRYPT_MODE_AES_128_CBC &&\n" + "> +\t filenames_mode == FSCRYPT_MODE_AES_128_CTS)\n" "> \t\treturn true;\n" "> \n" - "> -\tif (contents_mode = FS_ENCRYPTION_MODE_AES_256_XTS &&\n" - "> -\t filenames_mode = FS_ENCRYPTION_MODE_AES_256_CTS)\n" - "> +\tif (contents_mode = FSCRYPT_MODE_AES_256_XTS &&\n" - "> +\t filenames_mode = FSCRYPT_MODE_AES_256_CTS)\n" + "> -\tif (contents_mode == FS_ENCRYPTION_MODE_AES_256_XTS &&\n" + "> -\t filenames_mode == FS_ENCRYPTION_MODE_AES_256_CTS)\n" + "> +\tif (contents_mode == FSCRYPT_MODE_AES_256_XTS &&\n" + "> +\t filenames_mode == FSCRYPT_MODE_AES_256_CTS)\n" "> \t\treturn true;\n" "> \n" "> \treturn false;\n" @@ -276,4 +275,4 @@ "> 2.15.0.rc0.271.g36b669edcc-goog\n" > -731c7e30374809e6fd0a9562a238a9b0e33bbd1697620fad5c6113e998acb339 +739c62980d190fb0e6063282f626cb77cc3591c02efcb6b53216f94455df28e0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.