Linus Torvalds 5e40d331bd Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris. Mostly ima, selinux, smack and key handling updates. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (65 commits) integrity: do zero padding of the key id KEYS: output last portion of fingerprint in /proc/keys KEYS: strip 'id:' from ca_keyid KEYS: use swapped SKID for performing partial matching KEYS: Restore partial ID matching functionality for asymmetric keys X.509: If available, use the raw subjKeyId to form the key description KEYS: handle error code encoded in pointer selinux: normalize audit log formatting selinux: cleanup error reporting in selinux_nlmsg_perm() KEYS: Check hex2bin()'s return when generating an asymmetric key ID ima: detect violations for mmaped files ima: fix race condition on ima_rdwr_violation_check and process_measurement ima: added ima_policy_flag variable ima: return an error code from ima_add_boot_aggregate() ima: provide 'ima_appraise=log' kernel option ima: move keyring initialization to ima_init() PKCS#7: Handle PKCS#7 messages that contain no X.509 certs PKCS#7: Better handling of unsupported crypto KEYS: Overhaul key identification when searching for asymmetric keys KEYS: Implement binary asymmetric key ID handling ...		2014-10-12 10:13:55 -04:00
..
encrypted-keys	KEYS: Remove key_type::match in favour of overriding default by match_preparse	2014-09-16 17:36:06 +01:00
big_key.c	KEYS: Remove key_type::match in favour of overriding default by match_preparse	2014-09-16 17:36:06 +01:00
compat.c	security/compat: convert to COMPAT_SYSCALL_DEFINE	2014-03-06 16:30:42 +01:00
gc.c	sched: Remove proliferation of wait_on_bit() action functions	2014-07-16 15:10:39 +02:00
internal.h	KEYS: Make the key matching functions return bool	2014-09-16 17:36:08 +01:00
Kconfig	KEYS: Make BIG_KEYS boolean	2013-10-30 11:15:23 +00:00
key.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-10-12 10:13:55 -04:00
keyctl.c	KEYS: Reinstate EPERM for a key type name beginning with a '.'	2014-09-16 17:29:03 +01:00
keyring.c	KEYS: Make the key matching functions return bool	2014-09-16 17:36:08 +01:00
Makefile	KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches	2013-09-24 10:35:19 +01:00
permission.c	KEYS: Move the flags representing required permission to linux/key.h	2014-03-14 17:44:49 +00:00
persistent.c	KEYS: Move the flags representing required permission to linux/key.h	2014-03-14 17:44:49 +00:00
proc.c	KEYS: Preparse match data	2014-09-16 17:36:02 +01:00
process_keys.c	KEYS: Make the key matching functions return bool	2014-09-16 17:36:08 +01:00
request_key_auth.c	KEYS: Remove key_type::match in favour of overriding default by match_preparse	2014-09-16 17:36:06 +01:00
request_key.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-10-12 10:13:55 -04:00
sysctl.c	security: Convert use of typedef ctl_table to struct ctl_table	2014-04-15 13:39:58 +10:00
trusted.c	KEYS: Remove key_type::match in favour of overriding default by match_preparse	2014-09-16 17:36:06 +01:00
trusted.h	trusted-keys: rename trusted_defined files to trusted	2011-01-24 10:14:22 +11:00
user_defined.c	KEYS: Remove key_type::match in favour of overriding default by match_preparse	2014-09-16 17:36:06 +01:00