From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 929B282215 for ; Thu, 2 Mar 2017 23:28:06 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2017 23:28:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,235,1484035200"; d="scan'208";a="940135187" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 02 Mar 2017 23:28:05 -0800 Received: from fmsmsx158.amr.corp.intel.com (10.18.116.75) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 2 Mar 2017 23:28:05 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx158.amr.corp.intel.com (10.18.116.75) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 2 Mar 2017 23:28:05 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by shsmsx102.ccr.corp.intel.com ([169.254.2.88]) with mapi id 14.03.0248.002; Fri, 3 Mar 2017 15:28:01 +0800 From: "Ye, Ting" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" Thread-Topic: [Patch] NetworkPkg/TlsAuthConfigDxe: Use StrToGuid in BaseLib Thread-Index: AQHSkZFxpT/aH6YkJUGhPXHaQ8doLaF/c7qw Date: Fri, 3 Mar 2017 07:28:01 +0000 Message-ID: References: <1488265691-87360-1-git-send-email-jiaxin.wu@intel.com> In-Reply-To: <1488265691-87360-1-git-send-email-jiaxin.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] NetworkPkg/TlsAuthConfigDxe: 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: , X-List-Received-Date: Fri, 03 Mar 2017 07:28:06 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ye Ting =20 -----Original Message----- From: Wu, Jiaxin=20 Sent: Tuesday, February 28, 2017 3:08 PM To: edk2-devel@lists.01.org Cc: Ye, Ting ; Fu, Siyuan ; Wu, Jia= xin Subject: [Patch] NetworkPkg/TlsAuthConfigDxe: Use StrToGuid in BaseLib Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin --- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 157 ++------------------= ---- 1 file changed, 10 insertions(+), 147 deletions(-) diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/T= lsAuthConfigDxe/TlsAuthConfigImpl.c index 4603645..5b4756f 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -1,9 +1,9 @@ /** @file The Miscellaneous Routines for TlsAuthConfigDxe driver. =20 -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at http://opens= ource.org/licenses/bsd-license.php @@ -105,148 +105,10 @@ GuidToString ( Guid ); } =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); - - return EFI_SUCCESS; -} - - -/** List all cert in specified database by GUID in the page=20 for user to select and delete as needed. =20 @param[in] PrivateData Module's private data. @param[in] VariableName The variable name of the vendor's sign= ature database. @@ -1216,11 +1078,11 @@ UpdatePage( =20 @retval TRUE Exit caller function. @retval FALSE Not exit caller function. **/ BOOLEAN -EFIAPI +EFIAPI UpdateCAFromFile ( IN EFI_DEVICE_PATH_PROTOCOL *FilePath ) { return UpdatePage(FilePath, TLS_AUTH_CONFIG_FORMID4_FORM); @@ -1667,10 += 1529,11 @@ TlsAuthConfigAccessCallback ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest ) { EFI_INPUT_KEY Key; EFI_STATUS Status; + RETURN_STATUS RStatus; TLS_AUTH_CONFIG_PRIVATE_DATA *Private; UINTN BufferSize; TLS_AUTH_CONFIG_IFR_NVDATA *IfrNvData; UINT16 LabelId; EFI_DEVICE_PATH_PROTOCOL *File; @@ -1727,11 +1590,11 @@ TlsAuthConfigAccessCallback ( // Refresh selected file. // CleanUpPage (LabelId, Private); break; case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE: - ChooseFile( NULL, NULL, UpdateCAFromFile, &File); + ChooseFile( NULL, NULL, UpdateCAFromFile, &File); break; =20 case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT: Status =3D EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIA= BLE); if (EFI_ERROR (Status)) { @@ -1788,16 +1651,16 @@ TlsAuthConfigAccessCallback ( } } else if (Action =3D=3D EFI_BROWSER_ACTION_CHANGED) { switch (QuestionId) { case KEY_TLS_AUTH_CONFIG_CERT_GUID: ASSERT (Private->CertGuid !=3D NULL); - Status =3D StringToGuid ( - IfrNvData->CertGuid, - StrLen (IfrNvData->CertGuid), - Private->CertGuid - ); - if (EFI_ERROR (Status)) { + RStatus =3D StrToGuid ( + IfrNvData->CertGuid, + Private->CertGuid + ); + if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGT= H] !=3D L'\0')) { + Status =3D EFI_INVALID_PARAMETER; break; } =20 *ActionRequest =3D EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; break; -- 1.9.5.msysgit.1