From patchwork Tue May 15 00:55:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grandbois, Brett" X-Patchwork-Id: 913380 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 40lK0H5vQtz9s01 for ; Tue, 15 May 2018 10:57:03 +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="Y4BVz/Kh"; 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 40lK0H4HVzzF3PT for ; Tue, 15 May 2018 10:57:03 +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="Y4BVz/Kh"; 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="Y4BVz/Kh"; 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 40lJzh3DgzzF3L4 for ; Tue, 15 May 2018 10:56:32 +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=Tgh79wvYiNwTCgVgz6tl8Rk2VHqFL+YoOe+4mBVXTXU=; b=Y4BVz/KhpNxCS5WmnPYK39ptaDcdS6S0LRx++IhJZYto22ovJRZdd25vxoGuIDSc+Y0sYcdgcLt0pV2OsdItOyqNvdqzfjhK1CV/y4jTNFK7L1XkMI4TC9jqxOa+uSDaSDoOkVIx9cOUHaQ4bueDm7j0QToojRzpYrEfTj+Cu10= 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:20 +0000 From: Brett Grandbois To: petitboot@lists.ozlabs.org Subject: [PATCH v2 3/5] discover: Update to reflect generic signed boot API Date: Tue, 15 May 2018 10:55:50 +1000 Message-Id: <1526345752-21072-4-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:x06wd7nPtJw8MQTZBBomOWSS0nFrh+OeBqR9DX1/FDfl2oF01eEMBmdV4insB1eXL3VB5JJIX1cKrB3EBV/xvv5WsU0b0XGzzrK6V6IxCOtnklJRd4WPMMyeQ7E+pC/Mk2wpegMmWIYU30mryx9xWMgA39SmsczhythptCSv94e9ec2M5lXGn/R9A9fg2+719YAKjEtu8uteuTv7Iyh3xwqTFVcyHzQd/tK8wyQYPr2aqfqruuMYjTs4EuKSmsME; 25:G1/ulK6kIQqMHVN/rddjWo4Yl260UHCrWRJnZAItD9Z+f7RqWBU/b9Pfndoe3YeMORNIvBK5vzE/Zo/GRxPiocyfUY8Y/DBnfqget5rYPb55CPdYc0nmlRHnVgEDDSyTqfyLGr2F291xmg/wkimtTUHxxFUSkgNlJUVtgMJT2Azb2jIPe9sIzw0xJW3lDoeQhIbmWlsquPKZw1b7wm5UrU+vUo70oLNXQ5GNsdFeQgZfPL4c/umC7MxcrVyMQZj48TOy8iXiAGkxhKooJ4YWCbmLVTg2QNBaIUC9om7brwgtt4xRMhmVmpJbFPWm3JO5riClnS6sfhL70rp9dB0AHA==; 31:R+CL56+PSPADQTjvWZ12DGi3F50quXFtUC5dZDqEpB10w2z+mJmp9KtLCmctHZVKYzwfq4VYrdRsk/YygVmaKg4O88ioTauJEe8ZBxu5vSMFx2r0SEUtCtqNy7X2WoO/hwRvsipzbW+ufxkJwXnSBEnk/8qaZq4JQNBLG5WeWLiVXiCV8haoQ24FnUVNqaNF/ZYvEbkyObY2PhI5ADN0foVeqNO3hnkvqoNgoIKwIy8= X-MS-TrafficTypeDiagnostic: MW2PR1501MB2057: X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 20:vTg1TsiBwAsUNKEQ3Yy/26muX/EcRNuGs4a93sAPc88V/9lqWXpBKN++d7yftz0xEigMtCSCnc5RQW/8FzXLlvVKD4Pum7+8HstMWGAmNxFyfVZj1Kd7bxbLJfJlkXjWou4bE/JoH2NxnjZ0Ui4H89Q/gzuPeJd7zg8IsNh0NM8=; 4:Pl3igTT3557TnLq2GnYBrlTVqk5VaOPqJ87D383quQFkNL0gQpFEq3fBF4+iZUuPQVBGw8reZux8C2DW/o94dvjk4Qq65vmtLRiEjEAmYzU8/wYERWMcAEQRZopDK4jGsiwxBxID/loyfoCxu5UbIn0OlhCmDH5P9cg8HNGivy1epkbeojG391M+2BHncRMeAGCCf5W+I+RdOVYjDZNj44X/FZF3DANfujbV0DMHryqYyNwfvZLaz8g2FUUyJTn/21SGoKtYcklNxdpwFfHrASFMBVNsMuX4z2wXtXDDf0zkrQ76YV4VOtRPDPMOeeLq X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705); 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)(15650500001)(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:2yJs2Ypd8yJlABiPZq0Ue9HcSrLLbcYGd1s4KXI?= k5YSEsb+BEVMsQC/+xjca2SRkyg0JdabSfIokJHZQQLWTn44c17Qe1Quiv/5pViCv9TuNYFjexXwAS+1InIJEuvwef/JtDOrhRNOJ8g2zdZtwvxF2c8Rz+87O/ap1rpkv/Ai0ljqdQQgbcT3RZ/3gvWZ4c/8I/R98lZoy0jdSCfmdndXtPyLMDynL2Xjs1B73TOOoKb7nnt07z9hS1N/cp8zy3X8hlCpMLQzeKRSFEa3Ua9qo1Ny09fYCq/f0Px+uDZVstCrsWHVlUNNnr5slRQpVh//bjlFnRUaubsGyPGrg8J89+zjO/OSUYG5yIMY6/PqDZjELIGg9+cE3fQMWUa6ruzmUyHRoiS8wbt1diIj+q3TzXXQIYzoysC8vmK5xOyNMPuYuRUW8dsLcGhETsksTr2IkzMIX0xpVB3VNvDf07aLmbFZdPlZKYuEhFLTgtS9Wu/43j356/upIap4poNSdyfZMDgk1h6puWg5vCQ49G33ns9kl0JmjnxFs6niq4+b4fvSS09EhKxnQRbExH7tC/yUpkaMeZ49eEevYYRWnohLwuzTtf5FMCuMdaN83n2fU+HMCh0uA9/ktVvOq9Y2YKwdmvpCDV72Onf+9xi4qtB//bVOasLCfe8uanSoNhhdkAjtZ1qWvel/S11ttqwsZ38w+Lg6P0riRr+zMd6JpAF9PRh/6QWM1zIbyrHDHEnReFYUbm0lDx2t8bmQja9FMW/+IFIqvYNDbLG583c+2xJpwA2ZojiPx6LLIuoTIMjEwNzzxcYEbQG/4eOsfp7fzZGDUscUcuDRryELGBurDaMYnbFGVEA+Zmt9YejnSMDdp9DlLt9hgqXasXx+rN3GF5gwOFlBsgh002ZxpnMVK82FJ8XjP5UQjz/v45+dC0vU2OjU4D5Rr8vVJjqSX7bHMi8Zzh+RMM7LYKBMOXBqkKev1oBBnkesrx06RCgAbUDAaixIwJQetKGDeiGmj98RZI4dwTT1C2ud7m10emIEvGCbTL94yL92jJV7B+vptcI1HTavZRqEnmxZvWfXUczPVsWNWIWbvT41xwSWHsolQZ86S37fLHKNdSgX1SOlXpigCJAdSL3ST1YMapZpXhmj/pYbkZQY9U3Ax9ggKW7YSicxtGQoKVwVSm/UcKDY1xTbV+SlhPLfP28GRvDauATg/P1Be5ekSyF+6iEwf1RNdmWMYU/xVkfqrjf5e+f7YcPiCKpGGLxk6G7vOQhHM4ssWC1aX8sV/RqtS1Co9rK+6tmT+cMgoLBqpkOYEnNiqRfdbcYns9v3TooTV+XQsG8oL X-Microsoft-Antispam-Message-Info: loUsxyojc//h9CjlfKMPkZsRHXHb9F0l6yiWbG3IfF20hH0L9zoolpfe27dufQPFyg35hrBmhx9Xc9Bb9nrTP5MbtE2wdX8lG/vkYVK4NLWAdJlKQvOPvzMqCkzbMHs3I5rBh7ryQFUKCRPfYRJbIAEdC/42PlzQRz0qVA2tD4Wj85OcO8QQMoqghPi8Aaeg X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 6:GwcNJoqwkCk0vFpzAJWk4UwkT6IaBHtMMPTrVS6fdkQS9Lr9lS+rIOWu5JYr8mF1tWgiqkvnZx08NR1NH7oD/cFqOS2yKpnWYzTnzgyfJxJIjTbEsuNv5GTa2jvdbkFCTQFJeHXP3obeaGWNxeO7E3MqvjtVKd2hdDk5Dt0OUEJWUL/hHbNhSkxGTsMDwRm0vG2IM3gTm52aVNygm9xoJrzip6zJtoaExgGrOKd/hHWF0xpW3MDJkDIjdrSIt53H3uavC5aLNFg2hNfcKX2BCdKesHralOtfnlhtHmaJDYt+lFgx/sWYlnQlIITQ04sU2JITfzQuhpXtPdyb4UauPwfwi/XsJvqHn6jFCBLlzjZF2rF69VylyKdoatszzQkZgbOPk04b1CNUvOLRRhiFofz6DNoAIvReXGFhE3Rgk5JMqYgmWb5clEkW/M7kOtcjnwqcw37/RojKbXdum8dGdA==; 5:i0Cq0Y6wNalZqeqtSnml3HtKAdpveSoQbO2WK7icUM5CM/tp/avlG28GqH21hWdyUfNlDlADQ834vZL1bA7qkmgs5boFRvGQ3gIHnpsqvrGlrfIsKdNLAJFUeeNmGAmu/Oqx4P3hbo+j8ciAcyGfNlbN3IV8dtWYVYMTkB67th4=; 24:xX+ZYvGOo/cNeapxfBVJwynvydPEbcuVtaJ9IFJtLAyZlsS3olQaVhJ4Le3m4qWHnvp9PgVyMlCI73fVZoNFasCPEjfm24OzmkIKCMpgOcc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MW2PR1501MB2057; 7:eKZjtghS2sBk0b8fU7LP/WwWV0/J/8wqVV6BQS/+28N6kM0c+3A+vHQzCLDFweuEkylAdNY62uMHTPJY8SeIlgToT1KED+7PzIvKmY8UG/JRMrOeAjGlYV/9GqBARrjz8LbdsuYfLUWlUOmxaRH/6jZbF4zDPcRh0lfwoclSXRtZnUdg2TmJqy54fVZ2EDZvlB6z+BxzJwm/Xhyt8zivoC+vXybdIIJV/mk0wEn621zCWDhfVK3XPcIc0Kbc/Zr+ X-MS-Office365-Filtering-Correlation-Id: d5f4e6ee-5d41-4fbd-897f-08d5b9feace2 X-OriginatorOrg: opengear.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 May 2018 00:56:20.9902 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d5f4e6ee-5d41-4fbd-897f-08d5b9feace2 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 --- discover/Makefile.am | 3 +-- discover/boot.c | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/discover/Makefile.am b/discover/Makefile.am index ef4c602..3992a66 100644 --- a/discover/Makefile.am +++ b/discover/Makefile.am @@ -59,8 +59,7 @@ discover_pb_discover_LDADD = \ discover/grub2/grub2-parser.ro \ discover/platform.ro \ $(core_lib) \ - $(UDEV_LIBS) \ - $(GPGME_LIBS) + $(UDEV_LIBS) discover_pb_discover_LDFLAGS = \ $(AM_LDFLAGS) \ diff --git a/discover/boot.c b/discover/boot.c index 0da40e3..0499a52 100644 --- a/discover/boot.c +++ b/discover/boot.c @@ -26,7 +26,7 @@ #include "resource.h" #include "platform.h" -#include +#include static const char *boot_hook_dir = PKG_SYSCONF_DIR "/boot.d"; enum { @@ -72,7 +72,7 @@ static int kexec_load(struct boot_task *boot_task) boot_task->local_dtb_override = NULL; boot_task->local_image_override = NULL; - if ((result = gpg_validate_boot_files(boot_task))) { + if ((result = validate_boot_files(boot_task))) { if (result == KEXEC_LOAD_DECRYPTION_FALURE) { pb_log("%s: Aborting kexec due to" " decryption failure\n", __func__); @@ -144,7 +144,7 @@ static int kexec_load(struct boot_task *boot_task) } abort_kexec: - gpg_validate_boot_files_cleanup(boot_task); + validate_boot_files_cleanup(boot_task); return result; } @@ -598,21 +598,21 @@ struct boot_task *boot(void *ctx, struct discover_boot_option *opt, if (boot_task->verify_signature) { /* Generate names of associated signature files and load */ if (image) { - image_sig = gpg_get_signature_url(ctx, image); + image_sig = get_signature_url(ctx, image); tmp = add_boot_resource(boot_task, _("kernel image signature"), image_sig, &boot_task->local_image_signature); rc |= start_url_load(boot_task, tmp); } if (initrd) { - initrd_sig = gpg_get_signature_url(ctx, initrd); + initrd_sig = get_signature_url(ctx, initrd); tmp = add_boot_resource(boot_task, _("initrd signature"), initrd_sig, &boot_task->local_initrd_signature); rc |= start_url_load(boot_task, tmp); } if (dtb) { - dtb_sig = gpg_get_signature_url(ctx, dtb); + dtb_sig = get_signature_url(ctx, dtb); tmp = add_boot_resource(boot_task, _("dtb signature"), dtb_sig, &boot_task->local_dtb_signature);