summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-03-1791-1365/+1924
|\
| * Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2016-03-0459-745/+999
| |\
| | * X.509: Make algo identifiers text instead of enumDavid Howells2016-03-0312-97/+61
| | * akcipher: Move the RSA DER encoding check to the crypto layerDavid Howells2016-03-037-246/+95
| | * crypto: Add hash param to pkcs1padTadeusz Struk2016-03-031-26/+156
| | * sign-file: fix build with CMS support disabledMarc-Antoine Perennou2016-03-031-1/+1
| | * MODSIGN: linux/string.h should be #included to get memcpy()David Howells2016-03-011-0/+1
| | * certs: Fix misaligned data in extra certificate listDavid Howells2016-02-291-0/+1
| | * X.509: Handle midnight alternative notation in GeneralizedTimeDavid Howells2016-02-291-1/+1
| | * X.509: Support leap secondsDavid Howells2016-02-291-1/+1
| | * Handle ISO 8601 leap seconds and encodings of midnight in mktime64()David Howells2016-02-291-1/+8
| | * X.509: Fix leap year handling againDavid Howells2016-02-291-4/+4
| | * PKCS#7: fix unitialized boolean 'want'Colin Ian King2016-02-291-1/+1
| | * KEYS: Use the symbol value for list size, updated by scripts/insert-sys-certMehmet Kayaalp2016-02-261-8/+21
| | * KEYS: Reserve an extra certificate symbol for inserting without recompilingMehmet Kayaalp2016-02-265-0/+440
| | * modsign: hide openssl output in silent buildsArnd Bergmann2016-02-261-14/+19
| | * scripts/sign-file.c: Add support for signing with a raw signatureJuerg Haefliger2016-02-181-90/+146
| | * security/keys: make big_key.c explicitly non-modularPaul Gortmaker2016-02-181-14/+1
| | * crypto: public_key: remove MPIs from public_key_signature structTadeusz Struk2016-02-181-13/+1
| | * integrity: convert digsig to akcipher apiTadeusz Struk2016-02-182-7/+4
| | * crypto: KEYS: convert public key and digsig asym to the akcipher apiTadeusz Struk2016-02-1012-295/+134
| | * KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an optionDavid Howells2016-02-1026-26/+0
| | * KEYS: Add an alloc flag to convey the builtinness of a keyDavid Howells2016-02-093-2/+5
| | * v2 linux-next scripts/sign-file.c Fix LibreSSL supportCodarren Velvindron2016-02-091-1/+1
| * | Merge branch 'stable-4.6' of git://git.infradead.org/users/pcmoore/selinux in...James Morris2016-03-041-1/+1
| |\ \
| | * | selinux: use absolute path to include directoryAndy Shevchenko2016-01-281-1/+1
| * | | MAINTAINERS: update tpmdd urlsJarkko Sakkinen2016-03-021-2/+2
| * | | firmware: change kernel read fail to dev_dbg()Luis R. Rodriguez2016-02-291-2/+6
| * | | tpm_tis: fix build warning with tpm_tis_resumeJarkko Sakkinen2016-02-261-0/+2
| * | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2016-02-2622-364/+601
| |\ \ \
| | * | | ima: require signed IMA policyMimi Zohar2016-02-211-0/+7
| | * | | ima: measure and appraise the IMA policy itselfMimi Zohar2016-02-214-3/+24
| | * | | ima: load policy using pathDmitry Kasatkin2016-02-212-2/+44
| | * | | ima: support for kexec image and initramfsMimi Zohar2016-02-214-7/+28
| | * | | kexec: replace call to copy_file_from_fd() with kernel versionMimi Zohar2016-02-212-64/+11
| | * | | ima: remove firmware and module specific cached status infoMimi Zohar2016-02-215-39/+28
| | * | | module: replace copy_module_from_fd with kernel versionMimi Zohar2016-02-217-112/+22
| | * | | vfs: define kernel_copy_file_from_fd()Mimi Zohar2016-02-212-0/+18
| | * | | security: define kernel_read_file hookMimi Zohar2016-02-216-0/+54
| | * | | firmware: replace call to fw_read_file_contents() with kernel versionMimi Zohar2016-02-217-90/+21
| | * | | vfs: define kernel_read_file_from_pathMimi Zohar2016-02-212-0/+21
| | * | | ima: define a new hook to measure and appraise a file already in memoryMimi Zohar2016-02-219-15/+66
| | * | | ima: calculate the hash of a buffer using aynchronous hash(ahash)Mimi Zohar2016-02-181-2/+73
| | * | | ima: provide buffer hash calculation functionDmitry Kasatkin2016-02-182-0/+49
| | * | | vfs: define kernel_read_file_id enumerationMimi Zohar2016-02-185-8/+19
| | * | | vfs: define a generic function to read a file from the kernelMimi Zohar2016-02-185-0/+78
| | * | | firmware: clean up filesystem load exit pathKees Cook2016-02-181-7/+5
| | * | | firmware: move completing fw into a helperLuis R. Rodriguez2016-02-181-4/+10
| | * | | firmware: simplify dev_*() print messages for generic helpersLuis R. Rodriguez2016-02-181-4/+4
| | * | | ima: use "ima_hooks" enum as function argumentMimi Zohar2016-02-185-27/+37