diff for duplicates of <20190726224141.14044-4-ebiggers@kernel.org>
diff --git a/a/1.txt b/N1/1.txt
index 6ae28be..1ff9cb5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -370,4 +370,11 @@ index 674b0452ef575..29a945d165def 100644
#endif /* _UAPI_LINUX_FSCRYPT_H */
--
-2.22.0
\ No newline at end of file
+2.22.0
+
+
+
+_______________________________________________
+Linux-f2fs-devel mailing list
+Linux-f2fs-devel@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index c17b0e4..b302079 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
"From\0Eric Biggers <ebiggers\@kernel.org>\0"
]
[
- "Subject\0[PATCH v7 03/16] fscrypt: use FSCRYPT_* definitions, not FS_*\0"
+ "Subject\0[f2fs-dev] [PATCH v7 03/16] fscrypt: use FSCRYPT_* definitions, not FS_*\0"
]
[
"Date\0Fri, 26 Jul 2019 15:41:28 -0700\0"
@@ -14,15 +14,15 @@
"To\0linux-fscrypt\@vger.kernel.org\0"
]
[
- "Cc\0linux-fsdevel\@vger.kernel.org",
- " linux-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-api\@vger.kernel.org",
" linux-crypto\@vger.kernel.org",
- " keyrings\@vger.kernel.org",
- " Paul Crowley <paulcrowley\@google.com>",
- " Satya Tangirala <satyat\@google.com>\0"
+ " linux-fsdevel\@vger.kernel.org",
+ " linux-ext4\@vger.kernel.org",
+ " Paul Crowley <paulcrowley\@google.com>\0"
]
[
"\0000:1\0"
@@ -403,7 +403,14 @@
" \n",
" #endif /* _UAPI_LINUX_FSCRYPT_H */\n",
"-- \n",
- "2.22.0"
+ "2.22.0\n",
+ "\n",
+ "\n",
+ "\n",
+ "_______________________________________________\n",
+ "Linux-f2fs-devel mailing list\n",
+ "Linux-f2fs-devel\@lists.sourceforge.net\n",
+ "https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel"
]
-c82e46c97b532e31159f4ff1500f197e56806a41d7fcb8bf2852ebc560ee7b2b
+fb83953b506a2aed338d4a4a4818bb22f451c25a41e697dc90e388399c70a0af
diff --git a/a/1.txt b/N2/1.txt
index 6ae28be..6fb707b 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -66,22 +66,22 @@ index 4d715708c6e1f..fae411b2f78dc 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 2129943002335..22345ddede119 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) {
@@ -203,7 +203,7 @@ static int find_and_derive_key(const struct inode *inode,
if (IS_ERR(key))
return PTR_ERR(key);
@@ -293,10 +293,10 @@ index 4941fe8471cef..da7ae9c8b4ad0 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 4941fe8471cef..da7ae9c8b4ad0 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) &&
@@ -219,7 +219,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 =
@@ -257,7 +257,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 c17b0e4..a8419ca 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -8,21 +8,21 @@
"Subject\0[PATCH v7 03/16] fscrypt: use FSCRYPT_* definitions, not FS_*\0"
]
[
- "Date\0Fri, 26 Jul 2019 15:41:28 -0700\0"
+ "Date\0Fri, 26 Jul 2019 22:41:28 +0000\0"
]
[
"To\0linux-fscrypt\@vger.kernel.org\0"
]
[
- "Cc\0linux-fsdevel\@vger.kernel.org",
- " linux-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-api\@vger.kernel.org",
" linux-crypto\@vger.kernel.org",
- " keyrings\@vger.kernel.org",
- " Paul Crowley <paulcrowley\@google.com>",
- " Satya Tangirala <satyat\@google.com>\0"
+ " linux-fsdevel\@vger.kernel.org",
+ " linux-ext4\@vger.kernel.org",
+ " Paul Crowley <paulcrowley\@google.com>\0"
]
[
"\0000:1\0"
@@ -99,22 +99,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",
@@ -204,7 +204,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",
"\@\@ -203,7 +203,7 \@\@ static int find_and_derive_key(const struct inode *inode,\n",
" \tif (IS_ERR(key))\n",
" \t\treturn PTR_ERR(key);\n",
@@ -326,10 +326,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",
@@ -360,20 +360,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",
"\@\@ -219,7 +219,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",
"\@\@ -257,7 +257,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",
@@ -406,4 +406,4 @@
"2.22.0"
]
-c82e46c97b532e31159f4ff1500f197e56806a41d7fcb8bf2852ebc560ee7b2b
+78b5d6eded9910618feb7115bf928b1459e3b5b9f7059ffa2512008049c63593
diff --git a/a/content_digest b/N3/content_digest
index c17b0e4..65b39e9 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -14,15 +14,15 @@
"To\0linux-fscrypt\@vger.kernel.org\0"
]
[
- "Cc\0linux-fsdevel\@vger.kernel.org",
- " linux-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-api\@vger.kernel.org",
" linux-crypto\@vger.kernel.org",
- " keyrings\@vger.kernel.org",
- " Paul Crowley <paulcrowley\@google.com>",
- " Satya Tangirala <satyat\@google.com>\0"
+ " linux-fsdevel\@vger.kernel.org",
+ " linux-ext4\@vger.kernel.org",
+ " Paul Crowley <paulcrowley\@google.com>\0"
]
[
"\0000:1\0"
@@ -406,4 +406,4 @@
"2.22.0"
]
-c82e46c97b532e31159f4ff1500f197e56806a41d7fcb8bf2852ebc560ee7b2b
+b242d6566c8fe1f6c65c527b0d2086c3e5c7f8d940f2c1d5ed7ee4564fbab7aa
diff --git a/a/1.txt b/N4/1.txt
index 6ae28be..ffdf6b3 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -370,4 +370,9 @@ index 674b0452ef575..29a945d165def 100644
#endif /* _UAPI_LINUX_FSCRYPT_H */
--
-2.22.0
\ No newline at end of file
+2.22.0
+
+
+______________________________________________________
+Linux MTD discussion mailing list
+http://lists.infradead.org/mailman/listinfo/linux-mtd/
\ No newline at end of file
diff --git a/a/content_digest b/N4/content_digest
index c17b0e4..10110f7 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -14,15 +14,15 @@
"To\0linux-fscrypt\@vger.kernel.org\0"
]
[
- "Cc\0linux-fsdevel\@vger.kernel.org",
- " linux-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-api\@vger.kernel.org",
" linux-crypto\@vger.kernel.org",
- " keyrings\@vger.kernel.org",
- " Paul Crowley <paulcrowley\@google.com>",
- " Satya Tangirala <satyat\@google.com>\0"
+ " linux-fsdevel\@vger.kernel.org",
+ " linux-ext4\@vger.kernel.org",
+ " Paul Crowley <paulcrowley\@google.com>\0"
]
[
"\0000:1\0"
@@ -403,7 +403,12 @@
" \n",
" #endif /* _UAPI_LINUX_FSCRYPT_H */\n",
"-- \n",
- "2.22.0"
+ "2.22.0\n",
+ "\n",
+ "\n",
+ "______________________________________________________\n",
+ "Linux MTD discussion mailing list\n",
+ "http://lists.infradead.org/mailman/listinfo/linux-mtd/"
]
-c82e46c97b532e31159f4ff1500f197e56806a41d7fcb8bf2852ebc560ee7b2b
+7a9307f9df2327ea1eb8ddd12826ee348bc0f07c601b150335191622647aaf10
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.