summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-08-068-131/+274
|\
| * hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytesStephen Boyd2014-08-051-1/+1
| * random: limit the contribution of the hw rng to at most halfTheodore Ts'o2014-08-051-39/+4
| * random: introduce getrandom(2) system callTheodore Ts'o2014-08-056-4/+54
| * hw_random: fix sparse warning (NULL vs 0 for pointer)Torsten Duwe2014-07-151-1/+1
| * random: use registers from interrupted code for CPU's w/o a cycle counterTheodore Ts'o2014-07-151-25/+22
| * hwrng: add per-device entropy deratingTorsten Duwe2014-07-152-1/+13
| * hwrng: create filler threadTorsten Duwe2014-07-151-5/+64
| * random: add_hwgenerator_randomness() for feeding entropy from devicesTorsten Duwe2014-07-152-0/+23
| * random: use an improved fast_mix() functionTheodore Ts'o2014-07-151-24/+68
| * random: clean up interrupt entropy accounting for archs w/o cycle countersTheodore Ts'o2014-07-151-19/+23
| * random: only update the last_pulled time if we actually transferred entropyTheodore Ts'o2014-07-151-4/+7
| * random: remove unneeded hash of a portion of the entropy poolTheodore Ts'o2014-07-151-31/+20
| * random: always update the entropy pool under the spinlockTheodore Ts'o2014-07-151-21/+23
* | 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
OpenPOWER on IntegriCloud