summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-10-1267-865/+1593
|\
| * integrity: do zero padding of the key idDmitry Kasatkin2014-10-061-1/+1
| * KEYS: output last portion of fingerprint in /proc/keysDmitry Kasatkin2014-10-061-5/+5
| * KEYS: strip 'id:' from ca_keyidDmitry Kasatkin2014-10-061-1/+1
| * KEYS: use swapped SKID for performing partial matchingDmitry Kasatkin2014-10-062-9/+9
| * KEYS: Restore partial ID matching functionality for asymmetric keysDmitry Kasatkin2014-10-066-25/+81
| * X.509: If available, use the raw subjKeyId to form the key descriptionDavid Howells2014-10-033-2/+11
| * KEYS: handle error code encoded in pointerDmitry Kasatkin2014-10-031-2/+2
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-10-027-48/+95
| |\
| | * ima: detect violations for mmaped filesRoberto Sassu2014-09-182-9/+5
| | * ima: fix race condition on ima_rdwr_violation_check and process_measurementRoberto Sassu2014-09-181-21/+33
| | * ima: added ima_policy_flag variableRoberto Sassu2014-09-174-5/+34
| | * ima: return an error code from ima_add_boot_aggregate()Roberto Sassu2014-09-171-6/+15
| | * ima: provide 'ima_appraise=log' kernel optionDmitry Kasatkin2014-09-173-3/+6
| | * ima: move keyring initialization to ima_init()Dmitry Kasatkin2014-09-172-8/+6
| * | Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-09-305-83/+115
| |\ \
| | * | selinux: normalize audit log formattingRichard Guy Briggs2014-09-221-6/+8
| | * | selinux: cleanup error reporting in selinux_nlmsg_perm()Richard Guy Briggs2014-09-221-4/+3
| | * | selinux: make the netif cache namespace awarePaul Moore2014-09-104-36/+46
| | * | selinux: register nf hooks with single nf_register_hooks callJiri Pirko2014-09-091-25/+10
| | * | selinux: fix a problem with IPv6 traffic denials in selinux_ip_postroute()Paul Moore2014-09-031-0/+1
| | * | selinux: Permit bounded transitions under NO_NEW_PRIVS or NOSUID.Stephen Smalley2014-08-281-12/+47
| | * | Merge tag 'v3.16' into nextPaul Moore2014-08-059755-248081/+494622
| | |\ \
| * | \ \ Merge commit 'v3.16' into nextJames Morris2014-09-30467-2301/+4180
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2014-09-2235-338/+690
| |\ \ \ \
| | * | | | KEYS: Check hex2bin()'s return when generating an asymmetric key IDDavid Howells2014-09-221-7/+8
| | * | | | Merge tag 'keys-pkcs7-20140916' into keys-nextDavid Howells2014-09-1634-305/+649
| | |\ \ \ \
| | | * | | | PKCS#7: Handle PKCS#7 messages that contain no X.509 certsDavid Howells2014-09-162-17/+47
| | | * | | | PKCS#7: Better handling of unsupported cryptoDavid Howells2014-09-165-16/+74
| | | * | | | KEYS: Overhaul key identification when searching for asymmetric keysDavid Howells2014-09-1610-186/+198
| | | * | | | KEYS: Implement binary asymmetric key ID handlingDavid Howells2014-09-163-0/+131
| | | * | | | KEYS: Update the keyrings documentation for match changesDavid Howells2014-09-161-13/+52
| | | * | | | KEYS: Make the key matching functions return boolDavid Howells2014-09-166-16/+18
| | | * | | | KEYS: Remove key_type::match in favour of overriding default by match_preparseDavid Howells2014-09-1619-45/+31
| | | * | | | KEYS: Remove key_type::def_lookup_typeDavid Howells2014-09-166-14/+5
| | | * | | | KEYS: Preparse match dataDavid Howells2014-09-1611-51/+129
| | | * | | | Provide a binary to hex conversion functionDavid Howells2014-09-162-0/+17
| | |/ / / /
| | * | | | Merge tag 'keys-next-fixes-20140916' into keys-nextDavid Howells2014-09-162-5/+5
| | |\ \ \ \
| | | * | | | PKCS#7: Add a missing staticDavid Howells2014-09-161-3/+3
| | | * | | | KEYS: Fix missing staticsDavid Howells2014-09-161-2/+2
| | | | |_|/ | | | |/| |
| | * | | | Merge tag 'keys-fixes-20140916' into keys-nextDavid Howells2014-09-162-28/+35
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | PKCS#7: Fix the parser cleanup to drain parsed out X.509 certsDavid Howells2014-09-161-20/+19
| | | * | | PKCS#7: Provide a single place to do signed info block freeingDavid Howells2014-09-161-9/+15
| | | * | | KEYS: Reinstate EPERM for a key type name beginning with a '.'David Howells2014-09-161-0/+2
| * | | | | Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel in...James Morris2014-09-185-274/+520
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make Smack operate on smack_known struct where it still used char*Lukasz Pawelczyk2014-08-294-255/+233
| | * | | | Fix a bidirectional UDS connect check typoLukasz Pawelczyk2014-08-291-2/+2
| | * | | | Small fixes in comments describing function parametersLukasz Pawelczyk2014-08-291-9/+9
| | * | | | Smack: Bring-up access modeCasey Schaufler2014-08-285-27/+294
| | * | | | Smack: Fix setting label on successful file openMarcin Niesluchowski2014-08-251-1/+3