Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pUj8w-0006zc-Jf for mharc-grub-devel@gnu.org; Wed, 22 Feb 2023 02:02:22 -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 1pUj8S-0006sI-V8 for grub-devel@gnu.org; Wed, 22 Feb 2023 02:01:59 -0500 Received: from mail-am6eur05on2057.outbound.protection.outlook.com ([40.107.22.57] 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 1pUj8Q-0006lx-LO for grub-devel@gnu.org; Wed, 22 Feb 2023 02:01:52 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLMk+lBqGx0Xyb0RG64acU/vyVpG48ImBZE3mx/wAfzHf8prA12yQr+dxNJ3u9flQRlDfQfv4QOGs5nGncLxYRq4PCwlL0IKCU0dflKmDS5hafXK9w21iLA1nmDzFy9TGyu3C80Ubm5wFjw5djvJLPH/wvo9LczNf183bfwJFAs5ltMHYHjOEtTy+AN/RLOcVO9Fmvk9yWKNpS43zA91J5ine2dlU6LOMshBGn91lXSs6wg3Sd4YjFqVWXKRvQv+ij7SoP6Jkc7+/GFFfti2jLA9igF9HQmrut93yO+AAaaaAgS4qCSMf5778YhmCnpDW1cVMyejXC94jSBbNnaLvw== 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=WXXwTW0q6Di9TBjCqkU+W0RmyLIp0w7ttSYJU8tohD4=; b=Paf5ciM3G8SAqL67xlHPD8/R79MQLPfxt4aBbUhXNvvsXRhrlnrK80dW3AhctArgI9WxrLuS2Ypjmygm4/RMBfBVaATzykx/ypryF5J35bnWgBaTnIX24ynwNEspSDxfUUlZ6WHfRQGGQjBk5D8Lza7VCUgJlKO3YUXIBYK9Ke0l3eoSJuDv9AtU9XuTk9EVvggBOLIb+Sf6mtAujpqFFfexAxIbPwnHc6/kb87hO5TpJk9WI0NKVnSb6Nm9+HwoZqaODn2nkrs16k6fBK8oUKzg1N0iOlZLARGOuuwcrLW2JkDjn76lK4C3CjxEgHt1GJ2OSo3x+lseRuZoC0z5Qg== 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=WXXwTW0q6Di9TBjCqkU+W0RmyLIp0w7ttSYJU8tohD4=; b=TWH/YjcPr6vEvzgUaCiFoTi2WpuMSmmC9neY0/hGTtW3HQM5YXf9Hou13sUn+3B8Rktfx1aE6ZbmNENF4wIlQuxNrcDE/AYiLgsH4BlT/MHAz1+F8pEx++yq10zE6NQwgN0xEKNfwo+JD1wwdlHSfjYS+IwJlFc/4mWyTE4S5pSNBzgcZf6UwKpHXyOegm9ci3wXnoOX6VSON8hg+F+QVtodmRIBsdGRrl89NqY9C5WsaX9AB1opdb+YZqtRxP9xxfkvgPxTHTtB07haYghu3LaN+rUtrcDVHHRrskUdCXK4INXdR0LoIUK0CJP+DvVEF9euirICm5B/pzghDvkrSw== 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 DBBPR04MB7980.eurprd04.prod.outlook.com (2603:10a6:10:1f0::12) 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:01:21 +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:01:21 +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, HernanGattahegatta@linux.microsoft.com Subject: [PATCH 04/14] cryptodisk: Support key protectors Date: Wed, 22 Feb 2023 15:00:44 +0800 Message-Id: <20230222070054.5122-5-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: FR3P281CA0035.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::8) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|DBBPR04MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: 52c5fe27-1e41-425a-4f86-08db14a29a19 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: beBBPqkp43KpxuQFL1Fb39h96Rsej4z1fba65xJBm/FvukgnG0265J3rY4sXwJRz0EgALafkkc6jqZL5gSzoKgq6EYPo7xtt4JtZVyGbhNmwkea11N+F10aNwn4tpIT6Ts7mG69IN4Hnsmk+RrDp5+bIEtFKOQ/ILwrLrBUpTB2OqdEbOjtWuJnATobwbZbW0W/WcaehMiAr9TvYURem2jJPC9NC04YQhhBdiXeBM+6hgnx/5WkGoh3jSosKjdfaky4+Nkaj0BrSph5koj7RJtfw/wyh4QnkyghecwwuOZ/cygF1Qu3zDcYEA+Yoqb7ltYuyhsvYPRytBsX/P4q7nsVVkb/uRiKqKfOhZu2RACjaffIP1ErKBqg94XiQs5zLKGsJb/sryi+qwddm/79AwbH0Jxv0UH2RYrrD9lM/PWNcj8Y6PhhX03SjZCVWJy/tH5ueFdvbJF36Jw8/UupSEmduFSfT1ZpC1eKFq/VIFlYpRU9PE1iNF34YS/Xe2nPVA+mE8+Vdnb7O/EEKO8+00bsndPbW+eItgZyOvxsvJEPJzsOMP08T5XHMU5uhDPLmyHDMUiMgAtkezeoGHUBrEReAQdcibLfi2qGJqd9Pf4LKRsVWuGj81l+UauFHmWxYfzPV2uGid05zLDMQpPE+1Q== 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)(376002)(396003)(346002)(366004)(39860400002)(136003)(451199018)(316002)(83380400001)(54906003)(478600001)(38100700002)(36756003)(2906002)(86362001)(30864003)(66946007)(66556008)(66476007)(6916009)(4326008)(8676002)(41300700001)(8936002)(5660300002)(7416002)(2616005)(6486002)(26005)(186003)(6512007)(6506007)(1076003)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Cwwtn/uLKcXq+2mdVaa9k+JkgKBdT3yc6dJq6p5gHIoUmfM+gRjGOcma331E?= =?us-ascii?Q?aMb8az6/FxXpFdI/UKYLDMVpRFVPGwfk7qo2Txg8odq/zbPd7ZEqxCJuAu7n?= =?us-ascii?Q?bQeoUGl/nSeXGpLf09zt5EGCRFBmwXIZ7GBp/Jr6GVfZg2wwR+rSgeQj7MlI?= =?us-ascii?Q?RBm+qVVyKbGu8j85+jPANMNz6FvHKz52CNHpGemkMaA7XV9OejPaKgukOHx1?= =?us-ascii?Q?21dx3CNHQpgZNfqxqnaZeAdg/oZDJfhyuQViFwfA0osIlSCRGRgiVKB80ofN?= =?us-ascii?Q?BoMmZ+55Jcj/DT/M1qkHRSDJyMICJa8g3qfbR44kG5YGdvHkzttpBTFV7Pp6?= =?us-ascii?Q?XzI4h54C9/7KL9Taj7eSjaDbVeXxscA4TUF4wu1D4NIgEPawFKc8By1DbFBY?= =?us-ascii?Q?oO9joaaVJcLb+Gw0i7L3mtEYf5kpsjVVvTOibDEMYUX2pWn3yeYnOaEPQHOE?= =?us-ascii?Q?GLQtRLtD2y3CnEowC0EWNgXcPFZ9pq2t6XgpdYSNJe6RHjQltAVJs07EgCCG?= =?us-ascii?Q?OjYgMcCxwvubG839fra8UO9sp2NwFZdvDHhDFd36T8LaqP7Ycm8cLM7l2xwD?= =?us-ascii?Q?cAOk62pVtuvzxXDFP2S60I6mq0nUwkVSCQACFMqrP5oVcYdxI1b2GnZRTPNi?= =?us-ascii?Q?YNXZQtjCjgJXN6+t4l5IGzrb5NVapYeVVoqJp5HsxRtOWL6H0ZbEpiEplVb9?= =?us-ascii?Q?02eFza3lGzDDu/akcUTBuPmFDTJsM1VWnifFkBD89xb2NfkOVXadgjO4s2A3?= =?us-ascii?Q?VRLLjpNvfsfWF2wdlb+MdVz30YhTQZolbb2uzsvb1zGKOLQI8nhumlOZxTDW?= =?us-ascii?Q?CuBQWQb4tdlDDINkOPmSnmG2EOV/fC7ppzxwwPRy/v4hfPHAurT8I0gWovBp?= =?us-ascii?Q?h+reUS+cpueSorXeoslsbSCOB2tlhf3nqeo4cO6bUP7m65iTPCUwhzdFXlJG?= =?us-ascii?Q?xAducitTx6AumH8dK8iHEITW+iEkjJfHySpalufsZPGOMIvyR0nSsNVaLYjq?= =?us-ascii?Q?67K9od4p208IWZvRU4ixBO+HIaQPJR2fwJHPWfHng0onW0qmAYUfNl2I6CD+?= =?us-ascii?Q?JljzpV9FiawbGugQvE5RwhjoA6cThQ2sVAmcaIssWVfp91p6rNFGM1+njTHc?= =?us-ascii?Q?BONRpkTf0ele79c3B1VY5ENRFepgnNtNfUKkSmcRbrVGrMZq4twBkExDOeI7?= =?us-ascii?Q?orj2V1HbF6HFwheJgWmvZQS0cF5UcLFo8g/sf06sStMMbuyH3Pox2Yz3Ebih?= =?us-ascii?Q?+DfO8h4ldOG6TUq0xWtzhA+CUWWSVDSdUKwxYHaTSc/+/l2Wn7/suaA06IfA?= =?us-ascii?Q?inTzewW/F1b7RvRTqo1B4J2OVnXiLOC+nNWd94U51J20CfWvwJ4FTiyl+amB?= =?us-ascii?Q?FRDeLc2kB2hoVijtyYq9pwWo2XosxG6Ly23YaEYIQ9a190fG9V8I+3x2ocyL?= =?us-ascii?Q?U/ppAfdyEhbby1sQ5jfqi1lIV7lZ4T+Au80DkWW8GSFkLlqTgUrCbD0r+Vlu?= =?us-ascii?Q?Y4BZlgW8POByT4k28ym3h4sD8L6QzXVfHdefbM3tPmJ8P6C/c8Fxao3DLzrx?= =?us-ascii?Q?eoTjEJT0/2NTB2/WQkgSoQAX+FdxRlAQh+W3U1dk?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52c5fe27-1e41-425a-4f86-08db14a29a19 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:01:20.9570 (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: GWi9rkzHsy8Xb8dZ+4a2emx/SqecsWi2vGJ8vlxdNDFOUWjYlXW8algpu67deaCq X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7980 Received-SPF: pass client-ip=40.107.22.57; 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 Feb 2023 07:02:00 -0000 From: Hernan Gatta Add a new parameter to cryptomount to support the key protectors framework: -k. 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: Signed-off-by: Gary Lin --- Makefile.util.def | 1 + grub-core/disk/cryptodisk.c | 175 +++++++++++++++++++++++++++++------- include/grub/cryptodisk.h | 14 +++ 3 files changed, 157 insertions(+), 33 deletions(-) diff --git a/Makefile.util.def b/Makefile.util.def index beaef1168..1da5a826c 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..c990d5985 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", 'k', 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,112 @@ grub_cryptodisk_scan_device_real (const char *name, goto error_no_close; if (!dev) continue; + crd = cr; + } - 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 +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) + 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) + 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,7 +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]" - " "), + " [-k protector [-k 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