From patchwork Tue May 15 00:55:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grandbois, Brett" X-Patchwork-Id: 913381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40lK0R1H4hz9s01 for ; Tue, 15 May 2018 10:57:11 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=opengear.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="umrT6d9I"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40lK0Q6tk2zF3MH for ; Tue, 15 May 2018 10:57:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=opengear.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="umrT6d9I"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=opengear.com (client-ip=104.47.38.71; helo=nam02-bl2-obe.outbound.protection.outlook.com; envelope-from=brett.grandbois@opengear.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=opengear.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=opengear.com header.i=@opengear.com header.b="umrT6d9I"; dkim-atps=neutral Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0071.outbound.protection.outlook.com [104.47.38.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40lJzj4kZBzF3L4 for ; Tue, 15 May 2018 10:56:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=opengear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uTiygMHmyn5DCPDrr2lCa5H601HOPZOorjfVbMJDjbg=; b=umrT6d9Iefpm6mybg63wS4VD+/RmJQR12Bs/mfQWKmKipyrZ+aUDxyqSf6JsPWOP/P/AlxnmdVtMwyhY5Aw/vfMb6RgHJASoxmaoKYNVW0JEa/w5BDo86d0zr6kNw6NdgWuz7nx7pWypzWCv6Qsf3bsFSbOGAQoHYZBloR7Z+hM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by MW2PR1501MB2057.namprd15.prod.outlook.com (2603:10b6:302:c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Tue, 15 May 2018 00:56:22 +0000 From: Brett Grandbois To: petitboot@lists.ozlabs.org Subject: [PATCH v2 4/5] ui/ncurses: Update LOCKDOWN_FILE check to reflect generic SIGNED_BOOT Date: Tue, 15 May 2018 10:55:51 +1000 Message-Id: <1526345752-21072-5-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526345752-21072-1-git-send-email-brett.grandbois@opengear.com> References: <1526345752-21072-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: ME2PR01CA0091.ausprd01.prod.outlook.com (2603:10c6:201:2d::31) To MW2PR1501MB2057.namprd15.prod.outlook.com (2603:10b6:302:c::21) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:MW2PR1501MB2057; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 3:b2R4tyMKQmJ5h6jXE7stmwflr/bmqv1kDI1ndjnzCSlahbiKQMia/EHU2Ok2mPwqZ9qNUvJ13tO94JwtOhuyy9LgzgCCIzt8PeI5dX8Tar6aEmXAXWuDbwQDZ4pOrrUZM+cEA/sBVYZYkDmHV9IA5USbsaj+H1xqeDfp4yltiAwDVLnchUdWGnqQq75653ZSdjLzLA/kaz4AuqaTZ9Zjvk262+lc9EBseicY4mQzXk8pt0sah+Vi97+1RkTdj59/; 25:usP+elBwe0iE8NFwYdcEaMLVpGuE65EZRVPLmr1HA7Cbzz+MhYTyCiXHEhOh1piZiz62WujcYvSv9vddLxsNZoY6C09DEcFBRCIagpDd3m7jV5hPKxHpvn1HUF1IXWIeaIYhJJVt15F3O5UON9CZPFreUptrXPwXCTxZYYzWVsHnrHf3Gbc2FO249mcCCTMauQVbetJE0z56zGB+I7DHa8k0eJQTS7+drrmndHKjUOWEZHG7YW7kwTaZm2lveIkjPnLSWjngwYF9Ty7JLtoVo/w0A2YY0emQkELH7Jl8jM+bU8Ef03qXuK6mG2sB9P/84mZjZSf5XCEoz2ghmX7rww==; 31:3Dbc/6RISD1tsmLvggdgvKbGX3jL1wqPHcDYGZ5Nz5ss9nmZ4/c24Uo2r0pruWXKm+rwk5pmI6scLPAPbhpBN8PPVQXtCdO9+vgtwqg3uKZlo5UWjxN+FvbslVujE0/VKhmjElQ8BbHYLGNqO30uWAd6zBcrmpvwD7ZxQzcQ38LE4LPXtNxcMnUiRgmGd/xfZ1JOxWQ9iIs0eKjeXhEngiYTBUNo2B1kORIM1heo8OQ= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2057: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 20:723JK3cz/fD3rNT4QtYqs6/u5jI0ghd0Hy04qcqSczbbzOgoPXBT6zt54q7kXnxTGWBS6WJOE1/OUdvhB+VMuUHJiGmbYEd5jRbGvwFj8CpzaUpz7aTVQ/S785+6H7vpamirtRgNRDIYm8akovO4+CA22EQ7MFCjN9PCsAhAxRA=; 4:8lgBVJ9mNV9jrVFGoqM7qzaaA9EJYMH4ggARSHiAQdTU4dvNe+fsul8OII6/SUhAVwM7PUp/g4xkCb/zPL5Dmy0QtgqL59j3SwGiSUD+JPFUW6vx6+d4hAJW+efM8Iq1SfJiTMxcmg3cqgd0xpV0jR0UdgRMfKmj362mYVJStdBl8fbKK95tCT+Dk3JWHpeR1OnDLj6exPWQkI1wCOWE0QHAq5EiVhcTFgRdszMHcYu4wYshkTCifpL/MYAgdWBH2kUBHp//ihmhbmuR5D6IOQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231254)(944501410)(52105095)(93006095)(93001095)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:MW2PR1501MB2057; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2057; X-Forefront-PRVS: 0673F5BE31 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(376002)(346002)(396003)(39840400004)(366004)(189003)(199004)(105586002)(6916009)(86362001)(478600001)(36756003)(81166006)(66066001)(486006)(2361001)(26005)(68736007)(21086003)(476003)(11346002)(956004)(53936002)(2616005)(446003)(5660300001)(44832011)(106356001)(6666003)(55016002)(305945005)(33026002)(386003)(7736002)(97736004)(16586007)(8936002)(16526019)(50466002)(48376002)(69596002)(186003)(2906002)(3846002)(7696005)(51416003)(52116002)(316002)(2351001)(76176011)(59450400001)(50226002)(8676002)(47776003)(25786009)(6116002)(81156014)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2057; H:opengear.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR1501MB2057; 23:0gdJTUPjuKsJTxtuOiVqi78FfHPPN88F4g/BYeS?= WBEGgkuI1I+dfBM88uWsugO49VbNsO/5nUGIgy5G6E2OWtncfNnQqVzoLEZkGZESVTXYJoOujoMhUOhNZndNKiERi5KG7TXyVCfoklTAiYZPqm6Ut8pDfG7fz2al4noE/dx4Nd8dLmnWg8vBYeTTZvI1VwQ9v2P0afTgmGJq4VcAPiKtGn4QS4HGDuy0i73ROKJXdLQV2w6vddsYva3s2TeJGU3Sd8TDN5Ojx2mHhw/sV5CTWd+jaOubeOEEdSr/UC03y4fXlMbal6ijvDDblge5auHaA1SD95Pf6QxrXEVkrt93YpboOmta7oX3d32cNEMzeroVjxzqo9ObN4jY7/oBS5RtKUwmP9c+D+c5ShXbsE6zH+xvXLNc2xN8oHRXg+zOZZa0KUFA0vQy5k4uO9Fgl2O/HSLQX4PaWAzxMWUlulQswosqYOWB6xV2cDt36EbI1kYuXbqjLOB7Rz/Tz3W/WAmSuTw17I9xAKlezAXPfJ80CmtbFG2PSJFQwNmQYntTvSwDqAhoKnZfqBO6/A0jrtgUDd8ZAqP2I6RmujjpPolNJ658lmzn3brdMpCfWM4LRFh4wuoMMTKeajqdUpwjJ8uUdthsaIMZD/qkouEdx3HA3nqW8fmfTaH3aWrFV97T9GQKUxYpcAEWf+F69irONFtkb/KAvpXUhnJbiC3iCBM9Zxilc0HKjjnYm3hDFfUsnDhGdr/+eWUYVdQTz+HYCu08dHHPpy+LoZdT93ib7txPOPYgVBhASMuDYH+5CseIe36BFCSu1uwWLiYYJN47PqzNfnBlbWRmj+s6+v0iqRPE6lxHU/daXHFym0Nup81inwbuBoBBLv7ONucFL/g84/iYgoBGi7UHPh8CQUL6qEXBHR1NaafTvKsJUZ61Td2Xl8FtUUfA3C6KwcK257f9YBPvv1Hv4JtzmULNcvwo8sc7nHTQK7Yad8q4HWm6eiZ+e/c3wgA+yWn4oNwcYbm6jBl25ZT58Pko7HnmH6bH9txHE2yFg+ZGIC+7VdwYyQ7k5UfaRGppHSq7ezXSyOYIE+sx+WzVAheYa+fqdCsLESidvqj05dO68uo4IgAbrpf6v1EFKsOGqHFtRjnR2EaTdlltJ4KJCe/KD8SrM87WEGuxUAJyAXv1bmCwoXltWcteHhRn36sfy9JNGIdrE2TvfqTHT2whM6PNfNXye8DJtzvoyhhk4H2ubksp2gctkzu2ZtMYrEa8ZUm/CyHkFup8oVQ/EJ0xWss7jdRwMIo0boDKqbc0yAldPMWNJR7F/vPA= X-Microsoft-Antispam-Message-Info: ClRf+I64/D27nfAdGTu8xqhcqUepK8C3lr4WeVrdbuq4iW2vqBafyxbJorvLWrJfwyEfHqNOofmO0Sz24btE/JjOxpy2tqRfIACl9y00DAxB9gjd+rbqpPPi7BTn9nT3eM4MQJdp+8AMAyBmKppD+p5xMbWCXG2C0NeJLIouG4CqLYaJ44j8ryEjK530cKQB X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 6:0Bj4cdoW/y/fXnmaqFqEwGmHwgAe1IHClfhAO0FmfocaJO/oyXHaoYYa68EzbjcHT+KmMpeOhFtFNJHmSqpli+kgUTjAd8egtUAzjkaaUlNIS6CFiW0N8kXV9NHVs+NSE7mqFp5uPDRD0l7vk45fhbKI2hW7cgOrlSOxDOmSHvOVxEzxqKZ+pJfNz9TpBiWCdLW5tDlANfP04l0Pe+AYj5udiiImjofTLLYUFNWxiRs/RrbMeYWayT+zmmgQaAosKkRaEnTRuG3i2aoPJZCTDX59rEbOwV03VopbWuL8Y2tsN9n5fLgrJvLvBp+9I8v5W2uVHPrQpvSoljm+jyLEjj2NTJJAZWUMyHU8jRAZ+GNps96X2vwteyXWVQYz6ZLFwrVIQHwOwV1w1IXFYlZfbkY/w5f4D3Ps1eAh6QRKPJsCI0vXZKfmksdPtVXzJSusqj2J9Tvmx+4dsbMHoxt56A==; 5:zNRkGkUoYjQKa5yRDVQY0P07rmxqufKNPom2OcpJmCffVKlNKgUdftWLeO06Grc607GXQKKqQuJjE3twSnceVZL6rtx01pY0zCNgOLfv5xqy3XUj7Vz+kzT12AyeG+XvtTUlDt1Rq3sU24X72rPBS8Qagwo0XwY9m2V2z6pN8p4=; 24:i56Tv13QRRawjoKxXc/L0Q49SdCdea98NUgsRBTnnIgtobyCIVb1VEarFFbOZp8RfIMT31VczYd0Yj8RkVqlRVD2xP3c2USnFK0oCen/ZT4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 7:2dZ07HX0w/mxCVd4niDMIf2J0oa0EFgd3fJDANkYsb/LqCdV1NQBdJhnDJAXeGLia6yJEasNktL6mq6/9m/zaojXgxBombXCJRdJvhCjIYwkvLJSUUzaugRMI86sXgihRkl/dYl7q2xbNpyPVd0KovegreWzIgcjY8pqG15DgZOunqZRBrGx1KxHAErCOqojjQQkB5XPRT0NENTZ0sov40lSo9ZC0472ARUVyGBcCl8gzXCkkM7m/7yK8DK5eYOv X-MS-Office365-Filtering-Correlation-Id: 3f20be41-62ae-4cf8-f812-08d5b9fead92 X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2018 00:56:22.1465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f20be41-62ae-4cf8-f812-08d5b9fead92 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2057 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" Signed-off-by: Brett Grandbois --- ui/ncurses/nc-boot-editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index f302c52..2e5749b 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -636,7 +636,7 @@ struct boot_editor *boot_editor_init(struct cui *cui, if (!boot_editor) return NULL; -#if defined(HAVE_LIBGPGME) +#if defined(SIGNED_BOOT) if (access(LOCKDOWN_FILE, F_OK) == -1) boot_editor->use_signature_files = false; else