projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'x86_urgent_for_v5.13_rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
certs
/
system_certificates.S
diff --git
a/certs/system_certificates.S
b/certs/system_certificates.S
index
8f29058
..
e1645e6
100644
(file)
--- a/
certs/system_certificates.S
+++ b/
certs/system_certificates.S
@@
-8,9
+8,12
@@
.globl system_certificate_list
system_certificate_list:
__cert_list_start:
.globl system_certificate_list
system_certificate_list:
__cert_list_start:
-#ifdef CONFIG_MODULE_SIG
+__module_cert_start:
+#if defined(CONFIG_MODULE_SIG) || (defined(CONFIG_IMA_APPRAISE_MODSIG) \
+ && defined(CONFIG_MODULES))
.incbin "certs/signing_key.x509"
#endif
.incbin "certs/signing_key.x509"
#endif
+__module_cert_end:
.incbin "certs/x509_certificate_list"
__cert_list_end:
.incbin "certs/x509_certificate_list"
__cert_list_end:
@@
-35,3
+38,12
@@
system_certificate_list_size:
#else
.long __cert_list_end - __cert_list_start
#endif
#else
.long __cert_list_end - __cert_list_start
#endif
+
+ .align 8
+ .globl module_cert_size
+module_cert_size:
+#ifdef CONFIG_64BIT
+ .quad __module_cert_end - __module_cert_start
+#else
+ .long __module_cert_end - __module_cert_start
+#endif