summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-08-06110-834/+4480
|\
| * Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2014-08-065-81/+34
| |\
| | * X.509: Need to export x509_request_asymmetric_key()David Howells2014-08-031-0/+1
| | * PKCS#7: X.509 certificate issuer and subject are mandatory fields in the ASN.1David Howells2014-07-311-4/+2
| | * PKCS#7: Use x509_request_asymmetric_key()David Howells2014-07-293-72/+29
| | * X.509: x509_request_asymmetric_keys() doesn't need string length argumentsDavid Howells2014-07-281-6/+3
| | * PKCS#7: fix sparse non static symbol warningWei Yongjun2014-07-281-1/+1
| * | Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-08-028-274/+366
| |\ \
| | * | netlabel: shorter names for the NetLabel catmap funcs/structsPaul Moore2014-08-018-157/+139
| | * | netlabel: fix the catmap walking functionsPaul Moore2014-08-011-48/+54
| | * | netlabel: fix the horribly broken catmap functionsPaul Moore2014-08-015-146/+240
| | * | netlabel: fix a problem when setting bits below the previously lowest bitPaul Moore2014-08-014-16/+26
| * | | tpm: simplify code by using %*phN specifierAndy Shevchenko2014-07-291-3/+1
| * | | tpm: Provide a generic means to override the chip returned timeoutsJason Gunthorpe2014-07-293-21/+75
| * | | tpm: missing tpm_chip_put in tpm_get_random()Jarkko Sakkinen2014-07-291-3/+4
| * | | tpm: Properly clean sysfs entries in error pathStefan Berger2014-07-291-1/+3
| * | | tpm: Add missing tpm_do_selftest to ST33 I2C driverJason Gunthorpe2014-07-291-0/+1
| * | | Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-07-302-15/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Revert "selinux: fix the default socket labeling in sock_graft()"Paul Moore2014-07-282-15/+3
| * | | KEYS: revert encrypted key changeMimi Zohar2014-07-281-1/+1
| * | | Merge tag 'fw-restrict-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...James Morris2014-07-2611-8/+104
| |\ \ \
| | * | | ima: add support for measuring and appraising firmwareMimi Zohar2014-07-258-5/+50
| | * | | firmware_class: perform new LSM checksKees Cook2014-07-251-4/+26
| | * | | security: introduce kernel_fw_from_file hookKees Cook2014-07-253-0/+29
| * | | | Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2014-07-261-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | PKCS#7: Missing inclusion of linux/err.hDavid Howells2014-07-251-0/+1
| * | | | CAPABILITIES: remove undefined caps from all processesEric Paris2014-07-245-12/+13
| * | | | Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2014-07-2448-217/+3025
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'keys-fixes' into keys-nextDavid Howells2014-07-226-3/+20
| | |\ \ \
| | | * | | digsig: make crypto builtin if digsig selected as builtinDmitry Kasatkin2014-07-171-1/+2
| | | * | | RSA: Don't select non-existent symbolJean Delvare2014-07-171-1/+0
| | | * | | KEYS: Allow special keys (eg. DNS results) to be invalidated by CAP_SYS_ADMINDavid Howells2014-07-174-1/+18
| | * | | | Merge remote-tracking branch 'integrity/next-with-keys' into keys-nextDavid Howells2014-07-2213-25/+225
| | |\ \ \ \
| | | * | | | ima: define '.ima' as a builtin 'trusted' keyringMimi Zohar2014-07-175-2/+63
| | | * | | | KEYS: validate certificate trust only with builtin keysDmitry Kasatkin2014-07-174-4/+9
| | | * | | | KEYS: validate certificate trust only with selected keyDmitry Kasatkin2014-07-173-0/+25
| | | * | | | KEYS: make partial key id matching as a dedicated functionDmitry Kasatkin2014-07-172-19/+33
| | | * | | | KEYS: verify a certificate is signed by a 'trusted' keyMimi Zohar2014-07-172-2/+95
| | | * | | | KEYS: special dot prefixed keyring name bug fixMimi Zohar2014-07-171-2/+4
| | * | | | | Merge tag 'keys-pefile-20140709' into keys-nextDavid Howells2014-07-229-2/+1150
| | |\ \ \ \ \
| | | * | | | | pefile: Validate PKCS#7 trust chainDavid Howells2014-07-091-1/+1
| | | * | | | | pefile: Digest the PE binary and compare to the PKCS#7 dataDavid Howells2014-07-091-0/+197
| | | * | | | | pefile: Handle pesign using the wrong OIDVivek Goyal2014-07-091-1/+7
| | | * | | | | pefile: Parse the "Microsoft individual code signing" data blobDavid Howells2014-07-096-2/+174
| | | * | | | | pefile: Parse the presumed PKCS#7 content of the certificate blobDavid Howells2014-07-091-1/+20
| | | * | | | | pefile: Strip the wrapper off of the cert data blockDavid Howells2014-07-091-0/+71
| | | * | | | | pefile: Parse a PE binary to find a key and a signature contained thereinDavid Howells2014-07-095-0/+235
| | | * | | | | Provide PE binary definitionsDavid Howells2014-07-091-0/+448
| | | * | | | | KEYS: X.509: Fix a spelling mistakeDavid Howells2014-07-081-1/+1
| | * | | | | | Merge tag 'keys-pkcs7-20140708' into keys-nextDavid Howells2014-07-2213-2/+1339
| | |\ \ \ \ \ \ | | | |/ / / / /
OpenPOWER on IntegriCloud