diff for duplicates of <20200930110227.GA5145@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 81f10f7..ed7aea2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,12 +10,12 @@ On Mon, Sep 21, 2020 at 07:28:07PM -0700, James Bottomley wrote: > > so before > -> keyctl add trusted kmk "new 32 blobauthõ72d396fae9206628714fb2ce00f72e94f2258fkeyhandle000001" @u +> keyctl add trusted kmk "new 32 blobauth=f572d396fae9206628714fb2ce00f72e94f2258fkeyhandle=81000001" @u > > after we will accept both the old hex sha1 form as well as a new > directly supplied password: > -> keyctl add trusted kmk "new 32 blobauth=hello keyhandle000001" @u +> keyctl add trusted kmk "new 32 blobauth=hello keyhandle=81000001" @u > > Since a sha1 hex code must be exactly 40 bytes long and a direct > password must be 20 or less, we use the length as the discriminator @@ -78,7 +78,7 @@ On Mon, Sep 21, 2020 at 07:28:07PM -0700, James Bottomley wrote: > + */ > + 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) @@ -99,7 +99,7 @@ On Mon, Sep 21, 2020 at 07:28:07PM -0700, James Bottomley wrote: > break; > + > case Opt_migratable: -> if (*args[0].from = '0') +> if (*args[0].from == '0') > pay->migratable = 0; > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c > index 08ec7f48f01d..b4a5058107c2 100644 @@ -138,9 +138,9 @@ Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Transcript: -âžœ tpm2-scripts (master) ✗ sudo ./tpm2-root-key +➜ tpm2-scripts (master) ✗ sudo ./tpm2-root-key 0x80000000 -âžœ tpm2-scripts (master) ✗ sudo keyctl add trusted kmk "new 32 blobauth=hello keyhandle€000000" @u +➜ tpm2-scripts (master) ✗ sudo keyctl add trusted kmk "new 32 blobauth=hello keyhandle=80000000" @u 751240563 /Jarkko diff --git a/a/content_digest b/N1/content_digest index ce0d740..26bda8b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020200922022809.7105-4-James.Bottomley@HansenPartnership.com\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v13 3/5] security: keys: trusted: fix TPM2 authorizations\0" - "Date\0Wed, 30 Sep 2020 11:02:34 +0000\0" + "Date\0Wed, 30 Sep 2020 14:02:34 +0300\0" "To\0James Bottomley <James.Bottomley@hansenpartnership.com>\0" "Cc\0linux-integrity@vger.kernel.org" Mimi Zohar <zohar@linux.ibm.com> @@ -23,12 +23,12 @@ "> \n" "> so before\n" "> \n" - "> keyctl add trusted kmk \"new 32 blobauth\303\26572d396fae9206628714fb2ce00f72e94f2258fkeyhandle\302\201000001\" @u\n" + "> keyctl add trusted kmk \"new 32 blobauth=f572d396fae9206628714fb2ce00f72e94f2258fkeyhandle=81000001\" @u\n" "> \n" "> after we will accept both the old hex sha1 form as well as a new\n" "> directly supplied password:\n" "> \n" - "> keyctl add trusted kmk \"new 32 blobauth=hello keyhandle\302\201000001\" @u\n" + "> keyctl add trusted kmk \"new 32 blobauth=hello keyhandle=81000001\" @u\n" "> \n" "> Since a sha1 hex code must be exactly 40 bytes long and a direct\n" "> password must be 20 or less, we use the length as the discriminator\n" @@ -91,7 +91,7 @@ "> +\t\t\t */\n" "> +\t\t\topt->blobauth_len = strlen(args[0].from);\n" "> +\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" @@ -112,7 +112,7 @@ "> \t\t\tbreak;\n" "> +\n" "> \t\tcase Opt_migratable:\n" - "> \t\t\tif (*args[0].from = '0')\n" + "> \t\t\tif (*args[0].from == '0')\n" "> \t\t\t\tpay->migratable = 0;\n" "> diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c\n" "> index 08ec7f48f01d..b4a5058107c2 100644\n" @@ -151,11 +151,11 @@ "\n" "Transcript:\n" "\n" - "\303\242\302\236\302\234 tpm2-scripts (master) \303\242\302\234\302\227 sudo ./tpm2-root-key\n" + "\342\236\234 tpm2-scripts (master) \342\234\227 sudo ./tpm2-root-key\n" "0x80000000\n" - "\303\242\302\236\302\234 tpm2-scripts (master) \303\242\302\234\302\227 sudo keyctl add trusted kmk \"new 32 blobauth=hello keyhandle\302\200000000\" @u\n" + "\342\236\234 tpm2-scripts (master) \342\234\227 sudo keyctl add trusted kmk \"new 32 blobauth=hello keyhandle=80000000\" @u\n" "751240563\n" "\n" /Jarkko -090a879e7de27bf50992534e7cf13171375c4457ba9d4c4c3d8d77960f033aa3 +406cd7aeda2d4f89c473f0ceb3f11dd4f93bb6235c3d7939f3ad73de91653fda
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.