From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 07A4F81F3A for ; Mon, 27 Feb 2017 23:08:15 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2017 23:08:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,218,1484035200"; d="scan'208";a="1103064882" Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.60]) by orsmga001.jf.intel.com with ESMTP; 27 Feb 2017 23:08:13 -0800 From: Jiaxin Wu To: edk2-devel@lists.01.org Cc: Ye Ting , Fu Siyuan , Wu Jiaxin Date: Tue, 28 Feb 2017 15:08:11 +0800 Message-Id: <1488265691-87360-1-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 Subject: [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: Tue, 28 Feb 2017 07:08:15 -0000 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/TlsAuthConfigDxe/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. -Copyright (c) 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2016 - 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 http://opensource.org/licenses/bsd-license.php @@ -105,148 +105,10 @@ GuidToString ( Guid ); } /** - Convert a String to Guid Value. - - @param[in] Str Specifies the String to be converted. - @param[in] StrLen Number of Unicode Characters of String (exclusive \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 - ) -{ - CHAR16 *PtrBuffer; - CHAR16 *PtrPosition; - UINT16 *Buffer; - UINTN Data; - UINTN Index; - UINT16 Digits[3]; - - Buffer = (CHAR16 *) AllocateZeroPool (sizeof (CHAR16) * (StrLen + 1)); - if (Buffer == NULL) { - return EFI_OUT_OF_RESOURCES; - } - - StrCpyS (Buffer, (StrLen + 1), Str); - - // - // Data1 - // - PtrBuffer = Buffer; - PtrPosition = PtrBuffer; - while (*PtrBuffer != L'\0') { - if (*PtrBuffer == L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer == L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - - *PtrBuffer = L'\0'; - Data = StrHexToUintn (PtrPosition); - Guid->Data1 = (UINT32)Data; - - // - // Data2 - // - PtrBuffer++; - PtrPosition = PtrBuffer; - while (*PtrBuffer != L'\0') { - if (*PtrBuffer == L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer == L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - *PtrBuffer = L'\0'; - Data = StrHexToUintn (PtrPosition); - Guid->Data2 = (UINT16)Data; - - // - // Data3 - // - PtrBuffer++; - PtrPosition = PtrBuffer; - while (*PtrBuffer != L'\0') { - if (*PtrBuffer == L'-') { - break; - } - PtrBuffer++; - } - if (*PtrBuffer == L'\0') { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - *PtrBuffer = L'\0'; - Data = StrHexToUintn (PtrPosition); - Guid->Data3 = (UINT16)Data; - - // - // Data4[0..1] - // - for ( Index = 0 ; Index < 2 ; Index++) { - PtrBuffer++; - if ((*PtrBuffer == L'\0') || ( *(PtrBuffer + 1) == L'\0')) { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - Digits[0] = *PtrBuffer; - PtrBuffer++; - Digits[1] = *PtrBuffer; - Digits[2] = L'\0'; - Data = StrHexToUintn (Digits); - Guid->Data4[Index] = (UINT8)Data; - } - - // - // skip the '-' - // - PtrBuffer++; - if ((*PtrBuffer != L'-' ) || ( *PtrBuffer == L'\0')) { - return EFI_NOT_FOUND; - } - - // - // Data4[2..7] - // - for ( ; Index < 8; Index++) { - PtrBuffer++; - if ((*PtrBuffer == L'\0') || ( *(PtrBuffer + 1) == L'\0')) { - FreePool (Buffer); - return EFI_NOT_FOUND; - } - Digits[0] = *PtrBuffer; - PtrBuffer++; - Digits[1] = *PtrBuffer; - Digits[2] = L'\0'; - Data = StrHexToUintn (Digits); - Guid->Data4[Index] = (UINT8)Data; - } - - FreePool (Buffer); - - return EFI_SUCCESS; -} - - -/** List all cert in specified database by GUID in the page for user to select and delete as needed. @param[in] PrivateData Module's private data. @param[in] VariableName The variable name of the vendor's signature database. @@ -1216,11 +1078,11 @@ UpdatePage( @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; case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT: Status = EnrollCertDatabase (Private, EFI_TLS_CA_CERTIFICATE_VARIABLE); if (EFI_ERROR (Status)) { @@ -1788,16 +1651,16 @@ TlsAuthConfigAccessCallback ( } } else if (Action == EFI_BROWSER_ACTION_CHANGED) { switch (QuestionId) { case KEY_TLS_AUTH_CONFIG_CERT_GUID: ASSERT (Private->CertGuid != NULL); - Status = StringToGuid ( - IfrNvData->CertGuid, - StrLen (IfrNvData->CertGuid), - Private->CertGuid - ); - if (EFI_ERROR (Status)) { + RStatus = StrToGuid ( + IfrNvData->CertGuid, + Private->CertGuid + ); + if (RETURN_ERROR (RStatus) || (IfrNvData->CertGuid[GUID_STRING_LENGTH] != L'\0')) { + Status = EFI_INVALID_PARAMETER; break; } *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; break; -- 1.9.5.msysgit.1