Merge tag 'tty-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[cascardo/linux.git] / certs / Kconfig

diff --git a/certs/Kconfig b/certs/Kconfig
index b030b9c..f0f8a44 100644 (file)
--- a/certs/Kconfig
+++ b/certs/Kconfig
@@ -39,4 +39,20 @@ config SYSTEM_TRUSTED_KEYS
          form of DER-encoded *.x509 files in the top-level build directory,
          those are no longer used. You will need to set this option instead.
 
+config SYSTEM_EXTRA_CERTIFICATE
+       bool "Reserve area for inserting a certificate without recompiling"
+       depends on SYSTEM_TRUSTED_KEYRING
+       help
+         If set, space for an extra certificate will be reserved in the kernel
+         image. This allows introducing a trusted certificate to the default
+         system keyring without recompiling the kernel.
+
+config SYSTEM_EXTRA_CERTIFICATE_SIZE
+       int "Number of bytes to reserve for the extra certificate"
+       depends on SYSTEM_EXTRA_CERTIFICATE
+       default 4096
+       help
+         This is the number of bytes reserved in the kernel image for a
+         certificate to be inserted.
+
 endmenu