diff for duplicates of <1582825769.18445.18.camel@HansenPartnership.com> diff --git a/a/1.txt b/N1/1.txt index c1a01e1..bc36c60 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,12 +25,12 @@ into account, so we can now use plain text passwords for the keys. so before -keyctl add trusted kmk "new 32 blobauthõ72d396fae9206628714fb2ce00f72e94f2258f" +keyctl add trusted kmk "new 32 blobauth=f572d396fae9206628714fb2ce00f72e94f2258f" 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" +keyctl add trusted kmk "new 32 blobauth=hello keyhandle=81000001" 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 @@ -83,7 +83,7 @@ index d2c5ec1e040b..add9f071d818 100644 + */ + 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) @@ -104,7 +104,7 @@ index d2c5ec1e040b..add9f071d818 100644 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 diff --git a/a/content_digest b/N1/content_digest index 7e5cf7e..a64856b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,7 +6,7 @@ "ref\01582820506.18445.3.camel@HansenPartnership.com\0" "From\0James Bottomley <James.Bottomley@hansenpartnership.com>\0" "Subject\0Re: [PATCH v5 3/6] security: keys: trusted fix tpm2 authorizations\0" - "Date\0Thu, 27 Feb 2020 17:49:29 +0000\0" + "Date\0Thu, 27 Feb 2020 09:49:29 -0800\0" "To\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Cc\0linux-integrity@vger.kernel.org" Mimi Zohar <zohar@linux.ibm.com> @@ -41,12 +41,12 @@ "\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 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\"\n" + "keyctl add trusted kmk \"new 32 blobauth=hello keyhandle=81000001\"\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" @@ -99,7 +99,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" @@ -120,7 +120,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" @@ -152,4 +152,4 @@ " \trc = tpm_send(chip, buf.data, tpm_buf_length(&buf));\n" " \tif (rc > 0)" -064c61d417c95b1e8f51bf1a09544c20852add80e43e6a3ad0416135b9d12ca4 +205e0bbebb6f51a19b373792f9f8f4104e0626f12810ed90e402872646597039
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.