IMA: add IMA_KEXEC option, align ppc config to all other arches

This commit is contained in:
Peter Robinson 2019-07-25 12:40:22 +01:00
parent 463b32d557
commit 22baa65bfd
16 changed files with 18 additions and 6 deletions

View File

@ -1 +0,0 @@
# CONFIG_IMA is not set

View File

@ -1 +0,0 @@
# CONFIG_TCG_TPM is not set

View File

@ -2415,6 +2415,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2399,6 +2399,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2445,6 +2445,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2362,6 +2362,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2347,6 +2347,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2430,6 +2430,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2162,6 +2162,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2145,6 +2145,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -1968,7 +1968,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA is not set CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -1977,6 +1977,7 @@ CONFIG_IMA_READ_POLICY=y
# CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_SIG_TEMPLATE is not set
# CONFIG_IMA_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMG_ASCII_LCD is not set
# CONFIG_INA2XX_ADC is not set # CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
@ -5274,7 +5275,7 @@ CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
# CONFIG_TCG_TPM is not set CONFIG_TCG_TPM=y
CONFIG_TCG_VTPM_PROXY=m CONFIG_TCG_VTPM_PROXY=m
# CONFIG_TCG_XEN is not set # CONFIG_TCG_XEN is not set
CONFIG_TCM_FC=m CONFIG_TCM_FC=m

View File

@ -1951,7 +1951,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
# CONFIG_IMA is not set CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10
@ -1960,6 +1960,7 @@ CONFIG_IMA_READ_POLICY=y
# CONFIG_IMA_SIG_TEMPLATE is not set # CONFIG_IMA_SIG_TEMPLATE is not set
# CONFIG_IMA_TEMPLATE is not set # CONFIG_IMA_TEMPLATE is not set
CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMG_ASCII_LCD is not set
# CONFIG_INA2XX_ADC is not set # CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m CONFIG_INET6_AH=m
@ -5251,7 +5252,7 @@ CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
# CONFIG_TCG_TPM is not set CONFIG_TCG_TPM=y
CONFIG_TCG_VTPM_PROXY=m CONFIG_TCG_VTPM_PROXY=m
# CONFIG_TCG_XEN is not set # CONFIG_TCG_XEN is not set
CONFIG_TCM_FC=m CONFIG_TCM_FC=m

View File

@ -1946,6 +1946,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -1929,6 +1929,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_APPRAISE is not set # CONFIG_IMA_APPRAISE is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2205,6 +2205,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10

View File

@ -2188,6 +2188,7 @@ CONFIG_IKHEADERS=m
# CONFIG_IMA_ARCH_POLICY is not set # CONFIG_IMA_ARCH_POLICY is not set
# CONFIG_IMA_DEFAULT_HASH_SHA1 is not set # CONFIG_IMA_DEFAULT_HASH_SHA1 is not set
CONFIG_IMA_DEFAULT_HASH_SHA256=y CONFIG_IMA_DEFAULT_HASH_SHA256=y
CONFIG_IMA_KEXEC=y
CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
CONFIG_IMA_LSM_RULES=y CONFIG_IMA_LSM_RULES=y
CONFIG_IMA_MEASURE_PCR_IDX=10 CONFIG_IMA_MEASURE_PCR_IDX=10