From nobody Thu May 2 23:13:51 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 1488265697371807.7496263900082; Mon, 27 Feb 2017 23:08:17 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BF47681F42; Mon, 27 Feb 2017 23:08:15 -0800 (PST) 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 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 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,218,1484035200"; d="scan'208";a="1103064882" From: Jiaxin Wu To: edk2-devel@lists.01.org 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: [edk2] [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: , Cc: Ye Ting , Fu Siyuan , Wu Jiaxin 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" Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin Reviewed-by: Ye Ting =20 --- 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 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 ); } =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; -} - - -/** 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; --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel