diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-01 15:32:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-01 15:32:18 -0700 |
| commit | e6f0bf09f0669b3c2cd77fa906830123279a0a21 (patch) | |
| tree | 57aed6ff25d40e31f129b934403c7fac7a8cc8c8 /certs/Makefile | |
| parent | Merge tag 'perf-tools-for-v5.13-2021-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux (diff) | |
| parent | ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies (diff) | |
| download | linux-dev-e6f0bf09f0669b3c2cd77fa906830123279a0a21.tar.xz linux-dev-e6f0bf09f0669b3c2cd77fa906830123279a0a21.zip | |
Merge tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull IMA updates from Mimi Zohar:
"In addition to loading the kernel module signing key onto the builtin
keyring, load it onto the IMA keyring as well.
Also six trivial changes and bug fixes"
* tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
ima: ensure IMA_APPRAISE_MODSIG has necessary dependencies
ima: Fix fall-through warnings for Clang
integrity: Add declarations to init_once void arguments.
ima: Fix function name error in comment.
ima: enable loading of build time generated key on .ima keyring
ima: enable signing of modules with build time generated key
keys: cleanup build time module signing keys
ima: Fix the error code for restoring the PCR value
ima: without an IMA policy loaded, return quickly
Diffstat (limited to 'certs/Makefile')
| -rw-r--r-- | certs/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/certs/Makefile b/certs/Makefile index b6db52ebf0be..359239a0ee9e 100644 --- a/certs/Makefile +++ b/certs/Makefile @@ -33,6 +33,16 @@ endif # CONFIG_SYSTEM_TRUSTED_KEYRING clean-files := x509_certificate_list .x509.list x509_revocation_list ifeq ($(CONFIG_MODULE_SIG),y) + SIGN_KEY = y +endif + +ifeq ($(CONFIG_IMA_APPRAISE_MODSIG),y) +ifeq ($(CONFIG_MODULES),y) + SIGN_KEY = y +endif +endif + +ifdef SIGN_KEY ############################################################################### # # If module signing is requested, say by allyesconfig, but a key has not been |