Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj8v-0006zE-AM for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUj8o-0006wm-3q for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:16 -0500 Received: from mail-am0eur02on2046.outbound.protection.outlook.com ([40.107.247.46] helo=EUR02-AM0-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pUj8m-0006pk-Gl for grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:13 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nMhiTiBGmOffGxRhQsoUc25lHBDbqy4uBjUF4AmxoiFcURzO5xf82g7hZYnADyEHmqUl/mWkxAzVvPmyspXfKMAv07mmeUjy2IHoQebl3G2/Tm8Aiy9die84ANlBOWsaI6s03WKZ88skp6yNX6uEhEeiVgBOPAT5pcNAJIInHWPNm3hOx3/0DaZopUlI241X8s+b6Gkj+ZvJyBCVJ1RdzQaE6XHnfAi9nApQ/+JQu6M5YSDATB2SzIE2/FnXLkERccEfr4Uprphc17y0e3Go/RSxks6DREXDQTZzao81a0setvb1pOTqBUpV9Qr/k/269F5J1I1vMUcElP6mo2Jjlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=T/tkfvWYlQiZoEwsImJPT1tEe+3U/qOm18vvzWtPSHI=; b=nHj2Rf8i62LakLeB8ANlILlp1OFeXCrkug9lOMb+ncAzS97KdjlekJC6xCCoXmTRzFPlhz0q2L0FB15WgqhQsayAnqf6GLYrPxrIvei7M9jrnb4aUqor9UBAPIipvC0mNDAwYiVgc8UhA7tx16dm/6QgWtb0epMNMRyo8RD2rzGxptgcc+Ic/s3MpLlyiO/aCx3atmCSHfm5SYHBCo1pyoGh8s2dDhEEz521eATivIjbYN5qzMyKyQmknPQzbV/LRMow3B7W/PovVMU8FQRl6x2zofGN6qANyXgJveM9kZgW8GmAfi7Knr2wM7r9DT2Qm+JitlrUNPRewn2hbirYXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T/tkfvWYlQiZoEwsImJPT1tEe+3U/qOm18vvzWtPSHI=; b=esNwjoR7s8Swqri9QCWrOL1Xtdmq9XLexhaDxwpNKH8c5M75yhUIOHw5Qv0ecfdVTpI2gkAPk8asoMtkAE899w8dNY0Kgnrr0sLQEVAFKaEhHC04bl2rIjm5ugUTUqUuGokgKFCaqe4ZYJP6QjmvOgZtVG2sdxw1Qx5FuyNtM6DTyzibvdtTHwtaRc77Hdvce2rRt3vXaLq8YeHn9jNMkEi62Oc1w3E0OWKDEZWq/GgKpjAtOTIDBHPaoN4FlPY/s5aOaVbTWzg/gzm6UpuBqoqn25OSEyYZ2zjTnwSJcfed7YWUijr0BhDqMEM2JGgCHzzzmuuzl3vtZgDOdVGjdg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) by PAXPR04MB9572.eurprd04.prod.outlook.com (2603:10a6:102:24f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.19; Wed, 22 Feb 2023 07:02:09 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a%6]) with mapi id 15.20.6111.021; Wed, 22 Feb 2023 07:02:09 +0000 From: Gary Lin To: grub-devel@gnu.org Cc: 'Hernan Gatta ' , 'Daniel Kiper ' , shkhisti@microsoft.com, jaskaran.khurana@microsoft.com, christopher.co@microsoft.com, daniel.mihai@microsoft.com, rharwood@redhat.com, jaredz@redhat.com, development@efficientek.com, jejb@linux.ibm.com, mchang@suse.com Subject: [PATCH 14/14] tpm2: remove the unnecessary variables Date: Wed, 22 Feb 2023 15:00:54 +0800 Message-Id: <20230222070054.5122-15-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230222070054.5122-1-glin@suse.com> References: <20230222070054.5122-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR2P281CA0186.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::20) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|PAXPR04MB9572:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dd62412-5e75-485d-6613-08db14a2b6f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 93pg5czOjXvVt2BGXOFd2FquU0RUHz9eoNBbC+ERhEDhdeSzIvexPFkdkIt/IVIzKdXoR13Vdhw2t8FxqlAeWYIvBg7qpSuIBhVco5lzrGVVsZxilXfBlHZ8XWvuhnLZtA1YB74fdoRtmt2MOghrRjvlMAj/1dAuS82p5x5AN9ZmKRzBj4TflTSlZWauddHVn8tqTkqiqWScT8ELtw4+33ZDgeL+jBc3/Soue4/ijFQNLjQ17nIFhlRlRd64/7ULbI1WneYQ2VQwjAqvieCz9BcALFMGh6l/sSc+ofhcOq7qwW+PeH2ltiYSfj3/u2+RkvXbFJHKmLPzGxJ/dgTxMlnsb5EeVAjLyvq2r/7dfp9qmaY/bKMF1lOxMeiryRwwDT47qM4CLasxNnkcZkomeB5rLqK+udo8p8I6BMF/L6kEe09/HWONcy5Fe0fsc2UWuTUZECl4TdQrgBa/nLfBfJ87C45JiPHuQzmtAWn+0Db8Hoskmvs4QM/CWpThpkcPVIMPepCDixRErl1aInnf4E6lM1SQ+CayceyZijSGvi2egnc+QNpQpMSkPfS8PM/99EfefRRgbiugzUbG06yGRueLIBDGJYsVOjh58OQWZbUjSmZW81Utfpyovr/4D78UPnUGgZOBxnvtxKp0qvbRXCnSeQQJFj/I9fTwBPM6A4E8ETAcvPAG8UpGw+7BeDa7 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6140.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(39860400002)(396003)(346002)(376002)(136003)(366004)(451199018)(86362001)(36756003)(186003)(8676002)(26005)(6506007)(1076003)(6512007)(66946007)(4326008)(6916009)(8936002)(66476007)(66556008)(5660300002)(41300700001)(2616005)(316002)(54906003)(6666004)(107886003)(19627235002)(6486002)(478600001)(38100700002)(83380400001)(2906002)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4Sdccu2Jf0hGyrcYPcYzBhRCM2h2RP3TXYBxFndZ3Z1fEcKeJJHC4QZa8WpC?= =?us-ascii?Q?aztQyJxiYs/579n+zaIUx/1hZwyMFp51anKqBcNVJI+DudJGjdW5WST6pF0E?= =?us-ascii?Q?DRHZsaCXjI+eLFAWKfVZsr6oE2CA1XybDzgh1OS1ivgJqHbpf05SfF6UJR63?= =?us-ascii?Q?91eSfy/s8bLxsTU9UwOJkEshZNTk5RBIrC6vUsK1HPXRSHtpl8gOzbQ9KTjz?= =?us-ascii?Q?rECbxohfKVREyvH00aas/kqiIvszwxIUqObeFT8Lz/7s8cjaYjXB20NHAeWf?= =?us-ascii?Q?WsUisqvJOQH/BbT1fs2GCcRPidVttuAVJNqhItGKvfCpM/lLUCuR1wdFAvbP?= =?us-ascii?Q?1nWyekDNLeeAhg4NXWQlPIs6rjDkEdpIp6kpMaIBnwR2HIGHAMwJuvmJsM/3?= =?us-ascii?Q?F69W7DOnC10RJJ/eQeRiHz42BrA1kuwZo/7pF4PpWBO0q9fR0Rp16Zo2pWLJ?= =?us-ascii?Q?RiR2DjUImBXUyFhlbKdGFz+UB933ny7lx0xWTe1xkdTD7FrvXlte/7vA2hNB?= =?us-ascii?Q?9f8SiYJeOB9A6Vuqc3apxWP9wa7edOgWxMzhLzZaDg74aciWGKqef/o2KPNa?= =?us-ascii?Q?6IeGCcQ/wSgcPu3PREANqdSYI5ZBQCTSXwCQccyHE/yx7AMp7ohSxqOMNa56?= =?us-ascii?Q?Vm3+kEqGPVg7HDu7iJTntmtINOPaX9GrMe+RneJIz+r5mKR4Jwck1Wxoyudg?= =?us-ascii?Q?Lq1k3TNlTlPWsvrLwjoNZ8skZv0LdpQfuIweK0/EW0mTSZJ+9hqyUer2Q3HM?= =?us-ascii?Q?A0LQoe4G0EerBXluVWLxB1sBr4nTA43J3TJCtS8J5fzGMCmjWKoJfFpfXQ8R?= =?us-ascii?Q?jOCCFSW+4nya21wX40tSVqp8Lu7NkFYFC7qZ7QtlbOFZ7WNF9WEck4w9dXNt?= =?us-ascii?Q?7p6CGMTYXfBiNJdoOT4YwIsLR3mO7UoOEkf8vSazR6sTShYkwpyO58T8Shu2?= =?us-ascii?Q?660wkV2TCRmIy9JE1ckfXBRoCwnhKlGOtbkNDZ6D2NDICXS1VjXvfOuZZV3g?= =?us-ascii?Q?7Ioa8OxJCezydI4FJBPJ6F0wj+Sf8Swz+yBO7+9W/yiOToaE1tkLIRUcwTgj?= =?us-ascii?Q?1ruFs6jc2qsYpGw3JeAf+Cr6VBuOnzQGJhBx54Qx8F2DVv28gor/MreCOhM9?= =?us-ascii?Q?vPaRi5GU3e1jfjwrtRDucZNmMlRXuia43LFhC9BYCiKYKX6L5cMk+HV38W8s?= =?us-ascii?Q?XrSKrsgRWDy1/Jgv1k6DXArt4dgWGXzEgfHR5SyjTeFQi3nuMlc7dCCrpaGn?= =?us-ascii?Q?IYj57VE8TIVyl3uer5uOnCw3XjzRdYfDuOqZJnSVGft3kIWHDr46sE73x5wD?= =?us-ascii?Q?Nn0EEKiFK1+Yjbm5nAEf651XX8eSQbJplbBcbbzVpYQf/H2so26pIMoYA5L8?= =?us-ascii?Q?XCssUnZC4a0E85ugmsHn/xKJPp79Z6xVXMFGJyRrwHdJVAVqdrxntQ/Le4a+?= =?us-ascii?Q?krMrOnzJ7X4nJzokOKmQ20bzRi2xQ55zED1cBQvy89SIJJDy+4bF9GIae+W/?= =?us-ascii?Q?BwuNgWxdql8L7pT2fGpm3yDLHlPiLEJ8oBCTrAIzqw2uRQM87SyR/43rqnLV?= =?us-ascii?Q?asjivmmyjMVCjHA5UddaY4p8h7JlLgkOcrolB6PE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd62412-5e75-485d-6613-08db14a2b6f5 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Feb 2023 07:02:09.3443 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fo2skzWvxr98EiFdl4Em8PcKsib7pdNJg/A/FXgC6+fN4+yD6Haq9CVInFH9+H+G X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9572 Received-SPF: pass client-ip=40.107.247.46; envelope-from=GLin@suse.com; helo=EUR02-AM0-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2023 07:02:17 -0000 Since the NULL 'encryptedSalt' of 'TPM2_StartAuthSession' is handled as an empty TPM2B structure, there is no need to declare an empty salt. As for 'nonceTPM', we don't use in the following TPM2 commands, so we can safely ignore it. Signed-off-by: Gary Lin --- grub-core/tpm2/module.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/grub-core/tpm2/module.c b/grub-core/tpm2/module.c index bebdecd1c..580c1f972 100644 --- a/grub-core/tpm2/module.c +++ b/grub-core/tpm2/module.c @@ -311,9 +311,7 @@ grub_tpm2_protector_srk_recover (const struct grub_tpm2_protector_context *ctx, grub_size_t sealed_key_size; TPM_HANDLE srk_handle; TPM2B_NONCE nonceCaller = { 0 }; - TPM2B_ENCRYPTED_SECRET salt = { 0 }; TPMT_SYM_DEF symmetric = { 0 }; - TPM2B_NONCE nonceTPM = { 0 }; TPMI_SH_AUTH_SESSION session; TPML_PCR_SELECTION pcrSel = { .count = 1, @@ -364,9 +362,9 @@ grub_tpm2_protector_srk_recover (const struct grub_tpm2_protector_context *ctx, nonceCaller.size = TPM_SHA256_DIGEST_SIZE; symmetric.algorithm = TPM_ALG_NULL; - rc = TPM2_StartAuthSession (TPM_RH_NULL, TPM_RH_NULL, 0, &nonceCaller, &salt, + rc = TPM2_StartAuthSession (TPM_RH_NULL, TPM_RH_NULL, NULL, &nonceCaller, NULL, TPM_SE_POLICY, &symmetric, TPM_ALG_SHA256, - &session, &nonceTPM, 0); + &session, NULL, NULL); if (rc) { grub_error (err, N_("Failed to start auth session (TPM2_StartAuthSession " -- 2.35.3