Commit b5edfefc authored Jun 27, 2010 by Linus Torvalds

Merge branch 'for-linus' of...

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

parents b14db7ab 02a077c5

drivers/char/tpm/tpm.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -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];