From patchwork Wed Nov 6 09:45:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Hu X-Patchwork-Id: 1190194 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 477M8t3WWnz9sQp; Wed, 6 Nov 2019 20:45:32 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iSHsX-0002Yl-TE; Wed, 06 Nov 2019 09:45:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSHsW-0002Yf-Md for fwts-devel@lists.ubuntu.com; Wed, 06 Nov 2019 09:45:28 +0000 Received: from [106.104.115.126] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSHsU-00012h-I2; Wed, 06 Nov 2019 09:45:28 +0000 From: Ivan Hu To: fwts-devel@lists.ubuntu.com Subject: [PATCH 1/5] lib: move the global variable guid to lib header Date: Wed, 6 Nov 2019 17:45:12 +0800 Message-Id: <20191106094516.15762-2-ivan.hu@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191106094516.15762-1-ivan.hu@canonical.com> References: <20191106094516.15762-1-ivan.hu@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" Signed-off-by: Ivan Hu Acked-by: Colin Ian King Acked-by: Alex Hung --- src/lib/include/fwts_uefi.h | 6 ++++++ src/uefi/securebootcert/securebootcert.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/include/fwts_uefi.h b/src/lib/include/fwts_uefi.h index 754e00d..418b881 100644 --- a/src/lib/include/fwts_uefi.h +++ b/src/lib/include/fwts_uefi.h @@ -26,6 +26,12 @@ PRAGMA_PACK_WARN_OFF #define FWTS_UEFI_LOAD_OPTION_ACTIVE 0x00000001 #define FWTS_UEFI_LOAD_OPTION_FORCE_RECONNECT 0x00000002 +#define EFI_GLOBAL_VARIABLE \ +{ \ + 0x8BE4DF61, 0x93CA, 0x11d2, { 0xAA, 0x0D, 0x00, \ + 0xE0, 0x98, 0x03, 0x2B, 0x8C} \ +} + typedef struct { uint16_t *varname; uint8_t guid[16]; diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c index 99057cf..14e636e 100644 --- a/src/uefi/securebootcert/securebootcert.c +++ b/src/uefi/securebootcert/securebootcert.c @@ -53,12 +53,6 @@ typedef struct _EFI_SIGNATURE_LIST { #define VAR_AUDITMODE_FOUND (1 << 4) #define VAR_DEPLOYEDMODE_FOUND (1 << 5) -#define EFI_GLOBAL_VARIABLE \ -{ \ - 0x8BE4DF61, 0x93CA, 0x11d2, { 0xAA, 0x0D, 0x00, \ - 0xE0, 0x98, 0x03, 0x2B, 0x8C} \ -} - #define EFI_IMAGE_SECURITY_DATABASE_GUID \ { \ 0xd719b2cb, 0x3d3a, 0x4596, { 0xa3, 0xbc, 0xda, \