Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qEvz0-0002JV-Oo for mharc-grub-devel@gnu.org; Thu, 29 Jun 2023 14:03:08 -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 1qEvyy-0002Ip-15 for grub-devel@gnu.org; Thu, 29 Jun 2023 14:03:04 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qEvyt-0006If-HO for grub-devel@gnu.org; Thu, 29 Jun 2023 14:03:03 -0400 Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35TH45hB028509; Thu, 29 Jun 2023 18:02:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=corp-2023-03-30; bh=vf5M9u1apcGwCunwp/MyyXGdpI0UNLWvMR/TwQHTd9o=; b=DC5FvAtGVxeD5k+7aGnuQ9WC7avXAKdovE6sq86eAuPpzeymDgbA3r65W+B2Lwa5EDlb mALs0pQ8DoZWnL4jLtY3RkCEa/Y+87ADVJ7KhrnA9soZwUld9AzXwuQ/X/0tfTl0jGNf /qmJUoV9gFCMduvP4NOJ/r9Uchn/1bhqxuKl/co1PK4bDWTxTX9MJCO1jiZ0FCzmP0B9 hjsHF8xtErrGQvdhw0aTmk3OeoaRlaDuTY6pUJulxgJcyeO8TpZRn3xF+bF0n26K2YyB Y0/qEvCgPgMDrqenIg5SksWvSBqyVdYTg3T8EH0nu8IQ28DiBJBDp2ajZVrqm+h7JCfn Yw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rf40ebmcs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jun 2023 18:02:54 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35TGOCqB003980; Thu, 29 Jun 2023 18:02:53 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2100.outbound.protection.outlook.com [104.47.70.100]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpxdrvr7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 29 Jun 2023 18:02:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=julEwIPU1D59dtX10QaUzNSWayKXEgc418b6EcG5RdZ9Bug8QuAKNCvNn2corZ2Nd4xpbgxCX87yipQJHGDeizogUpsjHnZAk2v/BgHT1x7AaoTxXJrdW2dS8SQaNW4WM79YdnWw4MB5kArCl909FHhN2qFayy1EGWkxmeevMoQhIpiZWn3yczXv7psBO0X8Zpyj9DEvBUHwolPom3RbeLs+ZExnQMtqklOaILyNbLYMOzs6hEwAPhNPmpteTgWmN0hL0Skf42iiroH+zE12MkUeV7fb/Z684UQnBUh/Ub5o4XsqOFZoYQAoQfi3EqvFdylDHYFu9yNtDFYSntYsoA== 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=vf5M9u1apcGwCunwp/MyyXGdpI0UNLWvMR/TwQHTd9o=; b=XlGPEBtNbMBm4Uso0pG/558oGyIF7A3yH6Np0F/Kw/KJZMWBbdaT5a7CphSIdMxyH6uShSJ2CFG8cIrHXqe195RWhfaq7giSZeLrqHfqt7e+XoJrhqGzz04JNkdm1WmMSN3c9+7j9EmZO3CgtltpoB+wXkAQyLvvEs8n7fS7KRRH9hHbZiXh2KcaSFhIgIClKwVSb6lsEiNy0GnLcKtUa6bF/a4d84TEXCnapFaohcIInNLQk3JEkg6va8JoLYB+KYAGm3QPBaI2p6OEe4+VBy3qDK5xRLBMd7AI7Ri08wQ0breFt4uu/A3F6uFhz0kKazCrNHYRxHCZg8y8lXEEvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vf5M9u1apcGwCunwp/MyyXGdpI0UNLWvMR/TwQHTd9o=; b=y1QteAS6bn020/PL61xeewNIyMo3XeJM3nYsGpiiYWShXE+5BpCz5B4HP/7O1XzhTZRu4pc1YyHuPKQCjOkY35s5Vki/V5tVV/WM68ew7d3H/u9TLND2NJW3Ou1a16VoKb2SAYQOl4z2DWgHDmRzEXI9p3ZoYEbrqq1eDk6ezss= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by SA1PR10MB5687.namprd10.prod.outlook.com (2603:10b6:806:23f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Thu, 29 Jun 2023 18:02:51 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::86ed:de25:a973:cae6%2]) with mapi id 15.20.6521.026; Thu, 29 Jun 2023 18:02:50 +0000 From: Daniel Kiper To: grub-devel@gnu.org Cc: ardb@kernel.org, development@efficientek.com, dimitri.ledkov@canonical.com, julian.klode@canonical.com, mjg59@srcf.ucam.org, pjones@redhat.com, rshailu.yash@gmail.com, tobias.powalowski@googlemail.com, thomas.frauendorfer@gmail.com Subject: [PATCH v2 2/2] efi: Fallback to legacy mode if shim is loaded on x86 archs Date: Thu, 29 Jun 2023 20:02:32 +0200 Message-Id: <20230629180232.1023-3-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20230629180232.1023-1-daniel.kiper@oracle.com> References: <20230629180232.1023-1-daniel.kiper@oracle.com> Content-Type: text/plain X-ClientProxiedBy: BE1P281CA0027.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:15::18) To BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN0PR10MB4822:EE_|SA1PR10MB5687:EE_ X-MS-Office365-Filtering-Correlation-Id: 65792f80-57ec-4f51-ed04-08db78cb0d70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n4lkuZea6M8Nge2SccSF+c7O1sR4V2hV0M+CF8hbKjWD3nESNtJHuYdiHB185+caB27pQPfWsqf7DyBHkx+G1nH6PJ2RiIydAG00ACTl3JJ992di8r/ZToiYQfw+Wl8KtGpynTn+bvK7V5Iu3wG97nXmag7sRc7F8yO4nfTpVK3sWRJv6YQu1GrEMRQhUtiC2UAYEl9M8FJT8znKbeoDoC6LerjfTHy0MLLy5O3LRpFNVwqCtR8q4dCO8bwG1gksLelOA49yAcDkg5jP58kGRPDzhQlcQ+izxiy4kSaE0UlEmxsSl2bCbC5RFPNPL/1CeSwzOnyrR8uvchhNilcuzC61BUAb9PV5YH8H+zl4xYpXr00rmPBC1RLW9eZ8zUckqGU/28G30DFZUsjJzRcpd0x3mfM3c8+J6hp8J3zLbZAED7fK5HTmRv9xIxEqP/ZwPvublZ0yiF+gk9RaHxOYc9ZTFuHxrcUPz5ifi29BfB6lFlKuNgF9YCa1MhNWTzeYF2XXAZoEzMh0JBk1y5pSqpOsbrxrvgrRrlUQe6zTEteTJ54UD+sreWM/Ti6nIozm X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN0PR10MB4822.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(366004)(39860400002)(376002)(136003)(396003)(346002)(451199021)(6512007)(6666004)(2906002)(186003)(6486002)(86362001)(83380400001)(38100700002)(2616005)(26005)(6506007)(1076003)(41300700001)(478600001)(316002)(36756003)(66556008)(4326008)(66946007)(66476007)(6916009)(7416002)(44832011)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Kiltmf2wi7japzPivTcJs4X77m1fnEgLGwfsyp8qhUMtqiRmRtPqRySxiyJQ?= =?us-ascii?Q?uhEuhvUMuwWeCiNn7JRjY2AClKpTcVGNdCa7sfagN8vklSaq44ydtqbghyaA?= =?us-ascii?Q?wWXTTfibYeyQZns7anFNo2zQRAJ6Hdu+f7Cm4zgq9YRiI41fHaT5zRh2XXJQ?= =?us-ascii?Q?OZG1+wlwIh3aGbI/c+WY2hyvkXaRaHTBIzDWL0CijmMXxOFEH0sX4Dx7M5zn?= =?us-ascii?Q?FqcQNwMN/az3e6bg51s6f/Ixrj/JAvjapYlZY3MJAikeYbA88lAZKoYFc2jE?= =?us-ascii?Q?wL3P+xyEc2igpCSIEqXQEvaxJmgNYJM8zmOW+HRgeeJWIOmsfPecWUkrJhnV?= =?us-ascii?Q?5+EK50wYRA8u98bab1et19T3vII1FnVaeyYno5ub9VGsBkPeBKOHZbBlJln7?= =?us-ascii?Q?xnPJmXSj83Vk2+u3bhEW6OlHW3YFdur4/6eRiYpJKmLlbgqLPtxcUGXlcEOE?= =?us-ascii?Q?L7cbH/Zq9EiyBjeI3BX0c/o5TTizdb3xne5OfFZFYzdk+oZtsLiHj16Zd/BV?= =?us-ascii?Q?OPlSfJkrdaaNpTmwXmzKq2dH4aTRSoXE59X78cRfx+jDCTGiFkBg11ROsDps?= =?us-ascii?Q?0WAb7XmJyiay44yWJ2EXJZl3OPuB5DztkvLFTz39IuqXPxqH60MsPa57Ut/Y?= =?us-ascii?Q?nKFQ56KsK0HR2EqtZ8BDSRvYlQVIOUfftFDoHPslHJoxhhddgFV2Sl9k/CAh?= =?us-ascii?Q?6sqb6TPo2YSMYgN8pTyco47SnMBgFBtmEEq7IeCsk8CV9MJOvQF9O+IDuvsC?= =?us-ascii?Q?jfOUJdbqeG6P2Olxj7AGQ2f2MJJhlQSPDIG7gWqBoKHtzzNUvHG/OytfGecN?= =?us-ascii?Q?L0HX1NUGwA02djuSvLJ325khJVoX7DlgeW5QJB7bweueLsy281Ot2ylRc3bs?= =?us-ascii?Q?2MJtEPAeH+lvT/0T5uXPGDJGXAAGtMT6cVX3tT+Lra5yt49WoDSteENOy+sE?= =?us-ascii?Q?ff8Upurwz2DwoCeHnBFm9gSRuTxzI6kKyieo7HpC/usfEOlsxB6RZsBip9zc?= =?us-ascii?Q?Yi+Cv1gyh+yjjUeIIwolaRxejXDxl0nzqGg/41Qb2ZUZxyh3xPCdsUo10nYD?= =?us-ascii?Q?nTcbX72ilPMof1Wg0z4CqK4wU3bbHTuhreOH/92WIMLqZD9mvWBzvlNV4wGR?= =?us-ascii?Q?RvUjRpnqIl184gpaeUJStB37YDy9gEOiGhhpKSCk6vI51ir01jeLjbxhiNT+?= =?us-ascii?Q?FbaTDTcZ6l4Pq7sqXek5vnCFES5/PxnkhpIhQYWdYTkVYViPPO0NaooFgd+/?= =?us-ascii?Q?kkJrrwqSaTG5uh/qF/2SmsJhOEEsZiZYEGtxALp0Ac5lEwkN6l2s0s87QZwd?= =?us-ascii?Q?BdeDZgqSnHq3xGjTWdzbHhA89KNxNZaHZZnwear/CCL6tlA5YaH1XYttM0GM?= =?us-ascii?Q?DKBUtCjuQI0put99a6IXUFNOMqjx8D2JfBQmpRlh1EhOUbgBP2V4PKfkH4sj?= =?us-ascii?Q?5s0MnrC789nzRTFpyFHrL+uRkSIWc9bRYCvKa1qW0HF5JdU7mGcHnSdhyyiF?= =?us-ascii?Q?SYS0zfgK+82kjG1b7Uw5XMR0jdboDpDO2Znye0wlhgWElYifW7i4rHxQrxD2?= =?us-ascii?Q?MaATMiXLVIx+gOjyZ3KjNWyveD3ldBMPCIbdo/Mz?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?W6TicW8+UB+q/jE2Kp+CkKFpgCZdf4QHykONaP188vKbaYFJk6UhP4GgO8Or?= =?us-ascii?Q?ByGkC6PGWlci0KQu3L1yLi+Xk9DTJ+4OBCcvOLHeHMnMo85Akw3QunZn/Ejy?= =?us-ascii?Q?xNpcWHQ6t9BrDikIw/eVNNPxK6lM9JLXh0d392Lfh34NEo/XSPZLbam0rQ2C?= =?us-ascii?Q?lSOYkVQ/2zLZ0Fm5yDC6AK3M303EMY5q4QKJ1304LrlSVCM5hfL8IgDeHtzm?= =?us-ascii?Q?v28QgXU5lLqX7q7VmkJVPxAHay3riDQM2dtjZJPS4jqMMAdDoZ79Qlu/w1Di?= =?us-ascii?Q?EiNmBaan8WZxxM5TyPqQjQ/sPuaD3HRxt6RFTL+hEyeGJHZp8zb6Ru/uPnaC?= =?us-ascii?Q?zO05EcVpZ6skQCg9DuLIccp8Vx9xicmkmOzdrH3ErvL93CLZkeUd9QXQ/Y22?= =?us-ascii?Q?JQnWn310IWBvFLLFnUHJwZRiBvAOK5Kzfd2mOVBZnj0zT9e31d26AZL8HT4R?= =?us-ascii?Q?hSP8jjW2PDfNOkeeWTOXIALG4KlzE834QQvJ3HHDKrnK7DlQMiHCmcRPZqjo?= =?us-ascii?Q?04gMqaQGlAx4ZZ/UOpijJiF5uTg5RkL4KVvjVQzqiIoz50174G+aOj/dwXIK?= =?us-ascii?Q?2Z2Dkkrmzpp5xGyJBshjIE3d8r2E8kcSHGjFI3OOFN/qG7mMairNFJsUw+Q8?= =?us-ascii?Q?XfrxSQMfMMy3ZuKy3OryE+E2vLegWsGleY3liFJ4dZJxc2zSRS2tgA67lnay?= =?us-ascii?Q?XQZ30+qeu/qlt33EfocxjiuTK/JwzE/yln/jDtbSC0h1+w8RbK5VhZmhF7Lt?= =?us-ascii?Q?Zqbu4+RRf9PBlqgWHwkpVZX/tUM4FMaUDpj0tIio9s0yNpXRYMW1HI7YGyew?= =?us-ascii?Q?7wBIAmveB7ZzynCYyAeu5lY41e/r2fKFXU+HNJzc0USr6ZqAv/dlnMRmC3R9?= =?us-ascii?Q?cgloBN8psbsFyp/+DahERS1Z1Z9FvPkY0BrLJPxQWiaTNglxM6boqN4VZU3t?= =?us-ascii?Q?W7R2U+B6t9e/BTKg1gvqFUVcIXsPY9DKPnuyuAxjoVw=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65792f80-57ec-4f51-ed04-08db78cb0d70 X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 18:02:50.3062 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w/VSkN/WVTzGRcU4hyO+knQ06EpnBOmnjj86UdUNBsko/HvQGUzVIm6WZG1igClsHZgLxRFAYB500AmtU0f2Mg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5687 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-29_05,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306290162 X-Proofpoint-GUID: GpOF6AsFBZXJU0yt7-4MAsLbFnddMdKm X-Proofpoint-ORIG-GUID: GpOF6AsFBZXJU0yt7-4MAsLbFnddMdKm Received-SPF: pass client-ip=205.220.177.32; envelope-from=daniel.kiper@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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, 29 Jun 2023 18:03:04 -0000 The LoadImage() provided by the shim does not consult MOK when loading an image. So, simply signature verification fails when it should not. This means we cannot use Linux EFI stub to start the kernel when the shim is loaded. We have to fallback to legacy mode on x86 architectures. This is not possible on other architectures due to lack of legacy mode. This is workaround which should disappear when the shim provides LoadImage() which looks up MOK during signature verification. On the occasion align constants in include/grub/efi/sb.h. Signed-off-by: Daniel Kiper --- grub-core/kern/efi/sb.c | 10 ++++++++++ grub-core/loader/efi/linux.c | 17 +++++++++++++++++ include/grub/efi/sb.h | 5 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c index 80cfa0888..60550a6da 100644 --- a/grub-core/kern/efi/sb.c +++ b/grub-core/kern/efi/sb.c @@ -32,6 +32,8 @@ static grub_guid_t shim_lock_guid = GRUB_EFI_SHIM_LOCK_GUID; +static bool shim_lock_enabled = false; + /* * Determine whether we're in secure boot mode. * @@ -215,6 +217,14 @@ grub_shim_lock_verifier_setup (void) /* Enforce shim_lock_verifier. */ grub_verifier_register (&shim_lock_verifier); + shim_lock_enabled = true; + grub_env_set ("shim_lock", "y"); grub_env_export ("shim_lock"); } + +bool +grub_is_shim_lock_enabled (void) +{ + return shim_lock_enabled; +} diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c index c1eef7c98..fb4d12e3f 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -458,6 +459,22 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), grub_dl_ref (my_mod); + if (grub_is_shim_lock_enabled () == true) + { +#if defined(__i386__) || defined(__x86_64__) + grub_dprintf ("linux", "shim_lock enabled, falling back to legacy Linux kernel loader\n"); + + err = grub_cmd_linux_x86_legacy (cmd, argc, argv); + + if (err == GRUB_ERR_NONE) + return GRUB_ERR_NONE; + else + goto fail; +#else + grub_dprintf ("linux", "shim_lock enabled, trying Linux kernel EFI stub loader\n"); +#endif + } + if (argc == 0) { grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h index 30c4335bb..49a9ad01c 100644 --- a/include/grub/efi/sb.h +++ b/include/grub/efi/sb.h @@ -22,7 +22,7 @@ #include #include -#define GRUB_EFI_SECUREBOOT_MODE_UNSET 0 +#define GRUB_EFI_SECUREBOOT_MODE_UNSET 0 #define GRUB_EFI_SECUREBOOT_MODE_UNKNOWN 1 #define GRUB_EFI_SECUREBOOT_MODE_DISABLED 2 #define GRUB_EFI_SECUREBOOT_MODE_ENABLED 3 @@ -31,6 +31,9 @@ extern grub_uint8_t EXPORT_FUNC (grub_efi_get_secureboot) (void); +extern bool +EXPORT_FUNC (grub_is_shim_lock_enabled) (void); + extern void grub_shim_lock_verifier_setup (void); #else -- 2.11.0