diff for duplicates of <20181116200712.14154-5-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index eb8108e..3698304 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -78,7 +78,7 @@ index deec1804a00a..8bcef90939f8 100644 break; @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, /* this is for backward compatibility */ - if (xattr_len = 21) { + if (xattr_len == 21) { unsigned int zero = 0; - if (!memcmp(&xattr_value->digest[16], &zero, 4)) + if (!memcmp(&xattr_value->data[16], &zero, 4)) diff --git a/a/content_digest b/N1/content_digest index cdd4268..88f3544 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 04/14] integrity: Introduce struct evm_xattr\0" - "Date\0Fri, 16 Nov 2018 20:07:02 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:02 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -104,7 +104,7 @@ " \t\tbreak;\n" "@@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value,\n" " \t\t/* this is for backward compatibility */\n" - " \t\tif (xattr_len = 21) {\n" + " \t\tif (xattr_len == 21) {\n" " \t\t\tunsigned int zero = 0;\n" "-\t\t\tif (!memcmp(&xattr_value->digest[16], &zero, 4))\n" "+\t\t\tif (!memcmp(&xattr_value->data[16], &zero, 4))\n" @@ -136,4 +136,4 @@ " \tu8 digest[SHA1_DIGEST_SIZE];\n" } __packed; -39dc6df40c6c720c0e77d48aebc645218b595eba4a778d250954f485d90537c1 +184ef87aa5cfe46243ee4d3898747662ee6e572a43e9d6569a54a476409bbc07
diff --git a/a/1.txt b/N2/1.txt index eb8108e..3698304 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -78,7 +78,7 @@ index deec1804a00a..8bcef90939f8 100644 break; @@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value, /* this is for backward compatibility */ - if (xattr_len = 21) { + if (xattr_len == 21) { unsigned int zero = 0; - if (!memcmp(&xattr_value->digest[16], &zero, 4)) + if (!memcmp(&xattr_value->data[16], &zero, 4)) diff --git a/a/content_digest b/N2/content_digest index cdd4268..3b78a72 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,27 @@ "ref\020181116200712.14154-1-bauerman@linux.ibm.com\0" "From\0Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" "Subject\0[PATCH v8 04/14] integrity: Introduce struct evm_xattr\0" - "Date\0Fri, 16 Nov 2018 20:07:02 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:02 -0200\0" "To\0linux-integrity@vger.kernel.org\0" - "Cc\0linux-security-module@vger.kernel.org" - keyrings@vger.kernel.org - linux-crypto@vger.kernel.org - linuxppc-dev@lists.ozlabs.org + "Cc\0Herbert Xu <herbert@gondor.apana.org.au>" linux-doc@vger.kernel.org + Dmitry Kasatkin <dmitry.kasatkin@gmail.com> + David S. Miller <davem@davemloft.net> + Jonathan Corbet <corbet@lwn.net> linux-kernel@vger.kernel.org Mimi Zohar <zohar@linux.ibm.com> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> James Morris <jmorris@namei.org> - Serge E. Hallyn <serge@hallyn.com> David Howells <dhowells@redhat.com> - David Woodhouse <dwmw2@infradead.org> - Jessica Yu <jeyu@kernel.org> - Herbert Xu <herbert@gondor.apana.org.au> - David S. Miller <davem@davemloft.net> - Jonathan Corbet <corbet@lwn.net> AKASHI Takahiro <takahiro.akashi@linaro.org> - " Thiago Jung Bauermann <bauerman@linux.ibm.com>\0" + linux-security-module@vger.kernel.org + keyrings@vger.kernel.org + linux-crypto@vger.kernel.org + Jessica Yu <jeyu@kernel.org> + linuxppc-dev@lists.ozlabs.org + David Woodhouse <dwmw2@infradead.org> + Thiago Jung Bauermann <bauerman@linux.ibm.com> + " Serge E. Hallyn <serge@hallyn.com>\0" "\00:1\0" "b\0" "Even though struct evm_ima_xattr_data includes a fixed-size array to hold a\n" @@ -104,7 +104,7 @@ " \t\tbreak;\n" "@@ -175,7 +176,7 @@ enum hash_algo ima_get_hash_algo(struct evm_ima_xattr_data *xattr_value,\n" " \t\t/* this is for backward compatibility */\n" - " \t\tif (xattr_len = 21) {\n" + " \t\tif (xattr_len == 21) {\n" " \t\t\tunsigned int zero = 0;\n" "-\t\t\tif (!memcmp(&xattr_value->digest[16], &zero, 4))\n" "+\t\t\tif (!memcmp(&xattr_value->data[16], &zero, 4))\n" @@ -136,4 +136,4 @@ " \tu8 digest[SHA1_DIGEST_SIZE];\n" } __packed; -39dc6df40c6c720c0e77d48aebc645218b595eba4a778d250954f485d90537c1 +cb78d33a3514030160031f4f0876196a37fc6c6880ab5ef2b3f9d5f481f79710
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.