From patchwork Sun Jun 8 16:42:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 357244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 305CD14008D; Mon, 9 Jun 2014 02:43:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WtgBe-0003BH-44; Sun, 08 Jun 2014 16:43:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WtgBM-00039L-HN for fwts-devel@lists.ubuntu.com; Sun, 08 Jun 2014 16:42:56 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginm.net ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1WtgBM-00029X-Ei for fwts-devel@lists.ubuntu.com; Sun, 08 Jun 2014 16:42:56 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 11/12] uefi: securebootcert: re-arrange code to avoid declarations after code Date: Sun, 8 Jun 2014 17:42:21 +0100 Message-Id: <1402245742-744-12-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1402245742-744-1-git-send-email-colin.king@canonical.com> References: <1402245742-744-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 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-bounces@lists.ubuntu.com From: Colin Ian King Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/uefi/securebootcert/securebootcert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uefi/securebootcert/securebootcert.c b/src/uefi/securebootcert/securebootcert.c index 92bf30d..53d9e13 100644 --- a/src/uefi/securebootcert/securebootcert.c +++ b/src/uefi/securebootcert/securebootcert.c @@ -176,7 +176,7 @@ static bool check_sigdb_presence(uint8_t *var_data, size_t datalen, uint8_t *key return key_found; for (var_data_addr = var_data; var_data_addr < var_data + datalen; ) { - + EFI_GUID SignatureOwner; siglist = *((EFI_SIGNATURE_LIST *)var_data_addr); /* check for potential overflow */ @@ -197,8 +197,7 @@ static bool check_sigdb_presence(uint8_t *var_data, size_t datalen, uint8_t *key } var_data_addr += sizeof(siglist) + siglist.SignatureHeaderSize; - - EFI_GUID SignatureOwner = *(EFI_GUID *)var_data_addr; + SignatureOwner = *(EFI_GUID *)var_data_addr; if (key_len != (siglist.SignatureSize - sizeof(SignatureOwner))) { var_data_addr += siglist.SignatureSize; @@ -251,6 +250,7 @@ static void securebootcert_key_ex_key(fwts_framework *fw, fwts_uefi_var *var, ch { bool ident = false; + fwts_release *release; EFI_GUID global_var_guid = EFI_GLOBAL_VARIABLE; if (strcmp(varname, "KEK")) @@ -265,7 +265,7 @@ static void securebootcert_key_ex_key(fwts_framework *fw, fwts_uefi_var *var, ch return; } - fwts_release *release = fwts_release_get(); + release = fwts_release_get(); if (release == NULL) { fwts_skipped(fw, "Cannot determine system, stop checking the Master CA certificate."); return;