From: Lachlan Sneff <t-josne@linux.microsoft.com> To: pvorel@suse.cz, zohar@linux.ibm.com, ltp@lists.linux.it Cc: nramas@linux.microsoft.com, balajib@linux.microsoft.com, linux-integrity@vger.kernel.org, tyhicks@linux.microsoft.com, yaneurabeya@gmail.com, zhang.jia@linux.alibaba.com Subject: [PATCH 2/3] IMA: Refactor datafiles directory Date: Mon, 3 Aug 2020 14:47:25 -0400 [thread overview] Message-ID: <20200803184726.2416-3-t-josne@linux.microsoft.com> (raw) In-Reply-To: <20200803184726.2416-1-t-josne@linux.microsoft.com> The IMA datafiles directory is structured so that it cannot be directly expanded to include datafiles for tests other than `ima_policy.sh`. Move the contents of the IMA datafiles directory into an IMA datafiles/policy directory. Signed-off-by: Lachlan Sneff <t-josne@linux.microsoft.com> --- .../security/integrity/ima/datafiles/Makefile | 6 ++---- .../integrity/ima/datafiles/policy/Makefile | 15 +++++++++++++++ .../ima/datafiles/{ => policy}/kexec.policy | 0 .../ima/datafiles/{ => policy}/keycheck.policy | 0 .../ima/datafiles/{ => policy}/measure.policy | 0 .../datafiles/{ => policy}/measure.policy-invalid | 0 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/policy/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/kexec.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/keycheck.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/measure.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/measure.policy-invalid (100%) diff --git a/testcases/kernel/security/integrity/ima/datafiles/Makefile b/testcases/kernel/security/integrity/ima/datafiles/Makefile index 369407112..3772e9a03 100644 --- a/testcases/kernel/security/integrity/ima/datafiles/Makefile +++ b/testcases/kernel/security/integrity/ima/datafiles/Makefile @@ -24,8 +24,6 @@ top_srcdir ?= ../../../../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_DIR := testcases/data/ima_policy +SUBDIRS := policy -INSTALL_TARGETS := measure.policy-invalid *.policy - -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile b/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile new file mode 100644 index 000000000..84d1424c6 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2020 Microsoft Corporation +# Author: Lachlan Sneff <t-josne@linux.microsoft.com> +# +# IMA datafiles/policy Makefile + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_policy + +INSTALL_TARGETS := measure.policy-invalid *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk \ No newline at end of file diff --git a/testcases/kernel/security/integrity/ima/datafiles/kexec.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/kexec.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/kexec.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/kexec.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/keycheck.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/keycheck.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/keycheck.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/keycheck.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid b/testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy-invalid similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid rename to testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy-invalid -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Lachlan Sneff <t-josne@linux.microsoft.com> To: ltp@lists.linux.it Subject: [LTP] [PATCH 2/3] IMA: Refactor datafiles directory Date: Mon, 3 Aug 2020 14:47:25 -0400 [thread overview] Message-ID: <20200803184726.2416-3-t-josne@linux.microsoft.com> (raw) In-Reply-To: <20200803184726.2416-1-t-josne@linux.microsoft.com> The IMA datafiles directory is structured so that it cannot be directly expanded to include datafiles for tests other than `ima_policy.sh`. Move the contents of the IMA datafiles directory into an IMA datafiles/policy directory. Signed-off-by: Lachlan Sneff <t-josne@linux.microsoft.com> --- .../security/integrity/ima/datafiles/Makefile | 6 ++---- .../integrity/ima/datafiles/policy/Makefile | 15 +++++++++++++++ .../ima/datafiles/{ => policy}/kexec.policy | 0 .../ima/datafiles/{ => policy}/keycheck.policy | 0 .../ima/datafiles/{ => policy}/measure.policy | 0 .../datafiles/{ => policy}/measure.policy-invalid | 0 6 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 testcases/kernel/security/integrity/ima/datafiles/policy/Makefile rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/kexec.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/keycheck.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/measure.policy (100%) rename testcases/kernel/security/integrity/ima/datafiles/{ => policy}/measure.policy-invalid (100%) diff --git a/testcases/kernel/security/integrity/ima/datafiles/Makefile b/testcases/kernel/security/integrity/ima/datafiles/Makefile index 369407112..3772e9a03 100644 --- a/testcases/kernel/security/integrity/ima/datafiles/Makefile +++ b/testcases/kernel/security/integrity/ima/datafiles/Makefile @@ -24,8 +24,6 @@ top_srcdir ?= ../../../../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_DIR := testcases/data/ima_policy +SUBDIRS := policy -INSTALL_TARGETS := measure.policy-invalid *.policy - -include $(top_srcdir)/include/mk/generic_leaf_target.mk +include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile b/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile new file mode 100644 index 000000000..84d1424c6 --- /dev/null +++ b/testcases/kernel/security/integrity/ima/datafiles/policy/Makefile @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2020 Microsoft Corporation +# Author: Lachlan Sneff <t-josne@linux.microsoft.com> +# +# IMA datafiles/policy Makefile + +top_srcdir ?= ../../../../../../.. + +include $(top_srcdir)/include/mk/env_pre.mk + +INSTALL_DIR := testcases/data/ima_policy + +INSTALL_TARGETS := measure.policy-invalid *.policy + +include $(top_srcdir)/include/mk/generic_leaf_target.mk \ No newline at end of file diff --git a/testcases/kernel/security/integrity/ima/datafiles/kexec.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/kexec.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/kexec.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/kexec.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/keycheck.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/keycheck.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/keycheck.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/keycheck.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy b/testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy rename to testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy diff --git a/testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid b/testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy-invalid similarity index 100% rename from testcases/kernel/security/integrity/ima/datafiles/measure.policy-invalid rename to testcases/kernel/security/integrity/ima/datafiles/policy/measure.policy-invalid -- 2.25.1
next prev parent reply other threads:[~2020-08-03 18:47 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-03 18:47 [PATCH v1 0/3] Verify measurement of certificate imported into a keyring Lachlan Sneff 2020-08-03 18:47 ` [LTP] " Lachlan Sneff 2020-08-03 18:47 ` [PATCH 1/3] IMA: Update key test documentation Lachlan Sneff 2020-08-03 18:47 ` [LTP] " Lachlan Sneff 2020-08-04 4:35 ` Petr Vorel 2020-08-04 4:35 ` [LTP] " Petr Vorel 2020-08-04 16:42 ` Lachlan Sneff 2020-08-04 16:42 ` [LTP] " Lachlan Sneff 2020-08-05 8:36 ` Petr Vorel 2020-08-05 8:36 ` [LTP] " Petr Vorel 2020-08-05 8:44 ` Petr Vorel 2020-08-05 8:44 ` [LTP] " Petr Vorel 2020-08-03 18:47 ` Lachlan Sneff [this message] 2020-08-03 18:47 ` [LTP] [PATCH 2/3] IMA: Refactor datafiles directory Lachlan Sneff 2020-08-07 7:17 ` Petr Vorel 2020-08-07 7:17 ` [LTP] " Petr Vorel 2020-08-07 9:01 ` Petr Vorel 2020-08-07 9:01 ` [LTP] " Petr Vorel 2020-08-07 12:27 ` Petr Vorel 2020-08-07 12:27 ` [LTP] " Petr Vorel 2020-08-03 18:47 ` [PATCH 3/3] IMA: Add a test to verify measurement of certificate imported into a keyring Lachlan Sneff 2020-08-03 18:47 ` [LTP] " Lachlan Sneff -- strict thread matches above, loose matches on Subject: below -- 2020-08-03 17:59 [PATCH v1 0/3] Verify " Lachlan Sneff 2020-08-03 17:59 ` [PATCH 2/3] IMA: Refactor datafiles directory Lachlan Sneff
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200803184726.2416-3-t-josne@linux.microsoft.com \ --to=t-josne@linux.microsoft.com \ --cc=balajib@linux.microsoft.com \ --cc=linux-integrity@vger.kernel.org \ --cc=ltp@lists.linux.it \ --cc=nramas@linux.microsoft.com \ --cc=pvorel@suse.cz \ --cc=tyhicks@linux.microsoft.com \ --cc=yaneurabeya@gmail.com \ --cc=zhang.jia@linux.alibaba.com \ --cc=zohar@linux.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.