]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
integrity: move asymmetric keys config option
authorDmitry Kasatkin <d.kasatkin@samsung.com>
Thu, 17 Apr 2014 11:41:06 +0000 (14:41 +0300)
committerMimi Zohar <zohar@linux.vnet.ibm.com>
Tue, 9 Sep 2014 14:28:55 +0000 (10:28 -0400)
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>
security/integrity/Kconfig

index 245c6d92065b36ae748c6936d696d4a2222d9b9d..f79d8537bddab33bbaff22d2196fa55a67e65b3e 100644 (file)
@@ -17,6 +17,18 @@ config INTEGRITY_SIGNATURE
          This is useful for evm and module keyrings, when keys are
          usually only added from initramfs.
 
+config INTEGRITY_ASYMMETRIC_KEYS
+       boolean "Enable asymmetric keys support"
+       depends on INTEGRITY_SIGNATURE
+       default n
+        select ASYMMETRIC_KEY_TYPE
+        select ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+        select PUBLIC_KEY_ALGO_RSA
+        select X509_CERTIFICATE_PARSER
+       help
+         This option enables digital signature verification using
+         asymmetric keys.
+
 config INTEGRITY_AUDIT
        bool "Enables integrity auditing support "
        depends on INTEGRITY && AUDIT
@@ -32,17 +44,5 @@ config INTEGRITY_AUDIT
          be enabled by specifying 'integrity_audit=1' on the kernel
          command line.
 
-config INTEGRITY_ASYMMETRIC_KEYS
-       boolean "Enable asymmetric keys support"
-       depends on INTEGRITY_SIGNATURE
-       default n
-        select ASYMMETRIC_KEY_TYPE
-        select ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-        select PUBLIC_KEY_ALGO_RSA
-        select X509_CERTIFICATE_PARSER
-       help
-         This option enables digital signature verification using
-         asymmetric keys.
-
 source security/integrity/ima/Kconfig
 source security/integrity/evm/Kconfig