From patchwork Fri May 4 01:40:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grandbois, Brett" X-Patchwork-Id: 908422 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cZWF2T6xz9s0q for ; Fri, 4 May 2018 11:42:01 +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="HVJTpZ9S"; 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 40cZWD5ZrjzF1KG for ; Fri, 4 May 2018 11:42:00 +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="HVJTpZ9S"; 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.36.78; helo=nam02-sn1-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="HVJTpZ9S"; dkim-atps=neutral Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0078.outbound.protection.outlook.com [104.47.36.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40cZVS2DYSzF157 for ; Fri, 4 May 2018 11:41:20 +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=HVJTpZ9S8P36/J+0+9oJRDzThkXR/nAOjDWpdrD/ptVs0K2OeX44LoSvUR5LmnDpQmBntWvxI8kmKhpWe/Vr+BUJgt99K5MyZeEXKIQ5Oq8TxuJfawqPM6b7Jm9wWcalYyHn6qeS36iFNBWtvu9/+9scIdMO0BoC2q3vO+uuyUo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brett.grandbois@opengear.com; Received: from opengear.com (59.167.150.161) by MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.715.20; Fri, 4 May 2018 01:41:11 +0000 From: Brett Grandbois To: petitboot@lists.ozlabs.org Subject: [PATCH 4/5] ui/ncurses: Update LOCKDOWN_FILE check to reflect generic SIGNED_BOOT Date: Fri, 4 May 2018 11:40:59 +1000 Message-Id: <1525398060-1517-5-git-send-email-brett.grandbois@opengear.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525398060-1517-1-git-send-email-brett.grandbois@opengear.com> References: <1525398060-1517-1-git-send-email-brett.grandbois@opengear.com> MIME-Version: 1.0 X-Originating-IP: [59.167.150.161] X-ClientProxiedBy: SY2PR01CA0015.ausprd01.prod.outlook.com (2603:10c6:1:14::27) To MW2PR1501MB2060.namprd15.prod.outlook.com (2603:10b6:302:c::24) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MW2PR1501MB2060; X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 3:TvZR0klfBex6//A/PXYl1I1bQYNhVfqX9KBbvv9XxkrpX2/l0lWWM1iy4HBJlWYv8QIH9ADdbJO5Ho1XovRlfmzlB4HXgHt0vhk/6bruvl2A8PnpSm3mPIgJ7EysspxWCuc6cjBfA9SagsOdcXDuI7ZWd64rPQcyXChCM7KxymyEcDLSvwUNzRYht1fhDF9VCu/kBIwELCptD6He0gBX846JdES3qT1IxJbZQGQuI0Zv95nam0W+la6Pyua90Nl/; 25:VOz8UyVaN8vu4HwWuBymjx/zDvNd0Nqktt+QG26CoOZpI8/j09t9gXAIOIifLqfz/nkeXzMxA5v4Bj3PqFDRS1rN5gpv2gMdFRQJNbOHYyvMeXscaGpwrQGQFXVsSjAwOH7+k5sWoCb9Rjn+9EeWf1nWSCIYntvInYQIvtrHDU5ClQHCpB0xe8Z0NwObJVVs18vGbhrhxEKcp6irQg1V6XSgutpslAGw591m9/mX8jCS0aIrFnAVZ9nIopbn4i+lswxf9WdiUzR0O3EPGTgwPEVoir8vkXTr9+3EW818/x6m0bm10GrmcNajE+epk+BV/ucZ9rCN3wQXtnXxv/Jy9g==; 31:DrXV+ycgY2DPopwrNlMN0mBr6cHkWrvUP2qCCCTQWoMCaPks0Pn+DjTQjrDP5Z946m3M1cKsqyaR3Y/eIMBQvyC3/vt8oSXNI2qzTZ8UVDM30C4nAg6ByfnT0FT2a27YdUizM92FXyREAZI66XHAo8XOo1JoC+OvxFyRYaxPMM0+XTzGkF5pdDTE1isqehlCBqBcWZH90Qw5WJru4dk86IKJ1yK7laUJKltDvicNulA= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2060: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 20:vUMdk3J3bc/MFrE5joPjz/PA9d13E0u3ROXoNuNbgbPffO0CT6I6sI2+/4JDs7rfaJqH7wMyG6yJEdJKcL0nsvIkQfyh8LCb0WfGQ9A/t0Yqtyco7JrfEZU+eO44cLNp0A71sStScqQxl5yZJXi0ksr3IvbGbL4gGMLvZ9ULU98=; 4:owb5oqc6RRqWi142Fucyc3ddL0P9jwrVe8O229xe/3ny2zTpblHyXlLARHDzZap6v7UoGFOd50DJSDLoC1m9eQ8khZmsgKO4smxO59uXf5bufu4CTs18R3wb27O7LMXr0QVtps5Va9osAIakzBxJDntKtPALE3DZfMbO5qkPhUUOjUGeDEhda2eyv/sS2wRnXYAFuxrJJKTn3zNPF9Mx0+kompRyJaJDMsWrh96O2XRm92BZcMTGOszuUXBKuSuhgMt1plrD/7wOnFsedolxJw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:MW2PR1501MB2060; BCL:0; PCL:0; RULEID:; SRVR:MW2PR1501MB2060; X-Forefront-PRVS: 06628F7CA4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(396003)(39840400004)(39380400002)(366004)(376002)(199004)(189003)(86362001)(52116002)(5660300001)(8936002)(3846002)(7696005)(6116002)(8676002)(6916009)(16526019)(6666003)(69596002)(48376002)(76176011)(68736007)(316002)(186003)(476003)(55016002)(50466002)(51416003)(26005)(2361001)(53936002)(25786009)(97736004)(47776003)(16586007)(2351001)(2616005)(956004)(33026002)(105586002)(486006)(50226002)(478600001)(44832011)(7736002)(386003)(2906002)(81156014)(21086003)(81166006)(106356001)(446003)(11346002)(66066001)(305945005)(59450400001)(36756003)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR1501MB2060; H:opengear.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: opengear.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MW2PR1501MB2060; 23:uPVqN5dfwcHtuwuk5jhgZFXkHw/+F7/BkRVqpXb?= 5lCizk8MbhxWHGJhqF+S37hq5561ASsxmL/f5rPDp0byUwsoGvGPglQeS9ECcLJ/TP9YGQIFOwdZKV+sadsjVzM8KOAr9C4qj/nkmffZ7YJVKLkUhY0gM6SgWOgzJyx/rYpEkMO/ZaKPayrd0Eb5RQi3ckkVMnMZLHFtP6PzAB++PA2Zeed3j/F2aioeO3D2bUexWeKa5/fSWxc3UJSf2xsQCocIawJhQ5rAfpzsG3MOxd3OaQCLnT/zA5wlYk79Qvk67LMd9ehxb8PKmvLVyPgqfZE74locps16Qc8391gjfAEaZ/GmssQr9w56gWRcnKQgksVF1eSQVzl+tWazgv0choveCUETfvJ8FcscnvabRdGrlDYSk4VWyHMV9ZIOxu5NIdT+H44Q7T+vXTDhrH3A/jzty/bmDUjWqswIsBPJnEA3EBGGBjtFUVYe0xsnSX3wE4kSl46poTUdOdn2Qy22DEDk4thOw242mJFRiFBNxXZdqa8xdL0+Vg5c5t5bvKQXI7eJKLubxF3z8K9lL/tvVDUSzqpWTpnGEVfkEe9F0cKIpvjJcVOXbAMEajY71bn3hfHfFDUqrOHqNJoZXsSzrxRHG+Z1NZj58NOyQ2/VFZVHr4k+SKRvhgZ/QWt816Y/clggnYMo1RaFab9mUyQEkFo0zAY4nsW97H8ebxSR1X45VbJY7mp86tMBUduFAr79ZUo6LFU8Zw1sIIBn1GWFhCN89GpQtFsTugSgK5wIOS1/oVnqPDbl2eqmZHOsdNb15fIKwb8DrsEQ3s/Cc4nlGGpuk0sYMkCOjyp1giKnd78TxkmeM9OAo3Rfsu3XQoemEB/qKBospWoZhAjnSTJXiCzvh95IESlJIRma0AzqEg7DEB/5PzRwri4F3IDQqIV5ohyk5SkA0qBUpN+ZrDLn7OWE3MXpHYSaAMD3t4jU1VMBqZihX/ruFrNVV2GewPb17RRczdzDd4aKMwO8kf9g8xyWBemLFK/1sjLvV0oXLxPxXF3YuU1jIr7FUaOH3E26VmSmzLgCqWMkOrGAagX9vEwEL0yzEiuWrdcMAMYzTfujHwWJEuFD4k4qLRwnWbNVCi0W24xFbpBWRcYrbk3vGL3PkKpV99rjeGVZ0cG+9O3UM4lnSZ/230ZcYmNxVkz7AKBGiBIj0vDZbp+RRO5QdpA2cDbsxkCGpiuKfSBV8LOdqNVvg1gK+YJaQRT1PxwKSxHMqHuEGZTTDsfG9Oi365w5Y+IKjtsqelHqBn0qhsIfMMDYsCKw9mc4L4DbVkRk= X-Microsoft-Antispam-Message-Info: +oaGszBYPuVmgku4+WckEGSAer5Gx7eJD/AH2BlzQ7Vzb9eu6y1hwcN/xCFD/J6cgwjSbYFMUxZOdEkiC9J3ai9Fton6dBSmZe9TGGGwO4R/c+qH5izH6r7E0FYp1KTB9RYDWbggkNbLYPCYHx/TwQ27pwq6VWD3TAstHksWmlDo5oaQV5YPDMkVrs705/qM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 6:hqog9PUUnp+9of4eXE0I5lfTJrDa/tkFjKFnqfOHqRluSorORegv0UIzZVwCw0HukRdjBYhSupWhELzJhupUUlGO6qyw7o450N3efazQwQ/xBPacK7OrPnT1XSxhaKVdsRgt3kQNWUhiTQWfBFFM9qSbudvKz3oEjFaCFLmbBYc7GJLCeh98VhbrsXzyGAzGuBDV+r14/MZt0pvWjiL3aLDQKGMmoB6mXF3bQyotXW1I/vd+k0Z2sJSesXbumbYxrc6M0+D0kxl6UzUEcJ2jYhhUm2TXNAnCLowuN6MMYrNrUULyzlfhqRIiuUsHIrGubXSTqhkE2AgZdquH6HNtH1byIY1FafAXEf9U14GMuHWWceN/bxpu6e0p5gL7O2KXyl4doXA9MNr29I4TO8moCeuwPzCPlDvhplAMpXMKe5rdw0xGy2byPbYb9SiO3RL6M5NwvhMWZmgK/rgA2tFfpw==; 5:aTLTTGBGDkt25Id/ImZpURGz+6Nop0HHiQXQQdECxI4Ajnt6s8WDar33FDcpp70kjsiAvFQnrvX+SZVNdvQateL8wa9TdvW+ArQcDRtW7E05Cjl0xs0ik8wsmrFmxUfCoz3XFF21bMzlK4pv+bLja/yNyJEZtdOS2V3lWgNWDrE=; 24:DDF7rw9cGVDAPgWJP+SxBVE4iTpY2VKAd2VjqiMPglWr1Hj3Vh34sdgJMVmwJTbmvpo784c/58Rvs2RM3Z8z84dhTTCxrzRjyFe50yB1vsg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2060; 7:qDY36NprvNbK0EJAZwpE53miy2DUoF3QK9LL4Ln9tcnJuJjmLlGar772H+iHxdgHphZKMbMT/H67QCBCWl0QpAsBvVUnSf4efov63Wphxzu0HBLEBGLX9N0l42J4orZrA+3JokvjCg6hcY6sAASAtORV9LxyMc7APnzsJ26Brzu+z/UIZOJLc2iNDuxJ14UpdDCDdlY/doyc3TMnS5dJMemRQQlwNmI4j4guB/pawcBG7CRtr8ezO7GLqK55O2Td X-MS-Office365-Filtering-Correlation-Id: 926ecbda-aa73-4215-2ee2-08d5b1601e24 X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2018 01:41:11.7832 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 926ecbda-aa73-4215-2ee2-08d5b1601e24 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a6251c26-d21f-4164-a225-1f4eaebf5f9a X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR1501MB2060 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