diff for duplicates of <20181116200712.14154-11-bauerman@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 36fdd14..8a13f06 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -139,10 +139,10 @@ index fd31e42c2bad..3e5a64053aa8 100644 +++ b/security/integrity/ima/ima_policy.c @@ -1034,6 +1034,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) ima_log_string(ab, "appraise_type", args[0].from); - if ((strcmp(args[0].from, "imasig")) = 0) + if ((strcmp(args[0].from, "imasig")) == 0) entry->flags |= IMA_DIGSIG_REQUIRED; + else if (ima_hook_supports_modsig(entry->func) && -+ strcmp(args[0].from, "imasig|modsig") = 0) ++ strcmp(args[0].from, "imasig|modsig") == 0) + entry->flags |= IMA_DIGSIG_REQUIRED + | IMA_MODSIG_ALLOWED; else diff --git a/a/content_digest b/N1/content_digest index 5e97570..a2011f2 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 10/14] ima: Add modsig appraise_type option for module-style appended signatures\0" - "Date\0Fri, 16 Nov 2018 20:07:08 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:08 -0200\0" "To\0linux-integrity@vger.kernel.org\0" "Cc\0linux-security-module@vger.kernel.org" keyrings@vger.kernel.org @@ -165,10 +165,10 @@ "+++ b/security/integrity/ima/ima_policy.c\n" "@@ -1034,6 +1034,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" " \t\t\tima_log_string(ab, \"appraise_type\", args[0].from);\n" - " \t\t\tif ((strcmp(args[0].from, \"imasig\")) = 0)\n" + " \t\t\tif ((strcmp(args[0].from, \"imasig\")) == 0)\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED;\n" "+\t\t\telse if (ima_hook_supports_modsig(entry->func) &&\n" - "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0)\n" + "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0)\n" "+\t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED\n" "+\t\t\t\t\t\t| IMA_MODSIG_ALLOWED;\n" " \t\t\telse\n" @@ -202,4 +202,4 @@ " #define IMA_DO_MASK\t\t(IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT | \\\n" " \t\t\t\t IMA_HASH | IMA_APPRAISE_SUBMASK)" -5e00f6393991592fab5b557bf33b6cd34670e637d67fd2576421e9a78a59c9a7 +755e393f6baa8d24d1b182e8ca5f5054e7e821b3e009e1cad18d121867f555cb
diff --git a/a/1.txt b/N2/1.txt index 36fdd14..8a13f06 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -139,10 +139,10 @@ index fd31e42c2bad..3e5a64053aa8 100644 +++ b/security/integrity/ima/ima_policy.c @@ -1034,6 +1034,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) ima_log_string(ab, "appraise_type", args[0].from); - if ((strcmp(args[0].from, "imasig")) = 0) + if ((strcmp(args[0].from, "imasig")) == 0) entry->flags |= IMA_DIGSIG_REQUIRED; + else if (ima_hook_supports_modsig(entry->func) && -+ strcmp(args[0].from, "imasig|modsig") = 0) ++ strcmp(args[0].from, "imasig|modsig") == 0) + entry->flags |= IMA_DIGSIG_REQUIRED + | IMA_MODSIG_ALLOWED; else diff --git a/a/content_digest b/N2/content_digest index 5e97570..04b0ac2 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 10/14] ima: Add modsig appraise_type option for module-style appended signatures\0" - "Date\0Fri, 16 Nov 2018 20:07:08 +0000\0" + "Date\0Fri, 16 Nov 2018 18:07:08 -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" "Introduce the modsig keyword to the IMA policy syntax to specify that\n" @@ -165,10 +165,10 @@ "+++ b/security/integrity/ima/ima_policy.c\n" "@@ -1034,6 +1034,10 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)\n" " \t\t\tima_log_string(ab, \"appraise_type\", args[0].from);\n" - " \t\t\tif ((strcmp(args[0].from, \"imasig\")) = 0)\n" + " \t\t\tif ((strcmp(args[0].from, \"imasig\")) == 0)\n" " \t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED;\n" "+\t\t\telse if (ima_hook_supports_modsig(entry->func) &&\n" - "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") = 0)\n" + "+\t\t\t\t strcmp(args[0].from, \"imasig|modsig\") == 0)\n" "+\t\t\t\tentry->flags |= IMA_DIGSIG_REQUIRED\n" "+\t\t\t\t\t\t| IMA_MODSIG_ALLOWED;\n" " \t\t\telse\n" @@ -202,4 +202,4 @@ " #define IMA_DO_MASK\t\t(IMA_MEASURE | IMA_APPRAISE | IMA_AUDIT | \\\n" " \t\t\t\t IMA_HASH | IMA_APPRAISE_SUBMASK)" -5e00f6393991592fab5b557bf33b6cd34670e637d67fd2576421e9a78a59c9a7 +d546a5c59dcd79626898ca9946c21f8d032936791d764a88bbb37bb194dfba38
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.