Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ppOYH-00036p-DD for mharc-grub-devel@gnu.org; Thu, 20 Apr 2023 03:17:57 -0400 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 1ppOYF-00036b-7F for grub-devel@gnu.org; Thu, 20 Apr 2023 03:17:55 -0400 Received: from mail-vi1eur05on2082.outbound.protection.outlook.com ([40.107.21.82] helo=EUR05-VI1-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 1ppOYD-0002LP-3d for grub-devel@gnu.org; Thu, 20 Apr 2023 03:17:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oxo0c1XDcbHWHbo3q5j5R3XdNOudwjgvXo9MVfuyD0//U4IVwCHU4kUGUOOGawyW2xmQ1qG4e7IjNQUTMi42J1x/nuF1qxK2dXOuLsGKj5SxQlp5uussC+9Vaj4yaIPE2pUvkv6qAgECb8cvQSkw0ybnSWbEkjm7srD7vEWevTsp8HeQsH5mDwpnBLz7Gymx1bneKs55oi9WZngaHWPUr16AZa8RisCr1JJEAF3CeQOfIk49MIjEGQ2/mXQJAtVWZb92VTzvG7rB7AMS8RAvHRN0npYDG5WUN2qfQEycnzXQgZgrxb/XocZRs88dMyENDu14Ho6+naHN6rensVPqTw== 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=i0bv+vIEjqMbxtF0g9oZYMAxHIRdzVzskHLSlJYpFUA=; b=bfrQTsAUAUJ0/qBbMelPn9lvovPIa5YZjiiN5J5IZ/E9r1RlG1U608ZsbS+17FSOGVnNtcZtJiyzN9lmBm8IV4KZntyr/64hZMleue2FRM5/dtQtTUeSzMb1SDkaSO3QyiLnZi2GFms6S7iO/QWgHxZx58s1Iy+GL+PBLHNOw5xyP9Vru6kWPp13fGc4oRql/RlZHAnonyIAdhT9kGF353AqOnhZglvU1ae5IveCMnqLj3KOFPu03A5IFpJwTid5ySqJCGhRZD1dRBGtRw7fI4DPKpfMt7mLcDJGGZILun7t3BKbsRICFlQK8BKWtBUnTGSg2zBsHFxDCx3CaFOQMg== 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=i0bv+vIEjqMbxtF0g9oZYMAxHIRdzVzskHLSlJYpFUA=; b=47HM9lwC7FOa1OpzYC07CMrm/jPvWFc+bG2CeC0xBESqcjOEZpDAB0JFN5rc5H/tSZ29xzicHhYdQ0OAacPkk1ZjqanX1zV1L5Xq1KF4p8hbfsD4M1mAEfYu4QeJDqQGr90WuDPdJDJEU/sdca+uRcUuHhY2neHRy8z+sJapn0nVCwEtrLD4hGpAV90UtGRvBWfn1JGajHPjkwDxUwwEiVYV8x08SXEm3FnZiMjlkblchZ5xkwLc11KKTzLvdHB8Z8ennJ3JebgXlf8ureg7vEbbOPyqDjxmx4OXZKNV+cKW7qQ8MMzyqtEbu/HRf3yQm7NYOjNeBAfCKtZ0Q1k5FA== 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 DUZPR04MB9745.eurprd04.prod.outlook.com (2603:10a6:10:4e1::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Thu, 20 Apr 2023 07:17:50 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::dc0f:b8e1:84c9:2906]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::dc0f:b8e1:84c9:2906%6]) with mapi id 15.20.6298.045; Thu, 20 Apr 2023 07:17:50 +0000 From: Gary Lin To: The development of GNU GRUB Cc: Hernan Gatta , Daniel Axtens , '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 v4 11/12] cryptodisk: Support key protectors Date: Thu, 20 Apr 2023 15:15:47 +0800 Message-Id: <20230420071548.28286-12-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230420071548.28286-1-glin@suse.com> References: <20230420071548.28286-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCP286CA0039.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::13) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|DUZPR04MB9745:EE_ X-MS-Office365-Filtering-Correlation-Id: cb34c7f6-3f23-486d-40ee-08db416f595b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W/807qeWoty6wTG8hUuZ1bfMGowEBSQu1Gaze2EFUFlm6Sap40v44r32F0rxOY3N7NP83Uzyxc6EZZeCe5+c5K3yT/eqfQ/fnC/T1UWzxTBDg0SQVNbM2xHRHES+sFn/SbZIKevX4iCRgZyQ2zALgnwDgSBaXfI6UkMzmY4jILtns7T9kt0UncFImCTvtWPJd0KTsWTPZJlrdwdaLY63fz9aEk8WFT4WlQfE4DWSmKGXJ20pD8WyeruJCn4r4YIjoy6L8ev/BGGkBVomdL9pQG9h2vfy+siHOERiY7o96Q8tis+udQgM+y1cIp14GBKtuXdw1L1RDXjQUQab1r3uxeQqyAXJuFjZCtnNkcoP1jz5Tll4EVdIL7IOjMoiYpKkuLThCxSHDrqOG6hvnn/0crfKD9neYIXZglTPAsjoMb0iovVVrlBkg+rFxgN9LqwIlpcILf3rs1fO6pGIBV5cgRD0N7SMWkHlTMZOPQ+c2O2/pbFNTAHT4GvY5d9VhoyaQd+6STbkFZ4JKu2ZlEnqRwbGZhO2ClhOpob6bZ7X0Y9eaMbNUMaY7ZbYgRpHW7l0 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:(13230028)(136003)(366004)(376002)(346002)(396003)(39860400002)(451199021)(36756003)(6916009)(4326008)(54906003)(316002)(66946007)(66556008)(66476007)(186003)(478600001)(6486002)(6666004)(8936002)(5660300002)(41300700001)(8676002)(2906002)(7416002)(30864003)(86362001)(38100700002)(2616005)(6512007)(1076003)(26005)(107886003)(6506007)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vcJjjHqrxHOdtM+irb1IjGF0iZy5t3uiqF/sy7vdRUdmCg7MlhZhuOPRxsHi?= =?us-ascii?Q?Q+OrkG0fH5fC4CQcfrt1QzImpHqfEldq1fyMJ8P4fIrA47UjwgHAr5VZ1s7/?= =?us-ascii?Q?X4gBlX7f3q5hFxU5QRlBdC6IY7bFHEEMZv7azyulCELJ3lef4vn8calkeWD5?= =?us-ascii?Q?llUa/Oft5Q+fbZ6uAymsUwyqbrIYPjgfN2FFQm9RQTdYkFfblPy0BwjSSgt8?= =?us-ascii?Q?V/w4P2Wad4G+A6bQvdnoCgC2kIA7MXK+WFNtjh7Z57jyKFxs1bZTC3hwOZo1?= =?us-ascii?Q?EpoM7KWEKd7DM5gSlTAgYeubv00smGCQPejemQDgh589TfQGEk50Zcowj/7u?= =?us-ascii?Q?4El6yj8VgIPtecPCBqIbaF0GmtRqMTjKYoh29Y6HIlcIZ7FDR+Wn0G9mJh/R?= =?us-ascii?Q?G2+OCvNuxUmtt3V7jMvukAWNSivEg0ewkKfwl1K/gj/yIyXkoW9SiHpd7jtV?= =?us-ascii?Q?HgGUpb0VCLHmU+bSJmA/D2r94rU65z6++UcuHaG6vIVm0wbpEIIfJAeMcUgx?= =?us-ascii?Q?pbyfT2QLB70cFLOmwLP6wW53AwVFO1TJ+5LaEZKWbd8GiGTycmUuKuvNRwXw?= =?us-ascii?Q?VUMWHfATbnZC7VLdrC4DCdinRtMt3fFL54c0CYHHdy7VJmUQQQWO3Lbe6AIp?= =?us-ascii?Q?2m6lkq+8bvaiRQfIUavEirMHcPYypSA9zwbBXDKlP+GyN/AWdmCsTF5nTgr1?= =?us-ascii?Q?J3CHEFVi0eFmEy+lJXCUsnXBQzaocNjaUq/pk9a0NFQDHMdc9leOXiAINw9r?= =?us-ascii?Q?/iY6wABXNw2OlAYPInhE1g5bSr1DWIW+PVYDkwysT1AhK9Y29ScyXphtUdS7?= =?us-ascii?Q?qcebn7kd1DIJ6uEMKRt2hOup800BUyYg9stGqeY+V4k3mYQLxIcwIq7AmM54?= =?us-ascii?Q?bWyFIRnVbkS2tud0nkDxY+Ol25CfxFJpfb1+TUwA2RiVSizFb/S8hZMOj6kU?= =?us-ascii?Q?cEZWRxW8nq4GiOUXqUPGTmT6MtKh30ME6dRcuBZQWOdjHfXgj7cbVVT5g1Vx?= =?us-ascii?Q?zy7DecpcaP5/BdFBKWjZmvkrnb+13LFnabSJZXLSF1e8Y/2Dw7gso0fen4Eq?= =?us-ascii?Q?/c2UkiP5y8+Ic+o8XqT3Q6zjOlTfLvktt34aNmCu42fxRK8MCqX/li+9tVAp?= =?us-ascii?Q?sdOi/9SZ58xnGK96JOoKJHfCOlTYNGvf5IkwXgYOaieNBq8dCj1vVrzKQD/+?= =?us-ascii?Q?O2TGNtcLWHeLk7iWPgO0BXV3mv1TQ/oT2imrUMRPYJ15Hp3FPvDOv4Y3h0Kf?= =?us-ascii?Q?7aUXAh6HL63NRi0JnI+yeiKTJp3ZPUMUwFB6CY47YwsKJk94TQ6qOtbHpwh3?= =?us-ascii?Q?W97H/0niW0SsXNeIIp+J12AwOlzeWCywr1Tz45Q+1k13dqh105kdKI6LDJ8y?= =?us-ascii?Q?uu7/Dt7C82eKGgns50PJPdHyWmfcH4OOPrJHP8k5X1/H9SyHj74j4tB3Lkp+?= =?us-ascii?Q?LxsCttNMJ9OEojMSMgjxyrhAPzY+OuuQOnQRtXTYCJIffny/eD9nxky0Hso7?= =?us-ascii?Q?lSiyc/VinHQ2AD/G+v0ENNp3PrpLRYHTjP9Y4sI4Juc/kC8R/p9BnZdudGRZ?= =?us-ascii?Q?bNvFeS2l1NkU7pnsDLNz5sE505healc6hLYt/KPs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb34c7f6-3f23-486d-40ee-08db416f595b X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 07:17:50.0775 (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: dBByEmT39TGB1ce8BA6DqgF7oR6RJWtEHmGfV4Zri/xnI3hCcCAeblL9iHHNajcO X-MS-Exchange-Transport-CrossTenantHeadersStamped: DUZPR04MB9745 Received-SPF: pass client-ip=40.107.21.82; envelope-from=GLin@suse.com; helo=EUR05-VI1-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, T_SCC_BODY_TEXT_LINE=-0.01 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: Thu, 20 Apr 2023 07:17:56 -0000 From: Hernan Gatta Add a new parameter to cryptomount to support the key protectors framework: -P. The parameter is used to automatically retrieve a key from specified key protectors. The parameter may be repeated to specify any number of key protectors. These are tried in order until one provides a usable key for any given disk. Signed-off-by: Hernan Gatta Signed-off-by: Michael Chang Signed-off-by: Gary Lin Reviewed-by: Glenn Washburn --- Makefile.util.def | 1 + grub-core/disk/cryptodisk.c | 172 +++++++++++++++++++++++++++++------- include/grub/cryptodisk.h | 16 ++++ 3 files changed, 158 insertions(+), 31 deletions(-) diff --git a/Makefile.util.def b/Makefile.util.def index c3b7df96d..7d8db722e 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -35,6 +35,7 @@ library = { common = grub-core/kern/list.c; common = grub-core/kern/misc.c; common = grub-core/kern/partition.c; + common = grub-core/kern/protectors.c; common = grub-core/lib/crypto.c; common = grub-core/lib/json/json.c; common = grub-core/disk/luks.c; diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 34b67a705..6620fca00 100644 --- a/grub-core/disk/cryptodisk.c +++ b/grub-core/disk/cryptodisk.c @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef GRUB_UTIL #include @@ -44,7 +45,8 @@ enum OPTION_KEYFILE, OPTION_KEYFILE_OFFSET, OPTION_KEYFILE_SIZE, - OPTION_HEADER + OPTION_HEADER, + OPTION_PROTECTOR }; static const struct grub_arg_option options[] = @@ -58,6 +60,8 @@ static const struct grub_arg_option options[] = {"keyfile-offset", 'O', 0, N_("Key file offset (bytes)"), 0, ARG_TYPE_INT}, {"keyfile-size", 'S', 0, N_("Key file data size (bytes)"), 0, ARG_TYPE_INT}, {"header", 'H', 0, N_("Read header from file"), 0, ARG_TYPE_STRING}, + {"protector", 'P', GRUB_ARG_OPTION_REPEATABLE, + N_("Unlock volume(s) using key protector(s)."), 0, ARG_TYPE_STRING}, {0, 0, 0, 0, 0, 0} }; @@ -1061,6 +1065,7 @@ grub_cryptodisk_scan_device_real (const char *name, grub_err_t ret = GRUB_ERR_NONE; grub_cryptodisk_t dev; grub_cryptodisk_dev_t cr; + int i; struct cryptodisk_read_hook_ctx read_hook_data = {0}; int askpass = 0; char *part = NULL; @@ -1113,41 +1118,112 @@ grub_cryptodisk_scan_device_real (const char *name, goto error_no_close; if (!dev) continue; + break; + } - if (!cargs->key_len) - { - /* Get the passphrase from the user, if no key data. */ - askpass = 1; - part = grub_partition_get_name (source->partition); - grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, - source->partition != NULL ? "," : "", - part != NULL ? part : N_("UNKNOWN"), - dev->uuid); - grub_free (part); - - cargs->key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE); - if (cargs->key_data == NULL) - goto error_no_close; - - if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) - { - grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); - goto error; - } - cargs->key_len = grub_strlen ((char *) cargs->key_data); - } + if (dev == NULL) + { + grub_error (GRUB_ERR_BAD_MODULE, + "no cryptodisk module can handle this device"); + goto error_no_close; + } - ret = cr->recover_key (source, dev, cargs); - if (ret != GRUB_ERR_NONE) - goto error; + if (cargs->protectors) + { + for (i = 0; cargs->protectors[i]; i++) + { + if (cargs->key_cache[i].invalid) + continue; + + if (cargs->key_cache[i].key == NULL) + { + ret = grub_key_protector_recover_key (cargs->protectors[i], + &cargs->key_cache[i].key, + &cargs->key_cache[i].key_len); + if (ret != GRUB_ERR_NONE) + { + if (grub_errno) + { + grub_print_error (); + grub_errno = GRUB_ERR_NONE; + } + + grub_dprintf ("cryptodisk", + "failed to recover a key from key protector " + "%s, will not try it again for any other " + "disks, if any, during this invocation of " + "cryptomount\n", + cargs->protectors[i]); + + cargs->key_cache[i].invalid = 1; + continue; + } + } + + cargs->key_data = cargs->key_cache[i].key; + cargs->key_len = cargs->key_cache[i].key_len; - ret = grub_cryptodisk_insert (dev, name, source); - if (ret != GRUB_ERR_NONE) + ret = cr->recover_key (source, dev, cargs); + if (ret != GRUB_ERR_NONE) + { + part = grub_partition_get_name (source->partition); + grub_dprintf ("cryptodisk", + "recovered a key from key protector %s but it " + "failed to unlock %s%s%s (%s)\n", + cargs->protectors[i], source->name, + source->partition != NULL ? "," : "", + part != NULL ? part : N_("UNKNOWN"), dev->uuid); + grub_free (part); + continue; + } + else + { + ret = grub_cryptodisk_insert (dev, name, source); + if (ret != GRUB_ERR_NONE) + goto error; + goto cleanup; + } + } + + part = grub_partition_get_name (source->partition); + grub_error (GRUB_ERR_ACCESS_DENIED, + N_("no key protector provided a usable key for %s%s%s (%s)"), + source->name, source->partition != NULL ? "," : "", + part != NULL ? part : N_("UNKNOWN"), dev->uuid); + grub_free (part); goto error; + } + + if (!cargs->key_len) + { + /* Get the passphrase from the user, if no key data. */ + askpass = 1; + part = grub_partition_get_name (source->partition); + grub_printf_ (N_("Enter passphrase for %s%s%s (%s): "), source->name, + source->partition != NULL ? "," : "", + part != NULL ? part : N_("UNKNOWN"), dev->uuid); + grub_free (part); + + cargs->key_data = grub_malloc (GRUB_CRYPTODISK_MAX_PASSPHRASE); + if (cargs->key_data == NULL) + goto error; + + if (!grub_password_get ((char *) cargs->key_data, GRUB_CRYPTODISK_MAX_PASSPHRASE)) + { + grub_error (GRUB_ERR_BAD_ARGUMENT, "passphrase not supplied"); + goto error; + } + cargs->key_len = grub_strlen ((char *) cargs->key_data); + } + + ret = cr->recover_key (source, dev, cargs); + if (ret != GRUB_ERR_NONE) + goto error; + + ret = grub_cryptodisk_insert (dev, name, source); + if (ret != GRUB_ERR_NONE) + goto error; - goto cleanup; - } - grub_error (GRUB_ERR_BAD_MODULE, "no cryptodisk module can handle this device"); goto cleanup; error: @@ -1258,6 +1334,20 @@ grub_cryptodisk_scan_device (const char *name, return ret; } +static void +grub_cryptodisk_clear_key_cache (struct grub_cryptomount_args *cargs) +{ + int i; + + if (cargs->key_cache == NULL || cargs->protectors == NULL) + return; + + for (i = 0; cargs->protectors[i]; i++) + grub_free (cargs->key_cache[i].key); + + grub_free (cargs->key_cache); +} + static grub_err_t grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) { @@ -1270,6 +1360,10 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) if (grub_cryptodisk_list == NULL) return grub_error (GRUB_ERR_BAD_MODULE, "no cryptodisk modules loaded"); + if (state[OPTION_PASSWORD].set && state[OPTION_PROTECTOR].set) /* password and key protector */ + return grub_error (GRUB_ERR_BAD_ARGUMENT, + "a password and a key protector cannot both be set"); + if (state[OPTION_PASSWORD].set) /* password */ { cargs.key_data = (grub_uint8_t *) state[OPTION_PASSWORD].arg; @@ -1362,6 +1456,15 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) return grub_errno; } + if (state[OPTION_PROTECTOR].set) /* key protector(s) */ + { + cargs.key_cache = grub_zalloc (state[OPTION_PROTECTOR].set * sizeof (*cargs.key_cache)); + if (cargs.key_cache == NULL) + return grub_error (GRUB_ERR_OUT_OF_MEMORY, + "no memory for key protector key cache"); + cargs.protectors = state[OPTION_PROTECTOR].args; + } + if (state[OPTION_UUID].set) /* uuid */ { int found_uuid; @@ -1370,6 +1473,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) dev = grub_cryptodisk_get_by_uuid (args[0]); if (dev) { + grub_cryptodisk_clear_key_cache (&cargs); grub_dprintf ("cryptodisk", "already mounted as crypto%lu\n", dev->id); return GRUB_ERR_NONE; @@ -1378,6 +1482,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) cargs.check_boot = state[OPTION_BOOT].set; cargs.search_uuid = args[0]; found_uuid = grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); + grub_cryptodisk_clear_key_cache (&cargs); if (found_uuid) return GRUB_ERR_NONE; @@ -1397,6 +1502,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) { cargs.check_boot = state[OPTION_BOOT].set; grub_device_iterate (&grub_cryptodisk_scan_device, &cargs); + grub_cryptodisk_clear_key_cache (&cargs); return GRUB_ERR_NONE; } else @@ -1420,6 +1526,7 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) disk = grub_disk_open (diskname); if (!disk) { + grub_cryptodisk_clear_key_cache (&cargs); if (disklast) *disklast = ')'; return grub_errno; @@ -1430,12 +1537,14 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args) { grub_dprintf ("cryptodisk", "already mounted as crypto%lu\n", dev->id); grub_disk_close (disk); + grub_cryptodisk_clear_key_cache (&cargs); if (disklast) *disklast = ')'; return GRUB_ERR_NONE; } dev = grub_cryptodisk_scan_device_real (diskname, disk, &cargs); + grub_cryptodisk_clear_key_cache (&cargs); grub_disk_close (disk); if (disklast) @@ -1576,6 +1685,7 @@ GRUB_MOD_INIT (cryptodisk) cmd = grub_register_extcmd ("cryptomount", grub_cmd_cryptomount, 0, N_("[ [-p password] | [-k keyfile" " [-O keyoffset] [-S keysize] ] ] [-H file]" + " [-P protector [-P protector ...]]" " "), N_("Mount a crypto device."), options); grub_procfs_register ("luks_script", &luks_script); diff --git a/include/grub/cryptodisk.h b/include/grub/cryptodisk.h index d94df68b6..0b41e249e 100644 --- a/include/grub/cryptodisk.h +++ b/include/grub/cryptodisk.h @@ -70,6 +70,18 @@ typedef gcry_err_code_t (*grub_cryptodisk_rekey_func_t) (struct grub_cryptodisk *dev, grub_uint64_t zoneno); +struct grub_cryptomount_cached_key +{ + grub_uint8_t *key; + grub_size_t key_len; + + /* + * The key protector associated with this cache entry failed, so avoid it + * even if the cached entry (an instance of this structure) is empty. + */ + int invalid; +}; + struct grub_cryptomount_args { /* scan: Flag to indicate that only bootable volumes should be decrypted */ @@ -81,6 +93,10 @@ struct grub_cryptomount_args /* recover_key: Length of key_data */ grub_size_t key_len; grub_file_t hdr_file; + /* recover_key: Names of the key protectors to use (NULL-terminated) */ + char **protectors; + /* recover_key: Key cache to avoid invoking the same key protector twice */ + struct grub_cryptomount_cached_key *key_cache; }; typedef struct grub_cryptomount_args *grub_cryptomount_args_t; -- 2.35.3