diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:13:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 07:13:13 -0700 |
| commit | b5edfefc65526b34960bbff3477ded477b0328f6 (patch) | |
| tree | 6d66cfffa358d024f0b849534d1709763022ca54 | |
| parent | b14db7abe3501524fd2b1b4ab328239cde42f567 (diff) | |
| parent | 02a077c52ef7631275a79862ffd9f3dbe9d38bc2 (diff) | |
| download | linux-3.10-b5edfefc65526b34960bbff3477ded477b0328f6.tar.gz linux-3.10-b5edfefc65526b34960bbff3477ded477b0328f6.tar.bz2 linux-3.10-b5edfefc65526b34960bbff3477ded477b0328f6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
TPM: ReadPubEK output struct fix
| -rw-r--r-- | drivers/char/tpm/tpm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 8e00b4ddd08..792868d24f2 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -224,6 +224,7 @@ struct tpm_readpubek_params_out { u8 algorithm[4]; u8 encscheme[2]; u8 sigscheme[2]; + __be32 paramsize; u8 parameters[12]; /*assuming RSA*/ __be32 keysize; u8 modulus[256]; |