diff for duplicates of <20190220065249.32099-4-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 613bdd3..a136406 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,22 +66,22 @@ index 7da276159593..52e09ef40bfa 100644 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; -- if (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM && -- filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM) -+ if (contents_mode = FSCRYPT_MODE_ADIANTUM && -+ filenames_mode = FSCRYPT_MODE_ADIANTUM) +- if (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM && +- filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM) ++ if (contents_mode == FSCRYPT_MODE_ADIANTUM && ++ filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; return false; @@ -171,7 +171,7 @@ index 1e11a683f63d..a8c1e886b0bc 100644 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, ctx->master_key_descriptor, mode->keysize, &payload); - if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { + if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { @@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode, if (IS_ERR(key)) return PTR_ERR(key); @@ -293,10 +293,10 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 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) && @@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode, @@ -327,20 +327,20 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 if (parent_ci && child_ci) { return memcmp(parent_ci->ci_master_key_descriptor, child_ci->ci_master_key_descriptor, -- 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) && @@ -217,7 +217,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 == @@ -255,7 +255,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child, ctx.filenames_encryption_mode = ci->ci_filename_mode; ctx.flags = ci->ci_flags; diff --git a/a/content_digest b/N1/content_digest index 300802b..e4ef21e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 03/18] fscrypt: use FSCRYPT_* definitions, not FS_*\0" - "Date\0Wed, 20 Feb 2019 06:52:34 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:34 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -82,22 +82,22 @@ " static inline bool fscrypt_valid_enc_modes(u32 contents_mode,\n" " \t\t\t\t\t u32 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" - "-\tif (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM &&\n" - "-\t filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM)\n" - "+\tif (contents_mode = FSCRYPT_MODE_ADIANTUM &&\n" - "+\t filenames_mode = FSCRYPT_MODE_ADIANTUM)\n" + "-\tif (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM &&\n" + "-\t filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM)\n" + "+\tif (contents_mode == FSCRYPT_MODE_ADIANTUM &&\n" + "+\t filenames_mode == FSCRYPT_MODE_ADIANTUM)\n" " \t\treturn true;\n" " \n" " \treturn false;\n" @@ -187,7 +187,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" " \t\t\t\t\tctx->master_key_descriptor,\n" " \t\t\t\t\tmode->keysize, &payload);\n" - " \tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + " \tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "@@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode,\n" " \tif (IS_ERR(key))\n" " \t\treturn PTR_ERR(key);\n" @@ -309,10 +309,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" "@@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode,\n" " \n" @@ -343,20 +343,20 @@ " \tif (parent_ci && child_ci) {\n" " \t\treturn memcmp(parent_ci->ci_master_key_descriptor,\n" " \t\t\t child_ci->ci_master_key_descriptor,\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" "@@ -217,7 +217,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" "@@ -255,7 +255,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" @@ -388,4 +388,4 @@ "-- \n" 2.20.1 -2925898ae2ac6b9af1b75cbbdda5288127d06ed4aaa22b0ba1dc97cec0988d65 +2e4b53f4c5801c6bd47003ed3669e66caa4cfadd20ff05f0b14777cfd660e5c1
diff --git a/a/1.txt b/N2/1.txt index 613bdd3..a136406 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,22 +66,22 @@ index 7da276159593..52e09ef40bfa 100644 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; -- if (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM && -- filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM) -+ if (contents_mode = FSCRYPT_MODE_ADIANTUM && -+ filenames_mode = FSCRYPT_MODE_ADIANTUM) +- if (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM && +- filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM) ++ if (contents_mode == FSCRYPT_MODE_ADIANTUM && ++ filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; return false; @@ -171,7 +171,7 @@ index 1e11a683f63d..a8c1e886b0bc 100644 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, ctx->master_key_descriptor, mode->keysize, &payload); - if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { + if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { @@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode, if (IS_ERR(key)) return PTR_ERR(key); @@ -293,10 +293,10 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 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) && @@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode, @@ -327,20 +327,20 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 if (parent_ci && child_ci) { return memcmp(parent_ci->ci_master_key_descriptor, child_ci->ci_master_key_descriptor, -- 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) && @@ -217,7 +217,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 == @@ -255,7 +255,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child, ctx.filenames_encryption_mode = ci->ci_filename_mode; ctx.flags = ci->ci_flags; diff --git a/a/content_digest b/N2/content_digest index 300802b..489f394 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 03/18] fscrypt: use FSCRYPT_* definitions, not FS_*\0" - "Date\0Wed, 20 Feb 2019 06:52:34 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:34 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" - "Cc\0linux-ext4@vger.kernel.org" + "Cc\0Satya Tangirala <satyat@google.com>" linux-api@vger.kernel.org linux-f2fs-devel@lists.sourceforge.net keyrings@vger.kernel.org linux-mtd@lists.infradead.org linux-crypto@vger.kernel.org linux-fsdevel@vger.kernel.org - Satya Tangirala <satyat@google.com> + linux-ext4@vger.kernel.org " Paul Crowley <paulcrowley@google.com>\0" "\00:1\0" "b\0" @@ -82,22 +82,22 @@ " static inline bool fscrypt_valid_enc_modes(u32 contents_mode,\n" " \t\t\t\t\t u32 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" - "-\tif (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM &&\n" - "-\t filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM)\n" - "+\tif (contents_mode = FSCRYPT_MODE_ADIANTUM &&\n" - "+\t filenames_mode = FSCRYPT_MODE_ADIANTUM)\n" + "-\tif (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM &&\n" + "-\t filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM)\n" + "+\tif (contents_mode == FSCRYPT_MODE_ADIANTUM &&\n" + "+\t filenames_mode == FSCRYPT_MODE_ADIANTUM)\n" " \t\treturn true;\n" " \n" " \treturn false;\n" @@ -187,7 +187,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" " \t\t\t\t\tctx->master_key_descriptor,\n" " \t\t\t\t\tmode->keysize, &payload);\n" - " \tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + " \tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "@@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode,\n" " \tif (IS_ERR(key))\n" " \t\treturn PTR_ERR(key);\n" @@ -309,10 +309,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" "@@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode,\n" " \n" @@ -343,20 +343,20 @@ " \tif (parent_ci && child_ci) {\n" " \t\treturn memcmp(parent_ci->ci_master_key_descriptor,\n" " \t\t\t child_ci->ci_master_key_descriptor,\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" "@@ -217,7 +217,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" "@@ -255,7 +255,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" @@ -388,4 +388,4 @@ "-- \n" 2.20.1 -2925898ae2ac6b9af1b75cbbdda5288127d06ed4aaa22b0ba1dc97cec0988d65 +d2d37a3f658529b3bc7bd1e72fbdfbff564a891c9cfd8b161d05bf0a8b0cb27a
diff --git a/a/1.txt b/N3/1.txt index 613bdd3..b3b173c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -66,22 +66,22 @@ index 7da276159593..52e09ef40bfa 100644 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; -- if (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM && -- filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM) -+ if (contents_mode = FSCRYPT_MODE_ADIANTUM && -+ filenames_mode = FSCRYPT_MODE_ADIANTUM) +- if (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM && +- filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM) ++ if (contents_mode == FSCRYPT_MODE_ADIANTUM && ++ filenames_mode == FSCRYPT_MODE_ADIANTUM) return true; return false; @@ -171,7 +171,7 @@ index 1e11a683f63d..a8c1e886b0bc 100644 + key = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX, ctx->master_key_descriptor, mode->keysize, &payload); - if (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { + if (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) { @@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode, if (IS_ERR(key)) return PTR_ERR(key); @@ -293,10 +293,10 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 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) && @@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode, @@ -327,20 +327,20 @@ index bd7eaf9b3f00..1e0563cea1a5 100644 if (parent_ci && child_ci) { return memcmp(parent_ci->ci_master_key_descriptor, child_ci->ci_master_key_descriptor, -- 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) && @@ -217,7 +217,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 == @@ -255,7 +255,7 @@ int fscrypt_inherit_context(struct inode *parent, struct inode *child, ctx.filenames_encryption_mode = ci->ci_filename_mode; ctx.flags = ci->ci_flags; @@ -371,3 +371,8 @@ index f9b99cc028bc..3bbc5dfbde21 100644 #endif /* _UAPI_LINUX_FSCRYPT_H */ -- 2.20.1 + + +______________________________________________________ +Linux MTD discussion mailing list +http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/a/content_digest b/N3/content_digest index 300802b..bdbab09 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,7 +1,7 @@ "ref\020190220065249.32099-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[RFC PATCH v3 03/18] fscrypt: use FSCRYPT_* definitions, not FS_*\0" - "Date\0Wed, 20 Feb 2019 06:52:34 +0000\0" + "Date\0Tue, 19 Feb 2019 22:52:34 -0800\0" "To\0linux-fscrypt@vger.kernel.org\0" "Cc\0linux-ext4@vger.kernel.org" linux-api@vger.kernel.org @@ -82,22 +82,22 @@ " static inline bool fscrypt_valid_enc_modes(u32 contents_mode,\n" " \t\t\t\t\t u32 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" - "-\tif (contents_mode = FS_ENCRYPTION_MODE_ADIANTUM &&\n" - "-\t filenames_mode = FS_ENCRYPTION_MODE_ADIANTUM)\n" - "+\tif (contents_mode = FSCRYPT_MODE_ADIANTUM &&\n" - "+\t filenames_mode = FSCRYPT_MODE_ADIANTUM)\n" + "-\tif (contents_mode == FS_ENCRYPTION_MODE_ADIANTUM &&\n" + "-\t filenames_mode == FS_ENCRYPTION_MODE_ADIANTUM)\n" + "+\tif (contents_mode == FSCRYPT_MODE_ADIANTUM &&\n" + "+\t filenames_mode == FSCRYPT_MODE_ADIANTUM)\n" " \t\treturn true;\n" " \n" " \treturn false;\n" @@ -187,7 +187,7 @@ "+\tkey = find_and_lock_process_key(FSCRYPT_KEY_DESC_PREFIX,\n" " \t\t\t\t\tctx->master_key_descriptor,\n" " \t\t\t\t\tmode->keysize, &payload);\n" - " \tif (key = ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" + " \tif (key == ERR_PTR(-ENOKEY) && inode->i_sb->s_cop->key_prefix) {\n" "@@ -205,7 +205,7 @@ static int find_and_derive_key(const struct inode *inode,\n" " \tif (IS_ERR(key))\n" " \t\treturn PTR_ERR(key);\n" @@ -309,10 +309,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" "@@ -37,13 +37,13 @@ static int create_encryption_context_from_policy(struct inode *inode,\n" " \n" @@ -343,20 +343,20 @@ " \tif (parent_ci && child_ci) {\n" " \t\treturn memcmp(parent_ci->ci_master_key_descriptor,\n" " \t\t\t child_ci->ci_master_key_descriptor,\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" "@@ -217,7 +217,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" "@@ -255,7 +255,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" @@ -386,6 +386,11 @@ " \n" " #endif /* _UAPI_LINUX_FSCRYPT_H */\n" "-- \n" - 2.20.1 + "2.20.1\n" + "\n" + "\n" + "______________________________________________________\n" + "Linux MTD discussion mailing list\n" + http://lists.infradead.org/mailman/listinfo/linux-mtd/ -2925898ae2ac6b9af1b75cbbdda5288127d06ed4aaa22b0ba1dc97cec0988d65 +259f5e19525908bf8029df75b9b1e58a4c6234ac18f3f898e18b4d3d6788320c
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.