Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1petZk-0003hn-Px for mharc-grub-devel@gnu.org; Wed, 22 Mar 2023 04:12:04 -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 1petZj-0003eT-7O for grub-devel@gnu.org; Wed, 22 Mar 2023 04:12:03 -0400 Received: from mail-am6eur05on2081.outbound.protection.outlook.com ([40.107.22.81] helo=EUR05-AM6-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 1petZg-0003Bv-7f for grub-devel@gnu.org; Wed, 22 Mar 2023 04:12:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YeQalb+k5IVHSqvGtn9KlZdm1Bc8XHBz59gU6BAAFT4uAnEdEiX9VqQUpNEriRgLUAhwgHh/qqi7YuEn4ZLtW2TEIhLqsbE7WDe6DBEs3LS6/F1w/1MxXXMlwhWXT8P69tNY5T6yQAMp9AlIEghcPBHtX/cdupb8/9X79eslfQy6vxnbUDKTpRBRvE4N9Qh4lrfZ5F8RZzOcV05sUYLrV1Ze/PgZeDpuYMNdf970rW1jF12bAakupFXyY7APb0Y8euziZ975pPQhh6C0gPjj0AtwuWleXUiZ+VoUko5TH3ZnDsDL9nUxujb1FWJkmLKLKWfh/j7LgGUXbfifVZfS8Q== 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=8ZNYECh+4o2QoGrEnCncslLdn7prfoMbYx3syKQZb00=; b=DnNJyAbkNGW6tzR7hSwyMM+MHkvUiyRFspriz8OnjY5j0yvRk4oBv6oJBFuaMHffi33lgDB7LL57tOS0hTfU0UTdyb2VAzucM6l98Eunq6sB8FHqdH4EUK254CkC8xi05tMD2YdziQeKo2TXvdbPRJFjC5FovsBgDTT6qYGSo/RrrwQyPkJVI/HK42j8tENkT8JLaGC370Lv3XVteZauyhRu1f4fAGol19D9D6Tv/6rPG8xdhp7A+jaD7hoWAO+kGYE0/0pkVDZxEjvFYjroRHMHH2DRlSKIxXD5/+nXjGLVwjJu6AkxQrqDNFh5EGpOGuEYNaaXURZXQWcIW5L4fw== 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=8ZNYECh+4o2QoGrEnCncslLdn7prfoMbYx3syKQZb00=; b=ELnN/50MG+havOvID21pzJ519iLq8/iUxsOpDYty51HewmjO/0sVH0zd7tKGp6cUYqrCzYdKnfu1/485cmmS6nSb3dHjPHG5SRvLnjpBaXK93L86hgNlhxWL7mA+RvQO7fL3IqNUMkU2YKMv0oin11LpdA614iPblRk+cT1LjNTZDQpfKt1+MX2HAU5gQyfOH2H9rpH0SVyqP+5Qg9GbsMHln+lVyAZ93rqyekvR/d7+VCmLhv5JJ2vcvBnpnk50J/9U0NN8vlZ6B8kC25VyX6t3Iky1DQxxXnxZUJUkIMMF0Brqdi7VcofLcv2GEpJrFqsp34NblnzidQ3KtSNdwg== 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 DU0PR04MB9585.eurprd04.prod.outlook.com (2603:10a6:10:316::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 08:11:56 +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.6178.037; Wed, 22 Mar 2023 08:11:56 +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 v2 10/11] cryptodisk: Support key protectors Date: Wed, 22 Mar 2023 16:10:15 +0800 Message-Id: <20230322081016.12075-11-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322081016.12075-1-glin@suse.com> References: <20230322081016.12075-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYAPR01CA0224.jpnprd01.prod.outlook.com (2603:1096:404:11e::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_|DU0PR04MB9585:EE_ X-MS-Office365-Filtering-Correlation-Id: ec4fda2b-e0f4-4744-25ac-08db2aad1a99 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jLMJNltNMiKyZafum459EJ3Rfq44XKJGJa2T5d/iBiLUtcDblus5jZUnsJbRdKVmBLXcOgWtRNrBOHT85WkZNdsHiCNCEi9JnVhge0FhmIWiQlWgMxYC2WM0nv/JmR1M6ZTkfx5daC6B9JxRZT6p2fzOkBKAZmXDY2fihrd0qvXpT99RXVMG8AlGbOZOqdI1OVhF17+CmhoL4Bm3t8PA8/F1YBDvccK8ElJ1icTumXzZt5b7vIofF9t+KLi8cbvDw/zkYiBT/fdiqqbxXO+4BYxIqcra7r12u2jVxdE8h9K7eY2Hp7WaH1ZsTmUeetzcrEFUXEp+9Ngy41qcTYOU/xKEvk9gx2U+uJ+Bbuo6VCeALznE8jwEqTFhHksfZfrfz+Micu/fJE0RqjBxWqRjhcDNBsHlZSy3ukEv9jTZ3QR36IBMzIlkFO2JsjglujFy1TZ9zqyDEKuz+gqhQeULN02AM26OrybBzg2dO0rk5ZLgfOliKH3eZ9uBWR9oky5fp79IoYBbkrl8KVenC9xDmNn0EYQtGSZ0aTKtJ99RBdjjDrmEprPL3abPbD/znseyju7UenyS+3cc7tcrVQ4/a5SXHAp4bQdcRb5QSL7CwK1q3BQZ7sdBw9Qf+jAkB0ymWYDz6H9HkwcVIafr9IhHug== 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)(346002)(396003)(39860400002)(366004)(136003)(376002)(451199018)(478600001)(2616005)(6512007)(54906003)(83380400001)(86362001)(38100700002)(66556008)(66476007)(41300700001)(36756003)(8676002)(4326008)(66946007)(2906002)(5660300002)(30864003)(6916009)(6666004)(7416002)(1076003)(8936002)(316002)(6486002)(6506007)(26005)(186003)(107886003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pGvMnkY7XtJPPm8SdAG9Bp5BiF2tJjKtL097Ixy65tCjLAid4Xox+5oxMphp?= =?us-ascii?Q?+mH9bsK5iSiL1gQ8e3YhJzrJZ9wIb+8qwhohgf+oyAZTW++K7tYmyZ1V66vy?= =?us-ascii?Q?GgsbOmFYCdIWSaM7UAelhyIMtYsC2l0Sgd9iRJ9BuN7IopDTvbT/9tGFBkZa?= =?us-ascii?Q?qwzWOjAzvdQhDw0gqcCdjnAZwfkeiYVbMvIzp106R5iokzjccu/JXOmmV/rx?= =?us-ascii?Q?GgpUhTWR7fYBaOQGNqgr7w7n0uXb8ZkV6A5MfnPKId+XQg1qK8Fttn0FbVeX?= =?us-ascii?Q?rZXaihQtXwbT8ULXoxqE/noiHZL9ayCDNJQXkF/rPh2ccxC8q6GsksjG6p8y?= =?us-ascii?Q?d2tBwAgrPx/ZymcYs2Rb/0ZdWd7ySDTiiUh8fw/bH4kAT0hpu31H+AfgxD0s?= =?us-ascii?Q?ofSUqJPw/toDUi+8CnbU1RW0tbkECn10L5JE6nffkkgV5XgbWxPhzdV8rKXb?= =?us-ascii?Q?9uuq8amt3Qzdx6W7ALYPhdwXIQtIJFI0O3hnP1YxRkRdcOGMuUGVKFaWjTMa?= =?us-ascii?Q?gPNza4f93cQa8XbuymO/7wYpswCPUp5LwGSCUHkaliW2KOpAH4UqQ7TYeWGD?= =?us-ascii?Q?jHCjw+lfyzoeiOub/3li5fjbcAobkB0FW6GfbNIeMl09bIdBFRkpc0/ewdQc?= =?us-ascii?Q?ONQrLiUnnJ24sxnD8yLyyZedQ8e8uGoB4zLPowfDk4/GS7KVtNRssX6mUh80?= =?us-ascii?Q?1zqrMbEFPXq8WK0VdjOwAql5TzX0DvcsDjxwuklcUP9TXT6PeMtX9FRbTLrO?= =?us-ascii?Q?xirP2dDTUf3lBoZm1nig9Nf9ityCgmSPFNFAm6f5YOrCjyS/oTs6gswdq4tG?= =?us-ascii?Q?VmN8wHW0AUOA54BJnewkC9G4/vl1mrkX/NJKrLEBuDQl4oofyJlUF/xoaSDE?= =?us-ascii?Q?D2ZlW4EsTM3V7ORP7gNSl9ctadLrHmeNKuKgI/1OsgWhPcC2fH8e+1zDJaBc?= =?us-ascii?Q?ijsTqFU1xKQSnd1JpDQefO2rnEgsaWoZ7jAcbzofh/qk50k1s4itzZ3zglqG?= =?us-ascii?Q?mDgKyAemVnzDbd7whlDpX0s3h3Qa8iXKdgSencQhilp+/YWow2DU2xCnPrBJ?= =?us-ascii?Q?iNVsqr1G0Dz7xYeIuwCANK1slAV4cNwTOMJmZ/QJ3fcH6iXq2Tj5XQyTDSS3?= =?us-ascii?Q?gpfl3F3A1orVAcvPaUYlSXJlLAUcCE2yeF/eS+poZSRlINeID8hvmWDGQxFD?= =?us-ascii?Q?LH6E0W6ndqey/62fxsj7hiLbGh3DDbVFbt5OMm118LNq21ZANGNFxo5q4gtl?= =?us-ascii?Q?L8b8FzTrK1xwyFJe85RthTkwIb7Emq/Ww75/o9jTbyykfyUC0nmdFsKbFuBA?= =?us-ascii?Q?pmc7MbZ7kzbLeT18ffiyDCsKEEF2gUfDHvgr2GvqWn40y5j67LVpFBbzjNzJ?= =?us-ascii?Q?TTPPT+BTUaKMPH9Lf/hPaznk700mdsx7sMx4sxdtrgYILyWQ0+XkOWGE6K6A?= =?us-ascii?Q?wZk5j9dJH8/5eNa1MER5cH8jOnQwqQTJfmQhPHL8h79IberQFcEf98rnZOgu?= =?us-ascii?Q?pXNbyzBZ5xC9WLHzD/8pl/ZdkclIvt4C+qbauu1VokXJF+UrURa5/ILsSF7b?= =?us-ascii?Q?+spMFkkDARR3a8UnNv0/0DD6gVArK37HcI8d3S5W?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec4fda2b-e0f4-4744-25ac-08db2aad1a99 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 08:11:56.8572 (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: UQr80UDFpgLJcj682nStMoHja1T7zRXYf/Ml4xnPUXLFiPwFgVAqPIQzqv+9NZzj X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9585 Received-SPF: pass client-ip=40.107.22.81; envelope-from=GLin@suse.com; helo=EUR05-AM6-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 Mar 2023 08:12:03 -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 --- Makefile.util.def | 1 + grub-core/disk/cryptodisk.c | 175 +++++++++++++++++++++++++++++------- include/grub/cryptodisk.h | 14 +++ 3 files changed, 158 insertions(+), 32 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..c5974399e 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} }; @@ -1060,7 +1064,8 @@ grub_cryptodisk_scan_device_real (const char *name, { grub_err_t ret = GRUB_ERR_NONE; grub_cryptodisk_t dev; - grub_cryptodisk_dev_t cr; + grub_cryptodisk_dev_t cr, crd = NULL; + int i; struct cryptodisk_read_hook_ctx read_hook_data = {0}; int askpass = 0; char *part = NULL; @@ -1113,41 +1118,113 @@ grub_cryptodisk_scan_device_real (const char *name, goto error_no_close; if (!dev) continue; + crd = cr; + 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) + { + 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) + { + ret = grub_key_protector_recover_key (cargs->protectors[i], + &cargs->key_cache[i].key, + &cargs->key_cache[i].key_len); + if (ret) + { + 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 = crd->recover_key (source, dev, cargs); + if (ret) + { + 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; + } + } - ret = grub_cryptodisk_insert (dev, name, source); - if (ret != GRUB_ERR_NONE) + 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 = crd->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 +1335,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) + 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 +1361,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 +1457,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) + 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 +1474,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 +1483,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 +1503,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 +1527,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 +1538,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 +1686,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..ce18df883 100644 --- a/include/grub/cryptodisk.h +++ b/include/grub/cryptodisk.h @@ -70,6 +70,16 @@ 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 +91,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