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 ACAE681E10 for ; Tue, 17 Jan 2017 21:00:20 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP; 17 Jan 2017 21:00:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,247,1477983600"; d="scan'208";a="214635213" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga004.fm.intel.com with ESMTP; 17 Jan 2017 21:00:20 -0800 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 21:00:20 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 21:00:14 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.177]) with mapi id 14.03.0248.002; Wed, 18 Jan 2017 13:00:13 +0800 From: "Wu, Jiaxin" To: Gary Lin , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" Thread-Topic: [edk2] [PATCH] NetworkPkg/TlsAuthConfigDxe: Declare EFIAPI for the ChooseFile handler Thread-Index: AQHSb8Ic3hMKl3VVuU2PaN80hsk2vaE9r81g Date: Wed, 18 Jan 2017 05:00:13 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B727416294A77@SHSMSX103.ccr.corp.intel.com> References: <20170116063010.6223-1-glin@suse.com> In-Reply-To: <20170116063010.6223-1-glin@suse.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmI2NTdmMjktNGZkMy00NGU5LTg5NWYtNDlmZjJjNjQwNGVlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImJTZWJya3NMVEZXMzdYRmp5UTlUT2UxRjRIc3JURlU5YlZ3YTA1c2lBU1E9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] NetworkPkg/TlsAuthConfigDxe: Declare EFIAPI for the ChooseFile handler 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: Wed, 18 Jan 2017 05:00:20 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Commit version: https://github.com/tianocore/edk2/commit/7be6e6776253d3638f03375e346e978228= af5edb Thanks, Jiaxin > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ga= ry > Lin > Sent: Monday, January 16, 2017 2:30 PM > To: edk2-devel@lists.01.org > Cc: Fu, Siyuan ; Wu, Jiaxin > Subject: [edk2] [PATCH] NetworkPkg/TlsAuthConfigDxe: Declare EFIAPI for t= he > ChooseFile handler >=20 > The ChooseFile handler, UpdateCAFromFile, has to be EFIAPI or gcc would > use the wrong ABI and cause the crash of the firmware. This commit also > removes the unnecessary type casting in ChooseFile. >=20 > Cc: Siyuan Fu > Cc: Jiaxin Wu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin > --- > NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > index 5f04503887..fedfb01be9 100644 > --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c > @@ -1218,6 +1218,7 @@ UpdatePage( > @retval FALSE Not exit caller function. > **/ > BOOLEAN > +EFIAPI > UpdateCAFromFile ( > IN EFI_DEVICE_PATH_PROTOCOL *FilePath > ) > @@ -1728,7 +1729,7 @@ TlsAuthConfigAccessCallback ( > CleanUpPage (LabelId, Private); > break; > case KEY_TLS_AUTH_CONFIG_ENROLL_CERT_FROM_FILE: > - ChooseFile( NULL, NULL, (CHOOSE_HANDLER) UpdateCAFromFile, &File); > + ChooseFile( NULL, NULL, UpdateCAFromFile, &File); > break; >=20 > case KEY_TLS_AUTH_CONFIG_VALUE_SAVE_AND_EXIT: > -- > 2.11.0 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel