Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris: - Support for partial reads of /dev/tpm0. - Clean up for TPM 1.x code: move the commands to tpm1-cmd.c and make everything to use the same data structure for building TPM commands i.e. struct tpm_buf. * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (25 commits) tpm: add support for partial reads tpm: tpm_ibmvtpm: fix kdoc warnings tpm: fix kdoc for tpm2_flush_context_cmd() tpm: tpm_try_transmit() refactor error flow. tpm: use u32 instead of int for PCR index tpm1: reimplement tpm1_continue_selftest() using tpm_buf tpm1: reimplement SAVESTATE using tpm_buf tpm1: rename tpm1_pcr_read_dev to tpm1_pcr_read() tpm1: implement tpm1_pcr_read_dev() using tpm_buf structure tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure tpm: tpm-space.c remove unneeded semicolon tpm: tpm-interface.c drop unused macros tpm: add tpm_auto_startup() into tpm-interface.c tpm: factor out tpm_startup function tpm: factor out tpm 1.x pm suspend flow into tpm1-cmd.c tpm: move tpm 1.x selftest code from tpm-interface.c tpm1-cmd.c tpm: factor out tpm1_get_random into tpm1-cmd.c tpm: move tpm_getcap to tpm1-cmd.c tpm: move tpm1_pcr_extend to tpm1-cmd.c tpm: factor out tpm_get_timeouts() ...
Showing
- drivers/char/tpm/Makefile 13 additions, 3 deletionsdrivers/char/tpm/Makefile
- drivers/char/tpm/st33zp24/st33zp24.c 1 addition, 1 deletiondrivers/char/tpm/st33zp24/st33zp24.c
- drivers/char/tpm/tpm-chip.c 3 additions, 8 deletionsdrivers/char/tpm/tpm-chip.c
- drivers/char/tpm/tpm-dev-common.c 36 additions, 16 deletionsdrivers/char/tpm/tpm-dev-common.c
- drivers/char/tpm/tpm-dev.h 2 additions, 3 deletionsdrivers/char/tpm/tpm-dev.h
- drivers/char/tpm/tpm-interface.c 58 additions, 774 deletionsdrivers/char/tpm/tpm-interface.c
- drivers/char/tpm/tpm-sysfs.c 26 additions, 26 deletionsdrivers/char/tpm/tpm-sysfs.c
- drivers/char/tpm/tpm.h 40 additions, 57 deletionsdrivers/char/tpm/tpm.h
- drivers/char/tpm/tpm1-cmd.c 781 additions, 0 deletionsdrivers/char/tpm/tpm1-cmd.c
- drivers/char/tpm/tpm2-cmd.c 151 additions, 157 deletionsdrivers/char/tpm/tpm2-cmd.c
- drivers/char/tpm/tpm2-space.c 1 addition, 1 deletiondrivers/char/tpm/tpm2-space.c
- drivers/char/tpm/tpm_i2c_nuvoton.c 6 additions, 5 deletionsdrivers/char/tpm/tpm_i2c_nuvoton.c
- drivers/char/tpm/tpm_ibmvtpm.c 2 additions, 4 deletionsdrivers/char/tpm/tpm_ibmvtpm.c
- drivers/char/tpm/tpm_tis_core.c 3 additions, 7 deletionsdrivers/char/tpm/tpm_tis_core.c
- include/linux/tpm.h 7 additions, 4 deletionsinclude/linux/tpm.h
- security/integrity/ima/ima_crypto.c 3 additions, 2 deletionssecurity/integrity/ima/ima_crypto.c
Loading
Please register or sign in to comment