diff for duplicates of <c03eb4a8aa3627f58bc45bbc23a4dcd660dc6e2f.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 1bfe7d2..6cabf65 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,11 +10,11 @@ On Mon, 2019-12-30 at 09:37 -0800, James Bottomley wrote: > > so before > -> keyctl add trusted kmk "new 32 blobauthõ72d396fae9206628714fb2ce00f72e94f2258f" +> keyctl add trusted kmk "new 32 blobauth=f572d396fae9206628714fb2ce00f72e94f2258f" > > after: > -> keyctl add trusted kmk "new 32 blobauth=hello keyhandle000001" +> keyctl add trusted kmk "new 32 blobauth=hello keyhandle=81000001" > > Note this is both and enhancement and a potential bug fix. The TPM > 2.0 spec requires us to strip leading zeros, meaning empyty @@ -66,7 +66,7 @@ change that is not backwards compatible. > + * (although it can take a hash as well) > + */ > + opt->blobauth_len = strlen(args[0].from); -> + if (opt->blobauth_len = 2 * TPM_DIGEST_SIZE) { +> + if (opt->blobauth_len == 2 * TPM_DIGEST_SIZE) { > + res = hex2bin(opt->blobauth, args[0].from, > + TPM_DIGEST_SIZE); > + if (res < 0) @@ -91,7 +91,7 @@ reviewing future patches. > break; > case Opt_migratable: -> if (*args[0].from = '0') +> if (*args[0].from == '0') > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c > index 08ec7f48f01d..11a331a94327 100644 > --- a/security/keys/trusted-keys/trusted_tpm2.c diff --git a/a/content_digest b/N1/content_digest index d2a850c..3133dd7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020191230173802.8731-4-James.Bottomley@HansenPartnership.com\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v4 3/9] security: keys: trusted fix tpm2 authorizations\0" - "Date\0Mon, 06 Jan 2020 21:45:47 +0000\0" + "Date\0Mon, 06 Jan 2020 23:45:47 +0200\0" "To\0James Bottomley <James.Bottomley@hansenpartnership.com>" " linux-integrity@vger.kernel.org\0" "Cc\0Mimi Zohar <zohar@linux.ibm.com>" @@ -22,11 +22,11 @@ "> \n" "> so before\n" "> \n" - "> keyctl add trusted kmk \"new 32 blobauth\303\26572d396fae9206628714fb2ce00f72e94f2258f\"\n" + "> keyctl add trusted kmk \"new 32 blobauth=f572d396fae9206628714fb2ce00f72e94f2258f\"\n" "> \n" "> after:\n" "> \n" - "> keyctl add trusted kmk \"new 32 blobauth=hello keyhandle\302\201000001\"\n" + "> keyctl add trusted kmk \"new 32 blobauth=hello keyhandle=81000001\"\n" "> \n" "> Note this is both and enhancement and a potential bug fix. The TPM\n" "> 2.0 spec requires us to strip leading zeros, meaning empyty\n" @@ -78,7 +78,7 @@ "> +\t\t\t * (although it can take a hash as well)\n" "> +\t\t\t */\n" "> +\t\t\topt->blobauth_len = strlen(args[0].from);\n" - "> +\t\t\tif (opt->blobauth_len = 2 * TPM_DIGEST_SIZE) {\n" + "> +\t\t\tif (opt->blobauth_len == 2 * TPM_DIGEST_SIZE) {\n" "> +\t\t\t\tres = hex2bin(opt->blobauth, args[0].from,\n" "> +\t\t\t\t\t TPM_DIGEST_SIZE);\n" "> +\t\t\t\tif (res < 0)\n" @@ -103,7 +103,7 @@ "\n" "> \t\t\tbreak;\n" "> \t\tcase Opt_migratable:\n" - "> \t\t\tif (*args[0].from = '0')\n" + "> \t\t\tif (*args[0].from == '0')\n" "> diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c\n" "> index 08ec7f48f01d..11a331a94327 100644\n" "> --- a/security/keys/trusted-keys/trusted_tpm2.c\n" @@ -141,4 +141,4 @@ "\n" /Jarkko -03043e073664a7d7bcce05e36820eec6838b225edf2f54193196a86b96c3c789 +9f274d7d28d93e5a067c8ab6650a37beaa4dd5f624e9660b2024ea35119b9f92
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.