Merge tag 'modsign-pkcs7-20150812-3' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

2026-11-10 20:48:12 +00:00 · 2015-08-14 12:08:39 +10:00 · 2015-08-14 12:08:39 +10:00 · e4fc02f24c
commit e4fc02f24c
parent aa62efff65 e9a5e8cc55
35 changed files with 1597 additions and 928 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
--- a/Documentation/module-signing.txt
+++ b/Documentation/module-signing.txt
--- a/8
+++ b/8
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
--- a/crypto/asymmetric_keys/Makefile
+++ b/crypto/asymmetric_keys/Makefile
--- a/crypto/asymmetric_keys/asymmetric_type.c
+++ b/crypto/asymmetric_keys/asymmetric_type.c
--- a/crypto/asymmetric_keys/pkcs7.asn1
+++ b/crypto/asymmetric_keys/pkcs7.asn1
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
--- a/crypto/asymmetric_keys/pkcs7_parser.c
+++ b/crypto/asymmetric_keys/pkcs7_parser.c
--- a/crypto/asymmetric_keys/pkcs7_parser.h
+++ b/crypto/asymmetric_keys/pkcs7_parser.h
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
--- a/crypto/asymmetric_keys/pkcs7_verify.c
+++ b/crypto/asymmetric_keys/pkcs7_verify.c
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
--- a/crypto/asymmetric_keys/verify_pefile.c
+++ b/crypto/asymmetric_keys/verify_pefile.c
--- a/crypto/asymmetric_keys/x509_akid.asn1
+++ b/crypto/asymmetric_keys/x509_akid.asn1
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
--- a/crypto/asymmetric_keys/x509_parser.h
+++ b/crypto/asymmetric_keys/x509_parser.h
--- a/crypto/asymmetric_keys/x509_public_key.c
+++ b/crypto/asymmetric_keys/x509_public_key.c
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
--- a/include/crypto/public_key.h
+++ b/include/crypto/public_key.h
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
--- a/include/linux/oid_registry.h
+++ b/include/linux/oid_registry.h
--- a/include/linux/verify_pefile.h
+++ b/include/linux/verify_pefile.h
--- a/init/Kconfig
+++ b/init/Kconfig
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
--- a/kernel/system_certificates.S
+++ b/kernel/system_certificates.S
--- a/kernel/system_keyring.c
+++ b/kernel/system_keyring.c
--- a/scripts/Makefile
+++ b/scripts/Makefile
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
--- a/scripts/extract-cert.c
+++ b/scripts/extract-cert.c
--- a/scripts/sign-file
+++ b/scripts/sign-file
--- a/scripts/sign-file.c
+++ b/scripts/sign-file.c