diff options
author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-04-17 07:41:06 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-09-09 10:28:55 -0400 |
commit | 1ae8f41c23ff6a75c1432faed7281aea5ce7c236 (patch) | |
tree | b7b4316c2a7e333fd702f89d4b5b8c561677a63b /security | |
parent | b4148db51720a6b25a981ea72185312d4b6634fe (diff) |
integrity: move asymmetric keys config option
For better visual appearance it is better to co-locate
asymmetric key options together with signature support.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r-- | security/integrity/Kconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index 245c6d92065b..f79d8537bdda 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig | |||
@@ -17,6 +17,18 @@ config INTEGRITY_SIGNATURE | |||
17 | This is useful for evm and module keyrings, when keys are | 17 | This is useful for evm and module keyrings, when keys are |
18 | usually only added from initramfs. | 18 | usually only added from initramfs. |
19 | 19 | ||
20 | config INTEGRITY_ASYMMETRIC_KEYS | ||
21 | boolean "Enable asymmetric keys support" | ||
22 | depends on INTEGRITY_SIGNATURE | ||
23 | default n | ||
24 | select ASYMMETRIC_KEY_TYPE | ||
25 | select ASYMMETRIC_PUBLIC_KEY_SUBTYPE | ||
26 | select PUBLIC_KEY_ALGO_RSA | ||
27 | select X509_CERTIFICATE_PARSER | ||
28 | help | ||
29 | This option enables digital signature verification using | ||
30 | asymmetric keys. | ||
31 | |||
20 | config INTEGRITY_AUDIT | 32 | config INTEGRITY_AUDIT |
21 | bool "Enables integrity auditing support " | 33 | bool "Enables integrity auditing support " |
22 | depends on INTEGRITY && AUDIT | 34 | depends on INTEGRITY && AUDIT |
@@ -32,17 +44,5 @@ config INTEGRITY_AUDIT | |||
32 | be enabled by specifying 'integrity_audit=1' on the kernel | 44 | be enabled by specifying 'integrity_audit=1' on the kernel |
33 | command line. | 45 | command line. |
34 | 46 | ||
35 | config INTEGRITY_ASYMMETRIC_KEYS | ||
36 | boolean "Enable asymmetric keys support" | ||
37 | depends on INTEGRITY_SIGNATURE | ||
38 | default n | ||
39 | select ASYMMETRIC_KEY_TYPE | ||
40 | select ASYMMETRIC_PUBLIC_KEY_SUBTYPE | ||
41 | select PUBLIC_KEY_ALGO_RSA | ||
42 | select X509_CERTIFICATE_PARSER | ||
43 | help | ||
44 | This option enables digital signature verification using | ||
45 | asymmetric keys. | ||
46 | |||
47 | source security/integrity/ima/Kconfig | 47 | source security/integrity/ima/Kconfig |
48 | source security/integrity/evm/Kconfig | 48 | source security/integrity/evm/Kconfig |