From nobody Fri May 17 17:47:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+57106+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57106+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=phoenix.com ARC-Seal: i=1; a=rsa-sha256; t=1586423652; cv=none; d=zohomail.com; s=zohoarc; b=AFtX85hSZhI/X894RKLPCZDqSiaAGwn9CigfErWjuUSZVpx8X+AGGLvMTh18IwJb5SVZDRdQIQdLgGnJpbvc1AFSvUsWRnaLNL94bBpZiGdDvm6qILyeWWsNjnQBa3tzQjYJr0CY94sMJCUjvsmOb7qr8A5ZaHnepBZGTn16lls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586423652; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=GqV5h55NdbOSUA98my4Tc+HzfpenoC+2tdfl6eMa8qM=; b=lNkVltTkkGzZZOU37qs2OujGEcEfDlMZ1ycT35W0YhFji9IibOKf9ID8CILF6keK4QTccILAN/kbwf9SwrhMxzqtGRWFGQZNQXq5ddyezDoqjWUKGo3W0KYRG2d6lvaKnbbCk/mAbSb7famYBUCDBlSDWBGSJvavp6N7TtlJUmk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+57106+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1586423652785378.92830420107975; Thu, 9 Apr 2020 02:14:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ONAIYY1788612x87nyLOKO8U; Thu, 09 Apr 2020 02:14:12 -0700 X-Received: from us-smtp-delivery-170.mimecast.com (us-smtp-delivery-170.mimecast.com [216.205.24.170]) by mx.groups.io with SMTP id smtpd.web10.3571.1586410334706210113 for ; Wed, 08 Apr 2020 22:32:14 -0700 X-Received: from TWN-EXCHMB-13.phoenix.com (123.51.168.5 [123.51.168.5]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-KRzCKFdfMG6AxXIZ49UZMQ-1; Thu, 09 Apr 2020 01:32:12 -0400 X-MC-Unique: KRzCKFdfMG6AxXIZ49UZMQ-1 X-CrossPremisesHeadersFilteredBySendConnector: TWN-EXCHMB-13.phoenix.com X-Received: from SCL-EXCHMB-13.phoenix.com (10.122.68.16) by TWN-EXCHMB-13.phoenix.com (10.122.170.118) with Microsoft SMTP Server (TLS) id 15.0.1156.6; Thu, 9 Apr 2020 13:32:06 +0800 X-Received: from Keysound-Chang.phoenix.com (10.122.168.247) by SCL-EXCHMB-13.phoenix.com (10.122.68.16) with Microsoft SMTP Server id 15.0.1156.6 via Frontend Transport; Wed, 8 Apr 2020 22:32:05 -0700 From: "Keysound Chang" To: CC: Keysound , Jiaxin Wu , Siyuan Fu , Maciej Rabeda Subject: [edk2-devel] [PATCH] TlsAuthConfigDxe: Use HiiPopUp->CreatePopup() instead of CreatePopUp() Date: Thu, 9 Apr 2020 13:30:05 +0800 Message-ID: <849b68d6a6c0d164ec70918eeafaf5d88348f4f4.1586409983.git.keysound_chang@phoenix.com> MIME-Version: 1.0 X-OrganizationHeadersPreserved: TWN-EXCHMB-13.phoenix.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: phoenix.com Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,keysound_chang@phoenix.com X-Gm-Message-State: BtuWBSXDi0zPM7BBS1WuKEkpx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1586423652; bh=3pz3pwW74WDnlxwm0g/pb1fYFLIZwvx7ITYXOZrgDj8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=SgaUtDaJ1DXuOcTGR1+0zG/XHjhK6U4Wsw68Hcce+ToelbZbrPC+NqNkXsrxu4Ad0YU ZdlfSkvz5+RC+YGs5MTTpR9ufmKjlk3/7XXPVBxfkpIoWgOFpahmL9/v33/PyYC+R7TgE uYZYKnRhDl8ROrWd716qkT9yd/BtjeVlhZE= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2635 According to EDK2 Driver Writer's Guide For UEFI 2.3.1, 4.2.18 Offer alternatives to function keys. Configuration of drivers should be accomplished via HII and via OS-present interfaces. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Maciej Rabeda Signed-off-by: Keysound --- .../TlsAuthConfigDxe/TlsAuthConfigDxe.inf | 1 + .../TlsAuthConfigDxeStrings.uni | 2 ++ .../TlsAuthConfigDxe/TlsAuthConfigImpl.c | 20 +++++++++++++------ .../TlsAuthConfigDxe/TlsAuthConfigImpl.h | 1 + 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf b/NetworkPkg/= TlsAuthConfigDxe/TlsAuthConfigDxe.inf index 3fc924a1d4..0ada835252 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf @@ -52,6 +52,7 @@ [Protocols] gEfiDevicePathProtocolGuid ## PRODUCES gEfiHiiConfigAccessProtocolGuid ## PRODUCES + gEfiHiiPopupProtocolGuid ## CONSUMES =20 [Guids] gTlsAuthConfigGuid ## PRODUCES ## GUID diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni b/Netw= orkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni index 973b8b7716..2b4a27d24e 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxeStrings.uni @@ -28,6 +28,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #string STR_TLS_AUTH_CONFIG_SAVE_AND_EXIT #language en-US "Comm= it Changes and Exit" #string STR_TLS_AUTH_CONFIG_NO_SAVE_AND_EXIT #language en-US "Disc= ard Changes and Exit" =20 +#string STR_TLS_AUTH_ENROLL_CERT_FAILURE #language en-US "Enro= ll Cert Failure!" + #string STR_CERT_TYPE_PCKS_GUID #language en-US "GUID= for CERT" =20 #string STR_NULL #language en-US "" diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/T= lsAuthConfigDxe/TlsAuthConfigImpl.c index 2481d1098f..0ef96dfaf2 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -1383,7 +1383,6 @@ TlsAuthConfigAccessCallback ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest ) { - EFI_INPUT_KEY Key; EFI_STATUS Status; RETURN_STATUS RStatus; TLS_AUTH_CONFIG_PRIVATE_DATA *Private; @@ -1391,6 +1390,8 @@ TlsAuthConfigAccessCallback ( TLS_AUTH_CONFIG_IFR_NVDATA *IfrNvData; UINT16 LabelId; EFI_DEVICE_PATH_PROTOCOL *File; + EFI_HII_POPUP_PROTOCOL *HiiPopUp; + EFI_HII_POPUP_SELECTION PopUpSelect; =20 Status =3D EFI_SUCCESS; File =3D NULL; @@ -1402,6 +1403,11 @@ TlsAuthConfigAccessCallback ( Private =3D TLS_AUTH_CONFIG_PRIVATE_FROM_THIS (This); =20 mTlsAuthPrivateData =3D Private; + Status =3D gBS->LocateProtocol (&gEfiHiiPopupProtocolGuid, NULL, &HiiPop= Up); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Can't find Form PopUp protocol. Exit (%r)\n", St= atus)); + return Status; + } =20 // // Retrieve uncommitted data from Browser @@ -1460,11 +1466,13 @@ TlsAuthConfigAccessCallback ( if (EFI_ERROR (Status)) { CleanFileContext (Private); =20 - CreatePopUp ( - EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, - &Key, - L"ERROR: Enroll Cert Failure!", - NULL + HiiPopUp->CreatePopup( + HiiPopUp, + EfiHiiPopupStyleError, + EfiHiiPopupTypeOk, + Private->RegisteredHandle, + STRING_TOKEN(STR_TLS_AUTH_ENROLL_CERT_FAILURE), + &PopUpSelect ); } break; diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h b/NetworkPkg/T= lsAuthConfigDxe/TlsAuthConfigImpl.h index e9af492893..68c16845b3 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h @@ -14,6 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include #include +#include =20 // // Libraries --=20 2.23.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57106): https://edk2.groups.io/g/devel/message/57106 Mute This Topic: https://groups.io/mt/72892619/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-