summaryrefslogtreecommitdiffstats
path: root/kernel/modsign_certificate.S
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2013-08-30 17:07:13 +0200
committerDavid Howells <dhowells@redhat.com>2013-09-25 18:17:01 +0200
commitf0e6d220a7cd93afa0260ac5e7849f00b05e035a (patch)
treedd9331cf8606bf6068261e1f02d67a26d1ba76f9 /kernel/modsign_certificate.S
parentX.509: Remove certificate date checks (diff)
downloadlinux-f0e6d220a7cd93afa0260ac5e7849f00b05e035a.tar.xz
linux-f0e6d220a7cd93afa0260ac5e7849f00b05e035a.zip
KEYS: Load *.x509 files into kernel keyring
Load all the files matching the pattern "*.x509" that are to be found in kernel base source dir and base build dir into the module signing keyring. The "extra_certificates" file is then redundant. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'kernel/modsign_certificate.S')
-rw-r--r--kernel/modsign_certificate.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/modsign_certificate.S b/kernel/modsign_certificate.S
index 4a9a86d12c8b..6fe03c7ffe72 100644
--- a/kernel/modsign_certificate.S
+++ b/kernel/modsign_certificate.S
@@ -7,6 +7,5 @@
.section ".init.data","aw"
GLOBAL(modsign_certificate_list)
- .incbin "signing_key.x509"
- .incbin "extra_certificates"
+ .incbin "kernel/x509_certificate_list"
GLOBAL(modsign_certificate_list_end)