From nobody Sat Nov 2 16:24:20 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1488180180347158.7746615756896; Sun, 26 Feb 2017 23:23:00 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A7F47821B2; Sun, 26 Feb 2017 23:22:51 -0800 (PST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 50BD981F45 for ; Sun, 26 Feb 2017 23:22:49 -0800 (PST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP; 26 Feb 2017 23:22:49 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga005.fm.intel.com with ESMTP; 26 Feb 2017 23:22:48 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,213,1484035200"; d="scan'208";a="69934253" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Mon, 27 Feb 2017 15:22:36 +0800 Message-Id: <20170227072239.273228-9-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170227072239.273228-1-ruiyu.ni@intel.com> References: <20170227072239.273228-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH v2 08/11] SecurityPkg/SecureBootConfigDxe: Use StrToGuid in BaseLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiewen Yao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jiewen Yao --- .../SecureBootConfigDxe/SecureBootConfigImpl.c | 12 +- .../SecureBootConfigDxe/SecureBootConfigImpl.h | 22 +--- .../SecureBootConfigDxe/SecureBootConfigMisc.c | 141 +----------------= ---- 3 files changed, 7 insertions(+), 168 deletions(-) diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Secu= reBootConfigImpl.c index 0d96185..37c0b1b 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.c @@ -1,7 +1,7 @@ /** @file HII Config Access protocol implementation of SecureBoot configuration mo= dule. =20 -Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -3254,6 +3254,7 @@ SecureBootCallback ( { EFI_INPUT_KEY Key; EFI_STATUS Status; + RETURN_STATUS RStatus; SECUREBOOT_CONFIG_PRIVATE_DATA *Private; UINTN BufferSize; SECUREBOOT_CONFIGURATION *IfrNvData; @@ -3636,12 +3637,9 @@ SecureBootCallback ( case KEY_SECURE_BOOT_SIGNATURE_GUID_DBX: case KEY_SECURE_BOOT_SIGNATURE_GUID_DBT: ASSERT (Private->SignatureGUID !=3D NULL); - Status =3D StringToGuid ( - IfrNvData->SignatureGuid, - StrLen (IfrNvData->SignatureGuid), - Private->SignatureGUID - ); - if (EFI_ERROR (Status)) { + RStatus =3D StrToGuid (IfrNvData->SignatureGuid, Private->SignatureG= UID); + if (RETURN_ERROR (RStatus) || (IfrNvData->SignatureGuid[GUID_STRING_= LENGTH] !=3D L'\0')) { + Status =3D EFI_INVALID_PARAMETER; break; } =20 diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigImpl.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Secu= reBootConfigImpl.h index 5055a9e..aa58c44 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.h +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gImpl.h @@ -2,7 +2,7 @@ The header file of HII Config Access protocol implementation of SecureBo= ot configuration module. =20 -Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -479,26 +479,6 @@ Int2OctStr ( IN UINTN OSSizeInBytes ); =20 - -/** - Convert a String to Guid Value. - - @param[in] Str Specifies the String to be converted. - @param[in] StrLen Number of Unicode Characters of String (exclusiv= e \0) - @param[out] Guid Return the result Guid value. - - @retval EFI_SUCCESS The operation is finished successfully. - @retval EFI_NOT_FOUND Invalid string. - -**/ -EFI_STATUS -StringToGuid ( - IN CHAR16 *Str, - IN UINTN StrLen, - OUT EFI_GUID *Guid - ); - - /** Worker function that prints an EFI_GUID into specified Buffer. =20 diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBo= otConfigMisc.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/Secu= reBootConfigMisc.c index a83504e..038707c 100644 --- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gMisc.c +++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfi= gMisc.c @@ -1,7 +1,7 @@ /** @file Helper functions for SecureBoot configuration module. =20 -Copyright (c) 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -152,145 +152,6 @@ Int2OctStr ( return EFI_SUCCESS; } =20 - - -/** - Convert a String to Guid Value. - - @param[in] Str Specifies the String to be converted. - @param[in] StrLen Number of Unicode Characters of String (exclusiv= e \0) - @param[out] Guid Return the result Guid value. - - @retval EFI_SUCCESS The operation is finished successfully. - @retval EFI_NOT_FOUND Invalid string. - -**/ -EFI_STATUS -StringToGuid ( - IN CHAR16 *Str,=20 - IN UINTN StrLen,=20 - OUT EFI_GUID *Guid - ) -{ - CHAR16 *PtrBuffer; - CHAR16 *PtrPosition; - UINT16 *Buffer; - UINTN Data; - UINTN Index; - UINT16 Digits[3]; - - Buffer =3D (CHAR16 *) AllocateZeroPool (sizeof (CHAR16) * (StrLen + 1)); - if (Buffer =3D=3D NULL) { - return EFI_OUT_OF_RESOURCES; - } - - StrCpyS (Buffer, (StrLen + 1), Str); - - // - // Data1 - // - PtrBuffer =3D Buffer; - PtrPosition =3D PtrBuffer;=20 - while (*PtrBuffer !=3D L'\0') { - if (*PtrBuffer =3D=3D L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer =3D=3D L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - - *PtrBuffer =3D L'\0'; - Data =3D StrHexToUintn (PtrPosition); - Guid->Data1 =3D (UINT32)Data; - - // - // Data2 - // - PtrBuffer++; - PtrPosition =3D PtrBuffer; - while (*PtrBuffer !=3D L'\0') { - if (*PtrBuffer =3D=3D L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer =3D=3D L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - *PtrBuffer =3D L'\0'; - Data =3D StrHexToUintn (PtrPosition); - Guid->Data2 =3D (UINT16)Data; - - // - // Data3 - // - PtrBuffer++; - PtrPosition =3D PtrBuffer; - while (*PtrBuffer !=3D L'\0') { - if (*PtrBuffer =3D=3D L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer =3D=3D L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - *PtrBuffer =3D L'\0'; - Data =3D StrHexToUintn (PtrPosition); - Guid->Data3 =3D (UINT16)Data; - - // - // Data4[0..1] - // - for ( Index =3D 0 ; Index < 2 ; Index++) { - PtrBuffer++; - if ((*PtrBuffer =3D=3D L'\0') || ( *(PtrBuffer + 1) =3D=3D L'\0')) { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - Digits[0] =3D *PtrBuffer; - PtrBuffer++; - Digits[1] =3D *PtrBuffer; - Digits[2] =3D L'\0'; - Data =3D StrHexToUintn (Digits); - Guid->Data4[Index] =3D (UINT8)Data; - } - - // - // skip the '-' - // - PtrBuffer++; - if ((*PtrBuffer !=3D L'-' ) || ( *PtrBuffer =3D=3D L'\0')) { - return EFI_NOT_FOUND; - } - - // - // Data4[2..7] - // - for ( ; Index < 8; Index++) { - PtrBuffer++; - if ((*PtrBuffer =3D=3D L'\0') || ( *(PtrBuffer + 1) =3D=3D L'\0')) { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - Digits[0] =3D *PtrBuffer; - PtrBuffer++; - Digits[1] =3D *PtrBuffer; - Digits[2] =3D L'\0'; - Data =3D StrHexToUintn (Digits); - Guid->Data4[Index] =3D (UINT8)Data; - } - - FreePool (Buffer); - =20 - return EFI_SUCCESS; -} - /** Worker function that prints an EFI_GUID into specified Buffer. =20 --=20 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel