1
0
Fork 0
alistair23-linux/Documentation/security
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
..
00-INDEX ima: new templates management mechanism 2013-10-25 17:17:04 -04:00
IMA-templates.txt ima: update IMA-templates.txt documentation 2014-01-03 07:42:59 -05:00
LSM.txt doc: LSM: update reference, kerneltrap.org no longer works 2014-06-19 15:15:28 +02:00
SELinux.txt Create Documentation/security/, 2011-05-19 15:59:38 -07:00
Smack.txt Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux-security 2014-06-10 10:05:36 -07:00
Yama.txt doc: spelling error changes 2014-05-05 15:32:05 +02:00
apparmor.txt Create Documentation/security/, 2011-05-19 15:59:38 -07:00
credentials.txt Documentation: clarify the purpose of LSMs 2011-11-16 12:37:27 +11:00
keys-ecryptfs.txt encrypted-keys: move ecryptfs documentation to proper location 2011-06-30 19:08:14 +10:00
keys-request-key.txt Create Documentation/security/, 2011-05-19 15:59:38 -07:00
keys-trusted-encrypted.txt Documentation: Fix multiple typo in Documentation 2012-03-07 16:08:24 +01:00
keys.txt KEYS: Update the keyrings documentation for match changes 2014-09-16 17:36:09 +01:00
tomoyo.txt Create Documentation/security/, 2011-05-19 15:59:38 -07:00