diff for duplicates of <1521672411.3848.219.camel@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index d859dcf..591e38e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,7 +29,8 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + return ERR_PTR(-EINVAL); > > if (!keyring[id]) { -> keyring[id] > @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, +> keyring[id] = +> @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, > int err = PTR_ERR(keyring[id]); > pr_err("no %s keyring: %d\n", keyring_name[id], err); > keyring[id] = NULL; diff --git a/a/content_digest b/N1/content_digest index 8c8e8a4..9c468be 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020180316203837.10174-6-bauerman@linux.vnet.ibm.com\0" "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v6 05/12] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Wed, 21 Mar 2018 22:46:51 +0000\0" + "Date\0Wed, 21 Mar 2018 18:46:51 -0400\0" "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" " linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" @@ -53,7 +53,8 @@ "> +\t\treturn ERR_PTR(-EINVAL);\n" "> \n" "> \tif (!keyring[id]) {\n" - "> \t\tkeyring[id] > @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + "> \t\tkeyring[id] =\n" + "> @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" "> \t\t\tint err = PTR_ERR(keyring[id]);\n" "> \t\t\tpr_err(\"no %s keyring: %d\\n\", keyring_name[id], err);\n" "> \t\t\tkeyring[id] = NULL;\n" @@ -115,4 +116,4 @@ "> \t\t\t\t\t const char *digest, int digestlen)\n" > -4ba29683f38c823a91609b64bb62d3d38e02d98276813f75822e1e213c9c52cb +de65c2ec6475234233287e094dba6eb87c3a40825f111bb571e3aea8f4bb2d70
diff --git a/a/1.txt b/N2/1.txt index d859dcf..1f817e6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -29,7 +29,8 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > + return ERR_PTR(-EINVAL); > > if (!keyring[id]) { -> keyring[id] > @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, +> keyring[id] = +> @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, > int err = PTR_ERR(keyring[id]); > pr_err("no %s keyring: %d\n", keyring_name[id], err); > keyring[id] = NULL; @@ -89,4 +90,9 @@ Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> > static inline int integrity_digsig_verify(const unsigned int id, > const char *sig, int siglen, > const char *digest, int digestlen) -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 8c8e8a4..5f6fdb7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,9 @@ "ref\020180316203837.10174-1-bauerman@linux.vnet.ibm.com\0" "ref\020180316203837.10174-6-bauerman@linux.vnet.ibm.com\0" - "From\0Mimi Zohar <zohar@linux.vnet.ibm.com>\0" - "Subject\0Re: [PATCH v6 05/12] integrity: Introduce integrity_keyring_from_id()\0" - "Date\0Wed, 21 Mar 2018 22:46:51 +0000\0" - "To\0Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>" - " linux-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 - linux-kernel@vger.kernel.org - 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> - AKASHI - " Takahiro <takahiro.akashi@linaro.org>\0" + "From\0zohar@linux.vnet.ibm.com (Mimi Zohar)\0" + "Subject\0[PATCH v6 05/12] integrity: Introduce integrity_keyring_from_id()\0" + "Date\0Wed, 21 Mar 2018 18:46:51 -0400\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "On Fri, 2018-03-16 at 17:38 -0300, Thiago Jung Bauermann wrote:\n" @@ -53,7 +37,8 @@ "> +\t\treturn ERR_PTR(-EINVAL);\n" "> \n" "> \tif (!keyring[id]) {\n" - "> \t\tkeyring[id] > @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" + "> \t\tkeyring[id] =\n" + "> @@ -61,17 +60,32 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,\n" "> \t\t\tint err = PTR_ERR(keyring[id]);\n" "> \t\t\tpr_err(\"no %s keyring: %d\\n\", keyring_name[id], err);\n" "> \t\t\tkeyring[id] = NULL;\n" @@ -113,6 +98,11 @@ "> static inline int integrity_digsig_verify(const unsigned int id,\n" "> \t\t\t\t\t const char *sig, int siglen,\n" "> \t\t\t\t\t const char *digest, int digestlen)\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -4ba29683f38c823a91609b64bb62d3d38e02d98276813f75822e1e213c9c52cb +809a95963e62f2cbd08570b3ed7b27e616a0f9a11d8185e9d1ff429ee3dcf323
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.