Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1qFEiD-00022Y-0X for mharc-grub-devel@gnu.org; Fri, 30 Jun 2023 10:03:01 -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 1qFEi7-000215-Cb for grub-devel@gnu.org; Fri, 30 Jun 2023 10:02:59 -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 1qFEi1-0004Uz-O2 for grub-devel@gnu.org; Fri, 30 Jun 2023 10:02:51 -0400 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35UBOZWa024621; Fri, 30 Jun 2023 14:02:45 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=tCGEg5/S5ritRyVw8ytW15W1U7f+Az9MfqqAwy2jxYrQSnqHSWIv1QBh8ryKb0PGV6Mp /xhUkCrcSDyiAZpttN145rNYV+Tv/2H0q98ef0uV0lI3JGOYwsV6h4kxYUXjiKSaVpQ1 QPS2n5TEUb1bT29mHiNwLP+F9knHqvZ7/uH9sd7O3qsYhjTZIalbzplM+MOXCPtv78mT 0gP2yBZyxfTLu0hE63HZL0FBlnS8Xc6AyYbr0jfAGdIRSG1KFVT/PW00GDnEma/JdBRC g03/PhlWbuVK0eOXqOOsrJiQrg3FgNuQOWA8u03R9ej1CWJGRdlN1Ac4We/yBm+QMISC Ow== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3rdq93gu5d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Jun 2023 14:02:44 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 35UD4gW3008668; Fri, 30 Jun 2023 14:02:43 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3rdpx8vg35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Jun 2023 14:02:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RH/cC/TGzlkl0qV9bxszQPhvi+1OnJbN/dbw5Jp7820HsWpBfSA6kQqi4zLo2yxDBa/EbeeoRqkuwlHICmXDPWV1hZF9DGqVvzuzdyKWqr+MX8w/3t2JhvUdMEvFwzyLXTP8A8r8xN+EljlEwfrsvjzu4tmgBV3hus1Q3xDOwkFRKcCGx7vM3Dw4PbW/a1qi0pFKssqTkirh48KKOgl7UOb3UlGiI/d/16R5s1fSMjvsMKmeV/BT4CgcgdumJ5EAvUx54DHWqTB08Pm/zIj3f4JC+hU2bmKy9ZhTI24a2iwrrac4qFCMwbPzlz5TsqZPhlmCMz4lYCnjZJ8v75t28Q== 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=SIrzXcDpV2gK/X8wkEiv9aOLYQbskPTsxlnU72mXRz0HF/R/YglvrKxLi09wcbxK1UDZceEVDuzX9ZlRSGdAXKWnlvoOYiuF9H3ikeivvDBKqPsFlA+yDk5/3Zr3aYR2z0Pk3QtY/3Uau1rTUaC9DYhsGyMxut0daRRoTxG+jKKB09hQa0gCz6wPr1+dxFTye6HEkVMsBd7KJm2xUmo7SnH5dNcYbZy2iuhna4dYsRAgeKHa87PrTEKA3rCgIpc+sPrZPFdv/miUgpFDv6kaEmNXtHrtPlgOxRPDGRTg/QPWIhZ5cJZ6BEy88tiylzPQn6PBYpwShT9IqrVINAIDDA== 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=Avi2vx2K/lqKc0E6hUbc5L2hqeokKAsN6az74APv6S+o72wHgDCeLg76CmHEPIGFuDJQNv/TFE70C7HrD1MICfgcdkSblCtuVhWTfgBT0q+6TdrhEh86dmJA1XMUKUSpF5w3U9D4XVUE7qS3RqBBqsC5J4e4xQ2EjJN3sTK+/s4= Received: from BN0PR10MB4822.namprd10.prod.outlook.com (2603:10b6:408:124::13) by DS7PR10MB4896.namprd10.prod.outlook.com (2603:10b6:5:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 14:02:34 +0000 Received: from BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::9e9:42ec:2d46:492d]) by BN0PR10MB4822.namprd10.prod.outlook.com ([fe80::9e9:42ec:2d46:492d%6]) with mapi id 15.20.6544.019; Fri, 30 Jun 2023 14:02:34 +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 v3 2/2] efi: Fallback to legacy mode if shim is loaded on x86 archs Date: Fri, 30 Jun 2023 16:02:15 +0200 Message-Id: <20230630140215.13465-3-daniel.kiper@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20230630140215.13465-1-daniel.kiper@oracle.com> References: <20230630140215.13465-1-daniel.kiper@oracle.com> Content-Type: text/plain X-ClientProxiedBy: BE0P281CA0008.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:a::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_|DS7PR10MB4896:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a92ba34-49f6-4edb-c712-08db7972a70e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2p2z/keLumI/TsLGOlWUavRm9nwyxwTWxP/7AAVck9Xjz/Y8LQZQH3USVDG9mIrwCX56nhPrJ6y1katAe0L7LvQpeDZd9ypwOryUPTNfNG4d5OT/j+VBvxYXEp0F6BMXzDQt2pKjNafOK9AkceMCd7qzKi4CQ25rkVtDsDhu6RQd/GqwU46mPkP4VVsmEPuhs1mu0tsmvDld2UV0Wz4WximEkluNJfqf5K2VvSvVG7zRTNDIT0eYKzQEEUnwLa2uwavdmfrV3cYZ/0JS6hkuIiQWdXvG3kJIVtC3HB3AUVZ2/3Pzh1ijxr3y/wm78qxELDg/iP5imGe0oeArTwHUTPBzIPsEzS1tvunIf257PRHYpaiTlQE8mhcZxEn2IwZ5K+o24nEpNbVje5KLFPbdoV//KWfzGxUDOivYRBcMLAo9kNnS3ac1o2k4u1cOPBYSj/hk9+ieUqohh/XDHVPbr310PosYfjcgRMzgUIGLPlTdhfkLJkSmvNS90VceFIkCWUd0kMtk097a2saRiDUL9eixruQC4xD6M1ENEafODaLapLGhd22VUkPbGkhVUagv 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)(39860400002)(376002)(396003)(346002)(366004)(136003)(451199021)(8936002)(8676002)(7416002)(5660300002)(44832011)(66946007)(66556008)(66476007)(6916009)(4326008)(2906002)(316002)(41300700001)(478600001)(6666004)(6486002)(6506007)(1076003)(2616005)(83380400001)(36756003)(6512007)(186003)(26005)(38100700002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pDjnCOK1QvusAHcDwuDyT8igDSzOFDD6XC4Aytt4UJuzfLSxXafRMHQC/h91?= =?us-ascii?Q?fOKIzR1xHoGSATy/HzyfVRkQEzk9gTm9WyI17IXjJ38vb/O3G5Er+DQuNeba?= =?us-ascii?Q?MZGBH+DnnsBBwKb4JVjjYywaW5o8v41z/W5Pj8vDpmxAqxoZQTlw9iiXKmGT?= =?us-ascii?Q?tzwUgJ6TvFP+04bmNE7HQjmUkJWbwNKcsnJg0wFJoeiMVBIk6SIOJ/xxCi5p?= =?us-ascii?Q?J2BgmeguwoqzOttLmgtF7wvqJDOIOwJYD7BCN29wG15kKKLayfR2HbFEUUZ7?= =?us-ascii?Q?PpjjNRAplldY0Mlk3fUIT6svzR80JqYX9ZAbvEAARFShG5qCrVL8NZ5QYQnn?= =?us-ascii?Q?b/9udLqvRCtA3VWLC+FEOCn6LBSjKqOeq3h9UyyMtcFRqZIzQBnQWY6tLxqy?= =?us-ascii?Q?nliUk2SxgKVv8w28u5Gk8efTlsFhtnzWxGH2I8eGoIfsLSXnUAp6Ungpo9m/?= =?us-ascii?Q?dGutcSWexoL55TtE+IsarNVcNf5Cn3wD/c+I/SFYyBWCN5lxEHVIHIhcZx5c?= =?us-ascii?Q?fHRbDu/GuAC9svCBROD3/y8wfSvVcpvKjeI7weKGdAJDdmKQYAtj6fucGXLT?= =?us-ascii?Q?4UENJPQjJNV3wxxKq3EScD10/BW3VEyE3x12m9EBapcb5nLrh7vnez+Ig6lp?= =?us-ascii?Q?3U/P22VpAAXNlQxoT6pWbD4lmIERPKvLCOge6ubm4wpQkMycBEBPURvbcw0W?= =?us-ascii?Q?MrMjJwg7vrc7p1fPB0iVQDcHaM8FNwtqCpzFXa0XK+8M56CmE+Y2X5v9xfIv?= =?us-ascii?Q?Bb37r063NUFPUfVjh0A6OZpIjy2r3UDguOZ+Pypx2EGiL2xVwWR+EpUB3FF8?= =?us-ascii?Q?LpVp/rK223MqFpkVF1cMUccTXJ1B+sLNttiUs09f7toHrxabyp8uz3DaKM0d?= =?us-ascii?Q?YkO/37fmBYbBDFnylkvFpidJbcoVONUrCuj9zpy5XLFDEH54gHSwbgx62Zdx?= =?us-ascii?Q?AEwiG2qd59vsY1bUJFdmWSSHmmdYxzekxIoJDRN+DWoS1m00AuTY/UxOnWbZ?= =?us-ascii?Q?65q0pNW2MBHgBPwLEiugyIpuGKlw11GC7+cXDaJ5y8DXmmj2HNdlaCOvKRfE?= =?us-ascii?Q?0vm3ttJVSzOeqqAQoO94B7IoO7ccvDJ47aXu1CVXJUS0QAMtoX7m4Eck38hd?= =?us-ascii?Q?FTfaCL8l6mel9j7B4sQh9C9D4eI2Fo4NJBdKZ5DBvrc8si2K2sIf21eUnE+A?= =?us-ascii?Q?XMTohkeAYw6qS1KtYE3Q91hKsCpyIkNOT3Cy6mCFBpPx7S1Gu8wyYFjF6RjT?= =?us-ascii?Q?RwqRN25sa/+G6aSGF7igEWzB05s0DEBrbL3sm/T4hEMx4V8fVaygj46VJubR?= =?us-ascii?Q?z6tsoZk7MrWft3NTcD1aw5v49RJJ7Dop67HKZFBa/0phgJXgfUiFjYsKcQZK?= =?us-ascii?Q?edJS8rmTzYSyY/wUcakoKDPonlTogKOi+MT5dXIZCQHPqjuQhEa9fk2K1t0K?= =?us-ascii?Q?uvDAl5h7uBlEtyGA0rsNrxLfceO5d0YDeR7x60tATPaeA3uh22aIM5PDKgpD?= =?us-ascii?Q?+iSv7b/jhRCNv+ALcLwTaqjXhWzJfPVuJFb+sa2Rj0jOMq6GJhNhRk7m4Bhv?= =?us-ascii?Q?r7G1MHKeIQyvooskGKlsIy7x/HpCDvM3LT5eBr9K?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?YPDh3Wu/I5RPcI2lNihlmf7dmIL1fpCtf53jYpnG57vZ6XvYUiMRGJMIKO+F?= =?us-ascii?Q?aKXxdtq5B5HFjxAIUkfXmzhKNDONviVQlBVgNho+uoQsjqs2A5qOT7aZf/k3?= =?us-ascii?Q?TXQvSsAaRY4eWa+PfEuKkn4D47E9hj8oen1jPKPMCt9ZGP9phOgNTJmeLIgf?= =?us-ascii?Q?HrnrBaMcihVCJjzs5KnAHjQZZUhTidxkNjLhScqO3P9+IV41fJYyKpfxfV/3?= =?us-ascii?Q?OecBMNDiT8hU/gAw3OVY2NAzZrfBATSeXmk2cHWegzYMgW2AIiM71eCJsbEI?= =?us-ascii?Q?skwdC33okKJpSlYBoRvAGK1vHthLdPa4/ao6SQJfmz0G7H15dRRjB1j8rUkw?= =?us-ascii?Q?8ZyO982oumsXPDliEWpmAenkkm0gudQa29ezHnvUYlPyZ+Vfab87hII+e635?= =?us-ascii?Q?5UocnMByYViGT4Lxx6LIti1+xHMKXJbC18fydyJVzvloGkH4moMFEc4FkgTE?= =?us-ascii?Q?o4+LB0xV+P3HyS++uj7/mS3ze7LS3nIPEEzHvsl1pwTYqsyRPA9sqbie6rIK?= =?us-ascii?Q?kksgZqV5ii2vyRXX311/SVeWAUY6fYgb1snNUkt4wyJ/HIYaCg6mZunnsnsW?= =?us-ascii?Q?RyYEG0j+6uhpySAKoZBCcIWP2JREhbpcGZKxsRVewwLw2g7RzKQRZlnWqPrq?= =?us-ascii?Q?nJIz0Dziyuey0C4uHtTxQwhSB/qYZeIAFusB5a5rCTDuJWTlwcXtF2g38hvB?= =?us-ascii?Q?ysW9xi6vVXyo0EcYykNV+4RGGSjxwYJ3XaozfiQ76It0noX84NIgHRwzTMbp?= =?us-ascii?Q?47ROK9/LWH8TJ0LOXez1KdrnJEVBV4LfLLpekmNE5bcvUjGOKM2aSsWESCfR?= =?us-ascii?Q?PbschZa8mWAIY6Eia75O7kRhLAzUUAYbU8ZkQr0tdN3rzGwfMZZwbiF7w6dA?= =?us-ascii?Q?WAzhY9UUWZlEfTJNczOeX7e1g8g6ABIN8I1JswbSEzbRSwfS5XMWsJy3EQ6h?= =?us-ascii?Q?0zkEObO+UDY/dZdJh4AqLA4urDB2jBsPV8MHTaXtYI0=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4a92ba34-49f6-4edb-c712-08db7972a70e X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB4822.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 14:02:34.0105 (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: scBW9v3QiCHfPz7E6m4Te5JpKMwKEYpO0DO129cY4jsKEVyFFTrSWbgx6SdCnof0rDKL6RhxQU7MCcHGBnLneg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB4896 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-30_05,2023-06-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306300120 X-Proofpoint-ORIG-GUID: XPl_P7D1t_iLDDVeqDdlhrsUHYG5btm9 X-Proofpoint-GUID: XPl_P7D1t_iLDDVeqDdlhrsUHYG5btm9 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: Fri, 30 Jun 2023 14:03:00 -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