From: "Enrico Weigelt, metux IT consult" <info@metux.net>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 031/114] secuirty: integrity: ima: pedantic formatting
Date: Mon, 11 Mar 2019 14:17:43 +0100 [thread overview]
Message-ID: <1552310346-7629-32-git-send-email-info@metux.net> (raw)
In-Reply-To: <1552310346-7629-1-git-send-email-info@metux.net>
Formatting of Kconfig files doesn't look so pretty, so let the
Great White Handkerchief come around and clean it up.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
security/integrity/ima/Kconfig | 64 +++++++++++++++++++++---------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index a18f8c6..416b724 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -34,12 +34,12 @@ config IMA_KEXEC
depends on IMA && TCG_TPM && HAVE_IMA_KEXEC
default n
help
- TPM PCRs are only reset on a hard reboot. In order to validate
- a TPM's quote after a soft boot, the IMA measurement list of the
- running kernel must be saved and restored on boot.
+ TPM PCRs are only reset on a hard reboot. In order to validate
+ a TPM's quote after a soft boot, the IMA measurement list of the
+ running kernel must be saved and restored on boot.
- Depending on the IMA policy, the measurement list can grow to
- be very large.
+ Depending on the IMA policy, the measurement list can grow to
+ be very large.
config IMA_MEASURE_PCR_IDX
int
@@ -91,10 +91,10 @@ choice
default IMA_DEFAULT_HASH_SHA1
depends on IMA
help
- Select the default hash algorithm used for the measurement
- list, integrity appraisal and audit log. The compiled default
- hash algorithm can be overwritten using the kernel command
- line 'ima_hash=' option.
+ Select the default hash algorithm used for the measurement
+ list, integrity appraisal and audit log. The compiled default
+ hash algorithm can be overwritten using the kernel command
+ line 'ima_hash=' option.
config IMA_DEFAULT_HASH_SHA1
bool "SHA1 (default)"
@@ -138,9 +138,9 @@ config IMA_READ_POLICY
default y if IMA_WRITE_POLICY
default n if !IMA_WRITE_POLICY
help
- It is often useful to be able to read back the IMA policy. It is
- even more important after introducing CONFIG_IMA_WRITE_POLICY.
- This option allows the root user to see the current policy rules.
+ It is often useful to be able to read back the IMA policy. It is
+ even more important after introducing CONFIG_IMA_WRITE_POLICY.
+ This option allows the root user to see the current policy rules.
config IMA_APPRAISE
bool "Appraise integrity measurements"
@@ -158,12 +158,12 @@ config IMA_APPRAISE
If unsure, say N.
config IMA_ARCH_POLICY
- bool "Enable loading an IMA architecture specific policy"
- depends on KEXEC_VERIFY_SIG || IMA_APPRAISE && INTEGRITY_ASYMMETRIC_KEYS
- default n
- help
- This option enables loading an IMA architecture specific policy
- based on run time secure boot flags.
+ bool "Enable loading an IMA architecture specific policy"
+ depends on KEXEC_VERIFY_SIG || IMA_APPRAISE && INTEGRITY_ASYMMETRIC_KEYS
+ default n
+ help
+ This option enables loading an IMA architecture specific policy
+ based on run time secure boot flags.
config IMA_APPRAISE_BUILD_POLICY
bool "IMA build time configured policy rules"
@@ -238,10 +238,10 @@ config IMA_TRUSTED_KEYRING
select INTEGRITY_TRUSTED_KEYRING
default y
help
- This option requires that all keys added to the .ima
- keyring be signed by a key on the system trusted keyring.
+ This option requires that all keys added to the .ima
+ keyring be signed by a key on the system trusted keyring.
- This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING
+ This option is deprecated in favor of INTEGRITY_TRUSTED_KEYRING
config IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY
bool "Permit keys validly signed by a built-in or secondary CA cert (EXPERIMENTAL)"
@@ -266,32 +266,32 @@ config IMA_BLACKLIST_KEYRING
depends on IMA_TRUSTED_KEYRING
default n
help
- This option creates an IMA blacklist keyring, which contains all
- revoked IMA keys. It is consulted before any other keyring. If
- the search is successful the requested operation is rejected and
- an error is returned to the caller.
+ This option creates an IMA blacklist keyring, which contains all
+ revoked IMA keys. It is consulted before any other keyring. If
+ the search is successful the requested operation is rejected and
+ an error is returned to the caller.
config IMA_LOAD_X509
bool "Load X509 certificate onto the '.ima' trusted keyring"
depends on IMA_TRUSTED_KEYRING
default n
help
- File signature verification is based on the public keys
- loaded on the .ima trusted keyring. These public keys are
- X509 certificates signed by a trusted key on the
- .system keyring. This option enables X509 certificate
- loading from the kernel onto the '.ima' trusted keyring.
+ File signature verification is based on the public keys
+ loaded on the .ima trusted keyring. These public keys are
+ X509 certificates signed by a trusted key on the
+ .system keyring. This option enables X509 certificate
+ loading from the kernel onto the '.ima' trusted keyring.
config IMA_X509_PATH
string "IMA X509 certificate path"
depends on IMA_LOAD_X509
default "/etc/keys/x509_ima.der"
help
- This option defines IMA X509 certificate path.
+ This option defines IMA X509 certificate path.
config IMA_APPRAISE_SIGNED_INIT
bool "Require signed user-space initialization"
depends on IMA_LOAD_X509
default n
help
- This option requires user-space init to be signed.
+ This option requires user-space init to be signed.
--
1.9.1
next prev parent reply other threads:[~2019-03-11 13:28 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 13:17 Kconfig: Great White Handkerchief going round Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 001/114] drivers: gpio: Kconfig: pedantic formatting Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 002/114] drivers: iio: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 003/114] drivers: input: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 004/114] drivers: watchdog: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 005/114] fs: 9p: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 006/114] drivers: uio: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 007/114] drivers: leds: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 008/114] drivers: ata: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 009/114] drivers: ide: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 010/114] sound: soc: qcom: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 011/114] drivers: mmc: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 012/114] arch: um: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 013/114] arch: um: drivers: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 014/114] drivers: fpga: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 015/114] drivers: nvme: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 016/114] drivers: pcmcia: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 017/114] drivers: infiniband: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 018/114] drivers: ntb: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 019/114] drivers: uwb: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 020/114] drivers: thermal: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 021/114] drivers: scsi: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 022/114] security: keys: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 023/114] drivers: video: fbdev: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 024/114] s390: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 025/114] arch: sh: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 026/114] arch: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 027/114] virt: kvm: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 028/114] arch: alpha: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 029/114] sound: drivers: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 030/114] sound: oao: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` Enrico Weigelt, metux IT consult [this message]
2019-03-11 13:17 ` [PATCH 032/114] sound: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 033/114] mm: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 034/114] arch: arm: " Enrico Weigelt, metux IT consult
2019-03-21 1:55 ` Masahiro Yamada
2019-03-22 16:01 ` Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 035/114] arch: arc: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 036/114] arch: amd64: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 037/114] arch: powerpc: " Enrico Weigelt, metux IT consult
2019-04-29 3:45 ` Michael Ellerman
2019-03-11 13:17 ` [PATCH 038/114] arch: mips: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 039/114] drivers: video: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 040/114] drivers: usb: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 041/114] drivers: w1: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 042/114] drivers: tty: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 043/114] drivers: staging: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 044/114] kernel: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 045/114] drivers: char: tpm: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 046/114] lib: " Enrico Weigelt, metux IT consult
2019-03-11 13:17 ` [PATCH 047/114] net: caif: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 048/114] samples: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 049/114] security: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 050/114] net: " Enrico Weigelt, metux IT consult
2019-03-21 2:10 ` Masahiro Yamada
2019-03-11 13:18 ` [PATCH 051/114] fs: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 052/114] arch: x86: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 053/114] drivers: pinctrl: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 054/114] drivers: platform: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 055/114] drivers: crypto: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 056/114] drivers: spi: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 057/114] drivers: power: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 058/114] drivers: net: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 059/114] drivers: phy: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 060/114] drivers: pci: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 061/114] drivers: sbus: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 062/114] init: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 063/114] drivers: media: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 064/114] drivers: parisc: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 065/114] drivers: regulator: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 066/114] drivers: mtd: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 067/114] drivers: i2c: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 068/114] drivers: mfd: " Enrico Weigelt, metux IT consult
2019-04-02 4:10 ` Lee Jones
2019-03-11 13:18 ` [PATCH 069/114] drivers: perf: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 070/114] drivers: hwtracing: coresight: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 071/114] drivers: isdn: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 072/114] drivers: macintosh: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 073/114] drivers: gpu: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 074/114] drivers: md: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 075/114] drivers: soc: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 076/114] drivers: virt: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 077/114] drivers: clk: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 078/114] drivers: firmware: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 079/114] drivers: char: " Enrico Weigelt, metux IT consult
2019-03-11 14:08 ` Corey Minyard
2019-03-21 1:58 ` Masahiro Yamada
2019-03-11 13:18 ` [PATCH 080/114] drivers: devfreq: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 081/114] drivers: memstick: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 082/114] drivers: pwm: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 083/114] drivers: vme: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 084/114] drivers: acpi: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 085/114] drivers: auxdisplay: " Enrico Weigelt, metux IT consult
2019-03-12 15:24 ` Miguel Ojeda
2019-03-11 13:18 ` [PATCH 086/114] drivers: cpufreq: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 087/114] drivers: hwmon: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 088/114] drivers: irqchip: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 089/114] drivers: virtio: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 090/114] certs: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 091/114] block: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 092/114] drivers: dma: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 093/114] arch: h8300: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 094/114] arch: nds32: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 095/114] arch: ia64: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 096/114] arch: openrisc: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 097/114] arch: riscv: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 098/114] crypto: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 099/114] drivers: block: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 100/114] arch: sparc: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 101/114] drivers: atm: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 102/114] drivers: cpuidle: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 103/114] drivers: iommu: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 104/114] drivers: edac: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 105/114] drivers: hid: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 106/114] drivers: rtc: " Enrico Weigelt, metux IT consult
2019-03-11 13:18 ` [PATCH 107/114] drivers: xen: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 108/114] drivers: firmware_loader: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 109/114] drivers: clocksource: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 110/114] drivers: hv: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 111/114] drivers: mcb: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 112/114] drivers: misc: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 113/114] drivers: rpmsg: " Enrico Weigelt, metux IT consult
2019-03-11 13:19 ` [PATCH 114/114] arch: arm: boot: dts: " Enrico Weigelt, metux IT consult
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=1552310346-7629-32-git-send-email-info@metux.net \
--to=info@metux.net \
--cc=linux-kernel@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®