summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | Smack: remove unneeded NULL-termination from securtity labelKonstantin Khlebnikov2014-08-081-3/+3
| * | Smack: handle zero-length security labels without panicKonstantin Khlebnikov2014-08-082-3/+3
| * | Smack: fix behavior of smack_inode_listsecurityKonstantin Khlebnikov2014-08-081-5/+4
| |/
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-09-1216-122/+105
|\ \
| * | integrity: make integrity files as 'integrity' moduleDmitry Kasatkin2014-09-091-3/+3
| * | integrity: base integrity subsystem kconfig options on integrityDmitry Kasatkin2014-09-093-14/+18
| * | integrity: move asymmetric keys config optionDmitry Kasatkin2014-09-091-12/+12
| * | ima: initialize only required templateDmitry Kasatkin2014-09-091-24/+4
| * | ima: remove usage of filename parameterDmitry Kasatkin2014-09-092-14/+10
| * | ima: remove unnecessary appraisal testDmitry Kasatkin2014-09-091-2/+0
| * | ima: add missing '__init' keywordsDmitry Kasatkin2014-09-093-5/+3
| * | ima: remove unnecessary extra variableDmitry Kasatkin2014-09-091-4/+5
| * | ima: simplify conditional statement to improve performanceDmitry Kasatkin2014-09-091-4/+2
| * | integrity: remove declaration of non-existing functionsDmitry Kasatkin2014-09-092-10/+0
| * | integrity: prevent flooding with 'Request for unknown key'Dmitry Kasatkin2014-09-091-2/+3
| * | ima: pass 'opened' flag to identify newly created filesDmitry Kasatkin2014-09-096-16/+16
| * | evm: properly handle INTEGRITY_NOXATTRS EVM statusDmitry Kasatkin2014-09-091-0/+7
| * | ima: provide flag to identify new empty filesDmitry Kasatkin2014-09-083-7/+13
| * | evm: prevent passing integrity check if xattr read failsDmitry Kasatkin2014-09-081-3/+4
| * | evm: fix checkpatch warningsDmitry Kasatkin2014-09-021-3/+0
| * | ima: fix fallback to use new_sync_read()Dmitry Kasatkin2014-09-021-4/+4
| * | ima: prevent buffer overflow in ima_alloc_tfm()Dmitry Kasatkin2014-09-021-1/+4
| * | ima: fix ima_alloc_atfm()Mimi Zohar2014-09-021-1/+4
* | | seccomp: Add reviewers to MAINTAINERSKees Cook2014-09-031-0/+2