Linus Torvalds b793c005ce Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "Highlights: - PKCS#7 support added to support signed kexec, also utilized for module signing. See comments in 3f1e1bea. ** NOTE: this requires linking against the OpenSSL library, which must be installed, e.g. the openssl-devel on Fedora ** - Smack - add IPv6 host labeling; ignore labels on kernel threads - support smack labeling mounts which use binary mount data - SELinux: - add ioctl whitelisting (see http://kernsec.org/files/lss2015/vanderstoep.pdf) - fix mprotect PROT_EXEC regression caused by mm change - Seccomp: - add ptrace options for suspend/resume" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (57 commits) PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them Documentation/Changes: Now need OpenSSL devel packages for module signing scripts: add extract-cert and sign-file to .gitignore modsign: Handle signing key in source tree modsign: Use if_changed rule for extracting cert from module signing key Move certificate handling to its own directory sign-file: Fix warning about BIO_reset() return value PKCS#7: Add MODULE_LICENSE() to test module Smack - Fix build error with bringup unconfigured sign-file: Document dependency on OpenSSL devel libraries PKCS#7: Appropriately restrict authenticated attributes and content type KEYS: Add a name for PKEY_ID_PKCS7 PKCS#7: Improve and export the X.509 ASN.1 time object decoder modsign: Use extract-cert to process CONFIG_SYSTEM_TRUSTED_KEYS extract-cert: Cope with multiple X.509 certificates in a single file sign-file: Generate CMS message as signature instead of PKCS#7 PKCS#7: Support CMS messages also [RFC5652] X.509: Change recorded SKID & AKID to not include Subject or Issuer PKCS#7: Check content type and versions MAINTAINERS: The keyrings mailing list has moved ...		2015-09-08 12:41:25 -07:00
..
calibrate.c	kernel: add calibration_delay_done()	2014-06-16 12:47:39 -06:00
do_mounts.c	init/do_mounts.c: add create_dev() failure log	2015-06-25 17:00:42 -07:00
do_mounts.h
do_mounts_initrd.c	usermodehelper: split remaining calls to call_usermodehelper_fns()	2013-04-30 17:04:06 -07:00
do_mounts_md.c	init: disable sparse checking of the mount.o source files	2012-05-31 17:49:27 -07:00
do_mounts_rd.c	initramfs: support initramfs that is bigger than 2GiB	2014-08-08 15:57:26 -07:00
init_task.c	sched/rt: Move rt specific bits into new header file	2013-02-07 20:51:08 +01:00
initramfs.c	init/initramfs.c: resolve shadow warnings	2014-10-14 02:18:22 +02:00
Kconfig	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2015-09-08 12:41:25 -07:00
main.c	fs, file table: reinit files_stat.max_files after deferred memory initialisation	2015-08-07 04:39:40 +03:00
Makefile	init_task: Replace CONFIG_HAVE_GENERIC_INIT_TASK	2012-05-05 13:00:46 +02:00
noinitramfs.c	init: mark __user address space on string literals	2010-10-26 16:52:15 -07:00
version.c	copy address of proc_ns_ops into ns_common	2014-12-04 14:34:47 -05:00