diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 13:33:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-20 13:33:39 +1100 |
| commit | 50ce2b9aea4b198be410824322e5209bd95ae061 (patch) | |
| tree | 4b483b09d9b37133525aba15d2bac162f3df681d /init | |
| parent | 6aa33f088061b897332ee527ffef66cdc57a47d5 (diff) | |
| parent | d9d8d7ed498ec65bea72dd24be7b9cd35af0c200 (diff) | |
Merge remote-tracking branch 'modules/modules-next'
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index cab5a6c0506d..59eec5ff6946 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1680,6 +1680,17 @@ config MODULE_SIG_FORCE Reject unsigned modules or signed modules for which we don't have a key. Without this, such modules will simply taint the kernel. +config MODULE_SIG_ALL + bool "Automatically sign all modules" + default y + depends on MODULE_SIG + help + Sign all modules during make modules_install. Without this option, + modules must be signed manually, using the scripts/sign-file tool. + +comment "Do not forget to sign required modules with scripts/sign-file" + depends on MODULE_SIG_FORCE && !MODULE_SIG_ALL + choice prompt "Which hash algorithm should modules be signed with?" depends on MODULE_SIG @@ -1712,6 +1723,15 @@ config MODULE_SIG_SHA512 endchoice +config MODULE_SIG_HASH + string + depends on MODULE_SIG + default "sha1" if MODULE_SIG_SHA1 + default "sha224" if MODULE_SIG_SHA224 + default "sha256" if MODULE_SIG_SHA256 + default "sha384" if MODULE_SIG_SHA384 + default "sha512" if MODULE_SIG_SHA512 + endif # MODULES config INIT_ALL_POSSIBLE |