From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.30203.1664206793153589032 for ; Mon, 26 Sep 2022 08:39:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=PzWKJVOe; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: zachary.clark-williams@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664206793; x=1695742793; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=5SyGPOim6dfIWki2qx7HC2MIL9Z2HF9cVRVZgMvgAY0=; b=PzWKJVOe5v5OaWFvMGvh1bx036PB5oSRph1LJ4PbpWtftJXv2VXuIrUb 4F3hfOLzQqaDdegwreZssJqHWTT/5dg/gq1dyDuq7jChXidn9hOXW053D NkzriptLtbTKtCBFMqIjf1xncBTx+SEXLN2I0OsJpCzyOY9h+Be8Rs2g6 jOCOetOXX70g8b/F5wwt01/r8YD8S6EsGiCNQQzgghL7eDOhvRs8SCV0u 7hXClkdMVrPPJDpN2SF82FL+Z+adTrpsDTzPXS6Q1cOxj7jVCIvRXEeGU ergRKtQ6Qwca0uX5/W9i2Alm799u4uJSY8+q797XIm10eWujwreh7VrQU Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="284178509" X-IronPort-AV: E=Sophos;i="5.93,346,1654585200"; d="scan'208";a="284178509" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2022 08:39:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10482"; a="683574469" X-IronPort-AV: E=Sophos;i="5.93,346,1654585200"; d="scan'208";a="683574469" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga008.fm.intel.com with ESMTP; 26 Sep 2022 08:39:52 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 08:39:51 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 26 Sep 2022 08:39:51 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Mon, 26 Sep 2022 08:39:51 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.42) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Mon, 26 Sep 2022 08:39:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G00nkzuNNiuy0BSPLPnF4u/Obvy3t+s9vcSk0SVKwrFfhVuf+AJJW4xGluzXGgnV1sF/phkRoVqsKRCR61afxMiScuA/a+FDWliLhY/9/SR3q2OHMElespGj3Ey6PiTMdd+6MdwCspQ4KwrO2RJiQ9M15LWAwSbyV8a3O393sXN4UWHs+c65CE5M35ysMTXXVwJpEZMQsiYtKNvOkMVwsbGn8eE4+XMASHdyboU7zQjYZ5HxdnnFne1m4j1y+nQUWawionshFq0qkmCMOW/3qb+E580kbaHFXAUKUwTxgdblc4Lltba6SSnTEOBk+NI8hGblMyQrAlSIOvXJ1xwq1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=myVzFSTRh+BAAxLNYVLkM6tHpP2M734HH27qGPMO+Hc=; b=c9mwYGYFPP93GJqdL8RqlhWgHINZL1gGAK1ba4K75y3iu1BNdbdl9sm9z9+SQNNTmyZT7JuPgtN5Z6ZH03blsRkOQbQblzvdbOLgh0QPhSdAJALDq1Ukdrtl8OvpPzWkw3qNcJXRrDIvbSKZF5AOcYG+yhCyG7IVOOFNj5JEPdSkM3NoUo3JldrXxQE0bI3h5oapABH9PNGzkI5S8BnCa+wGgm+gxYx1FZ9wKsxmR2DCcxh9V5o2NoN1GYXd9LlfZJAbOY32T9Q0Sg6fjI0L7HM8ZJ6HCjzMGRrXpEWHxTiSXrFuf7Yis/YF+Njq82b99fK9k9VV3+j26Mf+5z5sfg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from CO6PR11MB5601.namprd11.prod.outlook.com (2603:10b6:303:13d::7) by CH0PR11MB5313.namprd11.prod.outlook.com (2603:10b6:610:bc::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Mon, 26 Sep 2022 15:39:46 +0000 Received: from CO6PR11MB5601.namprd11.prod.outlook.com ([fe80::994:9a2e:61fb:9918]) by CO6PR11MB5601.namprd11.prod.outlook.com ([fe80::994:9a2e:61fb:9918%3]) with mapi id 15.20.5654.025; Mon, 26 Sep 2022 15:39:46 +0000 From: "Clark-williams, Zachary" To: "Luo, Heng" , "devel@edk2.groups.io" CC: Zachary Clark-Williams , Maciej Rabeda Subject: Re: [edk2-devel] [PATCH] NetworkPkg: Add WiFi profile sync protocol support Thread-Topic: [edk2-devel] [PATCH] NetworkPkg: Add WiFi profile sync protocol support Thread-Index: AQHYyHGcMHFGfTsbAEWDS9jLsOsluK3xZKSAgACFfuA= Date: Mon, 26 Sep 2022 15:39:46 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.500.17 dlp-product: dlpe-windows authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO6PR11MB5601:EE_|CH0PR11MB5313:EE_ x-ms-office365-filtering-correlation-id: 9000073d-d10d-4d6b-1d36-08da9fd5572b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: DsQxJiIc5/3DNHSGaFC2H3jd0i5zI/rcjtOy4FqwvzQGDvbH2q87pucSC6iKDBgxo7mgTTfPAFuZdQca3APJArD1Sc3iUjk+BZQacRawvRhpvJma4t9B9D12vG/nWyPbgt7Da6HHamEPJ3i4gbqrDMB+SvJO4gvWgHkXQWLB6JYMYuKYosOql8/id5pQLnDrbJwaSKmmVuwSWcx9dUk6Ni1p3oT2b6PLlbanr2OTwtATAfMzlsvASPY7IFU8Jm+6Nh0hPgb762yPRWdsneEKVjjQjuF7c4xSO/ss6jY3Ad4gWMXghRjjrhm/hF6ieh8FytUntqVfDvOY1RztFlzYmuaZt8da1f849yH2I5KZahFNnrJ0JCciPA4GvDn69BkyhmUMCP7jBRdGoJg4jOcZKqSbyyO6V7O6QonnXfaBpAqr+d2d4pZ9PI2I5mPFTXL8wajJk3h5NggLqygZ3lpC5IYknrvym5Om4GSD+Erv22+GneHOLaGddDd9F0O/bMvz8v2rt0fHX5Qjiai6o1N2VC1PBKSWFgc0qV3hQy8NgU6jRbr3LGLlvorVB5GUEfqtF+4LvCYMRRsLGqT7SYUQN5GplQf9kGLFZXCv3USUgNCqrSey7lFCxm04snP1lbxhra8tr10qOjXMFGKUkfro+TmI/59QzcjsO2DT+gMo6wmUkNAtzntd/+CT/7g0gboruujtKe6s2u/d8gE6xpFtfkvq8tYXwe2whxBtLEU+rEP31ayLl94mavEEld38tfgIOVoNEEuI01qLqntZ53ehm/jgKMpYGglS5vkueXNxW9hHUF9ZnovFlPiYOnWsB4VWm3rDlV0EV4xHIj5vAL46wmYGKFzxt7n0xb5QoLdbYGU= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO6PR11MB5601.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(6029001)(366004)(39860400002)(136003)(376002)(396003)(346002)(451199015)(110136005)(54906003)(966005)(4326008)(64756008)(66446008)(66476007)(66556008)(66946007)(478600001)(19627235002)(8676002)(316002)(5660300002)(71200400001)(41300700001)(8936002)(53546011)(52536014)(26005)(7696005)(6506007)(30864003)(83380400001)(38100700002)(55016003)(122000001)(38070700005)(2906002)(9686003)(186003)(33656002)(76116006)(86362001)(82960400001)(559001)(579004)(44824005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?1rcPIPWXzd6Ah1T4eGC+YyDe6Ak1Tp4dlSs+n62TIj6jHHfxt/IDGFr5ZYXy?= =?us-ascii?Q?/38JfVpdhrmEsdxJED/lgIs5/id6p1a/fjZRW+O72BdvbMV65IXRgYbn9vZG?= =?us-ascii?Q?0dL9sl69Bj+Xk2/ntcSm4ZB52jnBq22LWnxnEBs1I7pDroVvyDm5AYNcFi58?= =?us-ascii?Q?O509N4sY3Y7xGsmC7dRgxrGv+TDIX50gBChvVOiXF3l7acM4pMH9vUt9cH+Z?= =?us-ascii?Q?OZ4H/pSfm+56bSB7+7UPPUksBzX+kW3ENzXPZIh1yhYzP6OpEQrzQPPhVA+M?= =?us-ascii?Q?0GF6YWzcEQshnYP8EUWQ1FzOIjOd+SpNhc+n/yzi5dmaJIhEsu6sw5+jMNvu?= =?us-ascii?Q?Wu352Up7VX3+Y2sZa5b+0LnQR9Kdou1kneHSJQ/tnDFxsoGihO4HoRiz2Tkm?= =?us-ascii?Q?3I2l2VCpkdmf9PRJqUekPAygcN8PI27Ohf7TCDvDfx7UHmgnHHnKwQ/40DNm?= =?us-ascii?Q?jZ/wvDX4Yb5Xg2JAqLLu5l+m9e+FwwKrV5t6gd0oFeAMvjvtll/DrJiKBTNp?= =?us-ascii?Q?ky3I4fW5SW9ATb8oSSm7NcLRxIPfR8Y8gjlotTY16hX+BoSsafJ41/BC2tzn?= =?us-ascii?Q?ISYXkPo1XzOAk2S+8DihR1LUv7fqiDCyWbieABw2rYtcEfPoV0glXE4amnSq?= =?us-ascii?Q?khM9MRjNu6THnOh5EvgLDxkg7vkfdZzcgkBf1K5RiLOnKkXJSNnUv5K+ywOS?= =?us-ascii?Q?49U9aveHgjyZVla+5Yid6p1dhuzx7axG/1kGqaR3vX/QE0WWFkGbSYYoPqcM?= =?us-ascii?Q?ukfrA/P8t4MRGTbYoWyVnd/6OaAgo21BkwH08umBx+rTF8WRS1n5UiBFZbnM?= =?us-ascii?Q?bE9boysHZaiR1ne/Y1esLaNJmZv53AQIhi6Yr4CuXFvBEsUnImgHgEAg3EdH?= =?us-ascii?Q?Zj3WJbT9kQYPDM32qAyNmu/ij3rwVIxFFNZYdALlQBmhxndwgoQORR/fBwEM?= =?us-ascii?Q?F57FYK7eNlWQ05I0PqJ8Z6USf0S3aDH/mk/9w4LZePouZeq5TwrXb/UUfer0?= =?us-ascii?Q?7nX6rFURW+Dk2Jy1MiYuUMQ4GvRruFJuW9/aVDS5KpO9Gr3gBr9+EItGKPoz?= =?us-ascii?Q?gjJiAoVkpgq6Z0rQbAUQ/wOJoXb/cmi7dhDin+moxbapQBRNzqyIk8pKO3vi?= =?us-ascii?Q?eyq9WTdtHRe3uxL+GN/aNm3siEeTI5/Arw/g7B+KxAFosTU7H7Z1hNL7+U6l?= =?us-ascii?Q?C5u/ZEDmW6NP5gUxKdy1T2PHGtRpjCDSSNO0EVGv99kqgzsGdokgcnCgwSkI?= =?us-ascii?Q?yB55+mGc7Nj9MuyeGFAjYzpkJADBMi8RnrdQQZRXpWQqSvAjjFZru8qHoSQ1?= =?us-ascii?Q?kcJShXmwTuTwwr8PNXGmLHNWZTnsfipTGlzw4AmzmLl6MHHVwv8s0FBdEk9L?= =?us-ascii?Q?3ErysD0t84H9PgJlPwoNYf+f6n3O4inB+v76d9KV5Xv2izs9M/MfHgzoltT1?= =?us-ascii?Q?uOUPx/7xr6EybZaUEBi+XK924LFjjztFjXuB/tq5gxSs/FHf0ZveEoT/x8TY?= =?us-ascii?Q?JDDPLz8gojeKlyNwGSAIsaG5ChKGJHo3B68qGyLdgmqNs12uQocz8Z3W3D2t?= =?us-ascii?Q?TckSRQTjI5fBJs1ZetYD0h9d8lKOwrUsRiOMaIGpmDtiMyhlPnYwQGsHt66f?= =?us-ascii?Q?jaWc0OXSG6u0236TMeup920=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO6PR11MB5601.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9000073d-d10d-4d6b-1d36-08da9fd5572b X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Sep 2022 15:39:46.5327 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xefnQuCTbcsktA2u+EZuafd6OcUSvtTJfk99DF18huQdE44FkltbLOxZ2lAQc6lQ1jjgC/3UQDanUR7z+7MZek8OZ6lCLo3SnCHSQlXOMYXqmf1iht4QjoL6EkWaiRoq X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5313 Return-Path: zachary.clark-williams@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes this is checking if the users entered password had a terminator on the = end, if it doesn't we are adding it.=20 During dev and testing we found a failure case if this was not tested and f= ixed. Thanks, Zack -----Original Message----- From: Luo, Heng =20 Sent: Monday, September 26, 2022 12:37 AM To: devel@edk2.groups.io; Clark-williams, Zachary Cc: Zachary Clark-Williams ; Maciej Rabeda Subject: RE: [edk2-devel] [PATCH] NetworkPkg: Add WiFi profile sync protoco= l support Hi Zachary, > @@ -420,22 +422,34 @@ WifiMgrConfigPassword ( > // > // Set password to supplicant > // > + if (Profile->Password[StrLen (Profile->Password)] !=3D '\0') { > + Profile->Password[StrLen (Profile->Password)] =3D L'\0'; } > + I don't understand this change, StrLen returns the length of a Null-termina= ted Unicode string, it means "Profile->Password[StrLen (Profile->Password)]= " should always be 0. Did you see exceptional case? Thanks, Heng > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Clark-=20 > williams, Zachary > Sent: Thursday, September 15, 2022 3:43 AM > To: devel@edk2.groups.io > Cc: Zachary Clark-Williams ; Clark-williams,=20 > Zachary > Subject: [edk2-devel] [PATCH] NetworkPkg: Add WiFi profile sync=20 > protocol support >=20 > From: Zachary Clark-Williams >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3845 >=20 > Enables KVM and One Click Recovery WLAN capability with WiFi Profile=20 > Sync feature and protocol. Adding WiFiProfileSyncProtocol, which=20 > supports the profilesync driver operations for transferring WiFi=20 > profiles from AMT to the Supplicant. WiFiConnectionManager will check=20 > for the WifiProfileSyncProtocol and if found will operate on the=20 > premise of a One Click Recovery, or KVM flow with a Wifi profile provided= by AMT. >=20 > Signed-off-by: Zachary Clark-Williams=20 > > --- > .../Protocol/WiFiProfileSyncProtocol.h | 83 ++++++++ > NetworkPkg/NetworkPkg.dec | 3 + > .../WifiConnectionManagerDxe.inf | 3 +- > .../WifiConnectionMgrDriver.c | 126 +++++++---- > .../WifiConnectionMgrDxe.h | 4 +- > .../WifiConnectionMgrImpl.c | 197 ++++++++++++++++-- > .../WifiConnectionMgrMisc.c | 13 ++ > 7 files changed, 370 insertions(+), 59 deletions(-) create mode=20 > 100644 NetworkPkg/Include/Protocol/WiFiProfileSyncProtocol.h >=20 > diff --git a/NetworkPkg/Include/Protocol/WiFiProfileSyncProtocol.h > b/NetworkPkg/Include/Protocol/WiFiProfileSyncProtocol.h > new file mode 100644 > index 0000000000..e36daceabf > --- /dev/null > +++ b/NetworkPkg/Include/Protocol/WiFiProfileSyncProtocol.h > @@ -0,0 +1,83 @@ > +/** @file > + WiFi profile sync protocol. Supports One Click Recovery or KVM OS=20 > +recovery > + boot flow over WiFi. > + > + Copyright (c) 2022, Intel Corporation. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent **/ > + > +#ifndef WIFI_PROFILE_SYNC_PROTOCOL_H_ #define=20 > +WIFI_PROFILE_SYNC_PROTOCOL_H_ > + > +#include > + > +// > +// WiFi Profile Sync Protocol GUID variable. > +// > +extern EFI_GUID gEfiWiFiProfileSyncProtocolGuid; > + > +/** > + Used by the WiFi connection manager to get the WiFi profile that=20 > +AMT shared > + and was stored in WiFi profile protocol. Aligns the AMT WiFi=20 > +profile data to > + the WiFi connection manager profile structure fo connection use. > + > + @param[in, out] WcmProfile WiFi Connection Manager profile > structure > + @param[in, out] MacAddress MAC address from AMT saved to NiC > MAC address > + > + @retval EFI_SUCCESS Stored WiFi profile converted and re= turned > succefully > + @retval EFI_UNSUPPORTED Profile protocol sharing not support= ed or > enabled > + @retval EFI_NOT_FOUND No profiles to returned > + @retval Others Error Occurred > +**/ > +typedef > +EFI_STATUS > +(EFIAPI *WIFI_PROFILE_GET)( > + IN OUT WIFI_MGR_NETWORK_PROFILE *Profile, > + IN OUT EFI_80211_MAC_ADDRESS MacAddress > + ); > + > +/** > + Saves the WiFi connection status recieved by the=20 > +WiFiConnectionManager when > + in a KVM OR One Click Recovery WLAN recovery flow. Input as > + EFI_80211_CONNECT_NETWORK_RESULT_CODE then converted and > stored as EFI_STATUS type. > + > + @param[in] ConnectionStatus WiFi connection attempt results > +**/ > +typedef > +VOID > +(EFIAPI *WIFI_SET_CONNECT_STATE)( > + IN EFI_80211_CONNECT_NETWORK_RESULT_CODE ConnectionStatus > + ); > + > +/** > + Retrieves the stored WiFi connection status when in either KVM OR=20 > +One Click > + Recovery WLAN recovery flow. > + > + @retval EFI_SUCCESS WiFi connection completed succesfull= y > + @retval Others Connection failure occurred > +**/ > +typedef > +EFI_STATUS > +(EFIAPI *WIFI_GET_CONNECT_STATE)( > + VOID > + ); > + > +// > +// WiFi Profile Sync Protocol structure. > +// > +typedef struct { > + UINT32 Revision; > + WIFI_SET_CONNECT_STATE WifiProfileSyncSetConnectState; > + WIFI_GET_CONNECT_STATE WifiProfileSyncGetConnectState; > + WIFI_PROFILE_GET WifiProfileSyncGetProfile; > +} EFI_WIFI_PROFILE_SYNC_PROTOCOL; > + > +/** > + WiFi Profile Protocol revision number. > + > + Revision 1: Initial version > +**/ > +#define EFI_WIFI_PROFILE_SYNC_PROTOCOL_REVISION 1 > + > +#endif // WIFI_PROFILE_SYNC_PROTOCOL_H_ > diff --git a/NetworkPkg/NetworkPkg.dec b/NetworkPkg/NetworkPkg.dec=20 > index 5e43ebf8c5..53fb34c4a0 100644 > --- a/NetworkPkg/NetworkPkg.dec > +++ b/NetworkPkg/NetworkPkg.dec > @@ -91,6 +91,9 @@ > ## Include/Protocol/HttpCallback.h > gEdkiiHttpCallbackProtocolGuid =3D {0x611114f1, 0xa37b, 0x4468,=20 > {0xa4, 0x36, 0x5b, 0xdd, 0xa1, 0x6a, 0xa2, 0x40}} >=20 > + ## Include/Protocol/WiFiProfileSyncProtocol.h > + gEfiWiFiProfileSyncProtocolGuid =3D {0x399a2b8a, 0xc267, 0x44aa,=20 > + {0x9a, 0xb4, 0x30, 0x58, 0x8c, 0xd2, 0x2d, 0xcc}} > + > [PcdsFixedAtBuild] > ## The max attempt number will be created by iSCSI driver. > # @Prompt Max attempt number. > diff --git > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf > index 4394b6f4bb..7e36016cf8 100644 > --- > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf > +++ > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionManagerDxe.inf > @@ -9,7 +9,7 @@ > # 2). WPA2 Personal Network > # 3). EAP Networks (EAP-TLS, EAP-TTLS/MSCHAPv2 and PEAPv0/MSCHAPv2)=20 > # -# Copyright (c) 2019, Intel Corporation. All rights reserved.
> +# Copyright (c) 2019 - 2022, Intel Corporation. All rights=20 > +reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -71,6 +71,7 @@ > gEfiAdapterInformationProtocolGuid ## SOMETIMES_CONSUMES > gEfiSupplicantProtocolGuid ## SOMETIMES_CONSUMES > gEfiEapConfigurationProtocolGuid ## SOMETIMES_CONSUMES > + gEfiWiFiProfileSyncProtocolGuid ## SOMETIMES_CONSUMES >=20 > [Guids] > gWifiConfigGuid ## PRODUCES ## GUID > diff --git > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c > index 67a01ca058..65df5b2c8a 100644 > --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c > +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDriver.c > @@ -1,7 +1,7 @@ > /** @file > The driver binding protocol for the WiFi Connection Manager. >=20 > - Copyright (c) 2019, Intel Corporation. All rights reserved.
> + Copyright (c) 2019 - 2022, Intel Corporation. All rights=20 > + reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -39,6 +39,11 @@ EFI_GUID mWifiConfigNetworkListRefreshGuid =3D=20 > WIFI_CONFIG_NETWORK_LIST_REFRESH_G > EFI_GUID mWifiConfigConnectFormRefreshGuid =3D=20 > WIFI_CONFIG_CONNECT_FORM_REFRESH_GUID; > EFI_GUID mWifiConfigMainFormRefreshGuid =3D > WIFI_CONFIG_MAIN_FORM_REFRESH_GUID; >=20 > +// > +// Wifi connection attempt counter for retries // extern UINT8=20 > +WifiConnectionCount; > + > /** > Tests to see if this driver supports a given controller. If a child=20 > device is provided, > it further tests to see if this driver supports creating a handle=20 > for the specified child device. > @@ -167,8 +172,10 @@ WifiMgrDxeDriverBindingStart ( > EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL *Wmp; > EFI_SUPPLICANT_PROTOCOL *Supplicant; > EFI_EAP_CONFIGURATION_PROTOCOL *EapConfig; > + EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol; >=20 > - Nic =3D NULL; > + WifiConnectionCount =3D 0; > + Nic =3D NULL; >=20 > // > // Open Protocols > @@ -236,47 +243,73 @@ WifiMgrDxeDriverBindingStart ( > InitializeListHead (&Nic->ProfileList); >=20 > // > - // Record the MAC address of the incoming NIC. > + // WiFi profile sync protocol installation check for OS recovery flow. > // > - Status =3D NetLibGetMacAddress ( > - ControllerHandle, > - (EFI_MAC_ADDRESS *)&Nic->MacAddress, > - &AddressSize > - ); > - if (EFI_ERROR (Status)) { > - goto ERROR2; > - } > - > - // > - // Create and start the timer for the status check > - // > - Status =3D gBS->CreateEvent ( > - EVT_NOTIFY_SIGNAL | EVT_TIMER, > - TPL_CALLBACK, > - WifiMgrOnTimerTick, > - Nic, > - &Nic->TickTimer > + Status =3D gBS->LocateProtocol ( > + &gEfiWiFiProfileSyncProtocolGuid, > + NULL, > + (VOID **)&WiFiProfileSyncProtocol > ); > - if (EFI_ERROR (Status)) { > - goto ERROR2; > - } > + if (!EFI_ERROR (Status)) { > + Nic->ConnectPendingNetwork =3D (WIFI_MGR_NETWORK_PROFILE > *)AllocateZeroPool (sizeof (WIFI_MGR_NETWORK_PROFILE)); > + if (Nic->ConnectPendingNetwork =3D=3D NULL) { > + Status =3D EFI_OUT_OF_RESOURCES; > + goto ERROR1; > + } >=20 > - Status =3D gBS->SetTimer (Nic->TickTimer, TimerPeriodic,=20 > EFI_TIMER_PERIOD_MILLISECONDS (500)); > - if (EFI_ERROR (Status)) { > - goto ERROR3; > - } > + WiFiProfileSyncProtocol->WifiProfileSyncGetProfile (Nic- > >ConnectPendingNetwork, Nic->MacAddress); > + if (Nic->ConnectPendingNetwork !=3D NULL) { > + Status =3D WifiMgrConnectToNetwork (Nic, Nic->ConnectPendingNetwor= k); > + if (EFI_ERROR (Status)) { > + WiFiProfileSyncProtocol->WifiProfileSyncSetConnectState (Status)= ; > + } > + } else { > + goto ERROR1; > + } > + } else { > + // > + // Record the MAC address of the incoming NIC. > + // > + Status =3D NetLibGetMacAddress ( > + ControllerHandle, > + (EFI_MAC_ADDRESS *)&Nic->MacAddress, > + &AddressSize > + ); > + if (EFI_ERROR (Status)) { > + goto ERROR2; > + } >=20 > - Nic->ConnectState =3D WifiMgrDisconnected; > - Nic->ScanState =3D WifiMgrScanFinished; > + // > + // Create and start the timer for the status check > + // > + Status =3D gBS->CreateEvent ( > + EVT_NOTIFY_SIGNAL | EVT_TIMER, > + TPL_CALLBACK, > + WifiMgrOnTimerTick, > + Nic, > + &Nic->TickTimer > + ); > + if (EFI_ERROR (Status)) { > + goto ERROR2; > + } >=20 > - OldTpl =3D gBS->RaiseTPL (TPL_CALLBACK); > - InsertTailList (&mPrivate->NicList, &Nic->Link); > - Nic->NicIndex =3D mPrivate->NicCount++; > - if (mPrivate->CurrentNic =3D=3D NULL) { > - mPrivate->CurrentNic =3D Nic; > - } > + Status =3D gBS->SetTimer (Nic->TickTimer, TimerPeriodic, > EFI_TIMER_PERIOD_MILLISECONDS (500)); > + if (EFI_ERROR (Status)) { > + goto ERROR3; > + } >=20 > - gBS->RestoreTPL (OldTpl); > + Nic->ConnectState =3D WifiMgrDisconnected; > + Nic->ScanState =3D WifiMgrScanFinished; > + > + OldTpl =3D gBS->RaiseTPL (TPL_CALLBACK); > + InsertTailList (&mPrivate->NicList, &Nic->Link); > + Nic->NicIndex =3D mPrivate->NicCount++; > + if (mPrivate->CurrentNic =3D=3D NULL) { > + mPrivate->CurrentNic =3D Nic; > + } > + > + gBS->RestoreTPL (OldTpl); > + } >=20 > Status =3D gBS->InstallProtocolInterface ( > &ControllerHandle, > @@ -385,10 +418,11 @@ WifiMgrDxeDriverBindingStop ( > IN EFI_HANDLE *ChildHandleBuffer OPTIONAL > ) > { > - EFI_STATUS Status; > - EFI_TPL OldTpl; > - WIFI_MGR_PRIVATE_PROTOCOL *WifiMgrIdentifier; > - WIFI_MGR_DEVICE_DATA *Nic; > + EFI_STATUS Status; > + EFI_TPL OldTpl; > + WIFI_MGR_PRIVATE_PROTOCOL *WifiMgrIdentifier; > + WIFI_MGR_DEVICE_DATA *Nic; > + EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol; >=20 > Status =3D gBS->OpenProtocol ( > ControllerHandle, > @@ -481,7 +515,15 @@ WifiMgrDxeDriverBindingStop ( > // > OldTpl =3D gBS->RaiseTPL (TPL_CALLBACK); >=20 > - RemoveEntryList (&Nic->Link); > + Status =3D gBS->LocateProtocol ( > + &gEfiWiFiProfileSyncProtocolGuid, > + NULL, > + (VOID **)&WiFiProfileSyncProtocol > + ); > + if (EFI_ERROR (Status)) { > + RemoveEntryList (&Nic->Link); > + } > + > mPrivate->NicCount--; > if (mPrivate->CurrentNic =3D=3D Nic) { > mPrivate->CurrentNic =3D NULL; > diff --git > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDxe.h > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDxe.h > index 7b2e41e155..047f85dbc2 100644 > --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDxe.h > +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrDxe.h > @@ -47,6 +47,7 @@ > #include > #include #include=20 > > +#include >=20 > // > // Produced Protocols > @@ -73,7 +74,8 @@ > // > #define WIFI_MGR_DXE_VERSION 0xb >=20 > -#define OUI_IEEE_80211I 0xAC0F00 > +#define OUI_IEEE_80211I 0xAC0F00 > +#define MAX_WIFI_CONNETION_ATTEMPTS 3 >=20 > typedef enum { > Ieee80211PairwiseCipherSuiteUseGroupCipherSuite =3D 0, diff --git=20 > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > index 59bac48c42..3a04b4ddb1 100644 > --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > @@ -19,6 +19,8 @@ EFI_EAP_TYPE mEapSecondAuthMethod[] =3D { > EFI_EAP_TYPE_MSCHAPV2 > }; >=20 > +UINT8 WifiConnectionCount =3D 0; > + > /** > The callback function for scan operation. This function updates networ= ks > according to the latest scan result, and trigger UI refresh. > @@ -420,22 +422,34 @@ WifiMgrConfigPassword ( > // > // Set password to supplicant > // > + if (Profile->Password[StrLen (Profile->Password)] !=3D '\0') { > + Profile->Password[StrLen (Profile->Password)] =3D L'\0'; } > + > if (StrLen (Profile->Password) < PASSWORD_MIN_LEN) { > return EFI_NOT_FOUND; > } >=20 > - AsciiPassword =3D AllocateZeroPool ((StrLen (Profile->Password) + 1)= =20 > * sizeof (UINT8)); > + if (StrLen (Profile->Password) > PASSWORD_STORAGE_SIZE) { > + ASSERT (EFI_INVALID_PARAMETER); > + return EFI_INVALID_PARAMETER; > + } > + > + AsciiPassword =3D AllocateZeroPool ((StrLen (Profile->Password) + 1)= =20 > + * sizeof (CHAR8)); > if (AsciiPassword =3D=3D NULL) { > return EFI_OUT_OF_RESOURCES; > } >=20 > - UnicodeStrToAsciiStrS (Profile->Password, (CHAR8 *)AsciiPassword,=20 > PASSWORD_STORAGE_SIZE); > - Status =3D Supplicant->SetData ( > - Supplicant, > - EfiSupplicant80211PskPassword, > - AsciiPassword, > - (StrLen (Profile->Password) + 1) * sizeof (UINT= 8) > - ); > + Status =3D UnicodeStrToAsciiStrS (Profile->Password, (CHAR8=20 > + *)AsciiPassword, ((StrLen (Profile->Password) + 1) * sizeof=20 > + (CHAR8))); if > (!EFI_ERROR (Status)) { > + Status =3D Supplicant->SetData ( > + Supplicant, > + EfiSupplicant80211PskPassword, > + AsciiPassword, > + (StrLen (Profile->Password) + 1) * sizeof (CH= AR8) > + ); > + } > + > ZeroMem (AsciiPassword, AsciiStrLen ((CHAR8 *)AsciiPassword) + 1); > FreePool (AsciiPassword); >=20 > @@ -466,6 +480,7 @@ WifiMgrConfigEap ( > ) > { > EFI_STATUS Status; > + EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol; > EFI_EAP_CONFIGURATION_PROTOCOL *EapConfig; > EFI_EAP_TYPE EapAuthMethod; > EFI_EAP_TYPE EapSecondAuthMethod; > @@ -567,7 +582,13 @@ WifiMgrConfigEap ( > return EFI_OUT_OF_RESOURCES; > } >=20 > - UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, IdentitySize)= ; > + Status =3D gBS->LocateProtocol (&gEfiWiFiProfileSyncProtocolGuid,=20 > + NULL, > (VOID **)&WiFiProfileSyncProtocol); > + if (!EFI_ERROR (Status)) { > + CopyMem (Identity, &Profile->EapIdentity, IdentitySize); > + } else { > + UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, IdentitySiz= e); > + } > + > Status =3D EapConfig->SetData ( > EapConfig, > EFI_EAP_TYPE_IDENTITY, @@ -892,6 +913,133=20 > @@ WifiMgrPrepareConnection ( > return EFI_SUCCESS; > } >=20 > +/** > + Will reset NiC data, get profile from profile sync driver, and send=20 > +for > + another connection attempt.This function should not be called more=20 > +than > + 3 times. > + > + @param[in] WiFiProfileSyncProtocol The target network profile to > connect. > + > + @retval EFI_SUCCESS The operation is completed. > + @retval other Operation failure. > + > +**/ > +EFI_STATUS > +ConnectionRetry ( > + IN EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol > + ) > +{ > + EFI_STATUS Status; > + WIFI_MGR_DEVICE_DATA *Nic; > + EFI_WIRELESS_MAC_CONNECTION_II_PROTOCOL *Wmp; > + EFI_SUPPLICANT_PROTOCOL *Supplicant; > + EFI_EAP_CONFIGURATION_PROTOCOL *EapConfig; > + > + Nic =3D NULL; > + > + Status =3D gBS->LocateProtocol ( > + &gEfiWiFi2ProtocolGuid, > + NULL, > + (VOID **)&Wmp > + ); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + Status =3D gBS->LocateProtocol ( > + &gEfiSupplicantProtocolGuid, > + NULL, > + (VOID **)&Supplicant > + ); > + if (EFI_ERROR (Status)) { > + Supplicant =3D NULL; > + } > + > + Status =3D gBS->LocateProtocol ( > + &gEfiEapConfigurationProtocolGuid, > + NULL, > + (VOID **)&EapConfig > + ); > + if (EFI_ERROR (Status)) { > + EapConfig =3D NULL; > + } > + > + // > + // Initialize Nic device data > + // > + Nic =3D AllocateZeroPool (sizeof (WIFI_MGR_DEVICE_DATA)); if (Nic =3D= =3D > + NULL) { > + Status =3D EFI_OUT_OF_RESOURCES; > + return Status; > + } > + > + Nic->Signature =3D WIFI_MGR_DEVICE_DATA_SIGNATURE; > + Nic->Private =3D mPrivate; > + Nic->Wmp =3D Wmp; > + Nic->Supplicant =3D Supplicant; > + Nic->EapConfig =3D EapConfig; > + Nic->UserSelectedProfile =3D NULL; > + Nic->OneTimeScanRequest =3D FALSE; > + > + if (Nic->Supplicant !=3D NULL) { > + Status =3D WifiMgrGetSupportedSuites (Nic); } > + > + if (!EFI_ERROR (Status)) { > + InitializeListHead (&Nic->ProfileList); > + > + Nic->ConnectPendingNetwork =3D (WIFI_MGR_NETWORK_PROFILE > *)AllocateZeroPool (sizeof (WIFI_MGR_NETWORK_PROFILE)); > + if (Nic->ConnectPendingNetwork =3D=3D NULL) { > + Status =3D EFI_OUT_OF_RESOURCES; > + DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Failed to=20 > + allocate > memory for ConnectPendingNetwork\n")); > + goto ERROR; > + } > + > + Status =3D WiFiProfileSyncProtocol->WifiProfileSyncGetProfile (Nic- > >ConnectPendingNetwork, Nic->MacAddress); > + if (!EFI_ERROR (Status) && (Nic->ConnectPendingNetwork !=3D NULL)) { > + Status =3D WifiMgrConnectToNetwork (Nic, Nic->ConnectPendingNetwor= k); > + if (!EFI_ERROR (Status)) { > + return Status; > + } > + } else { > + DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Failed to get=20 > + WiFi > profile with status %r\n", Status)); > + } > + } else { > + DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Failed to get=20 > + Supported suites with status %r\n", Status)); } > + > + if (Nic->ConnectPendingNetwork !=3D NULL) { > + if (Nic->ConnectPendingNetwork->Network.AKMSuite !=3D NULL) { > + FreePool (Nic->ConnectPendingNetwork->Network.AKMSuite); > + } > + > + if (Nic->ConnectPendingNetwork->Network.CipherSuite !=3D NULL) { > + FreePool (Nic->ConnectPendingNetwork->Network.CipherSuite); > + } > + > + FreePool (Nic->ConnectPendingNetwork); } > + > +ERROR: > + if (Nic->Supplicant !=3D NULL) { > + if (Nic->SupportedSuites.SupportedAKMSuites !=3D NULL) { > + FreePool (Nic->SupportedSuites.SupportedAKMSuites); > + } > + > + if (Nic->SupportedSuites.SupportedSwCipherSuites !=3D NULL) { > + FreePool (Nic->SupportedSuites.SupportedSwCipherSuites); > + } > + > + if (Nic->SupportedSuites.SupportedHwCipherSuites !=3D NULL) { > + FreePool (Nic->SupportedSuites.SupportedHwCipherSuites); > + } > + } > + > + FreePool (Nic); > + > + return Status; > +} > + > /** > The callback function for connect operation. >=20 > @@ -908,12 +1056,13 @@ WifiMgrOnConnectFinished ( > IN VOID *Context > ) > { > - EFI_STATUS Status; > - WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken; > - WIFI_MGR_NETWORK_PROFILE *ConnectedProfile; > - UINT8 SecurityType; > - UINT8 SSIdLen; > - CHAR8 *AsciiSSId; > + EFI_STATUS Status; > + WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken; > + WIFI_MGR_NETWORK_PROFILE *ConnectedProfile; > + UINT8 SecurityType; > + UINT8 SSIdLen; > + CHAR8 *AsciiSSId; > + EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol; >=20 > ASSERT (Context !=3D NULL); >=20 > @@ -925,6 +1074,24 @@ WifiMgrOnConnectFinished ( > ASSERT (ConfigToken->Type =3D=3D TokenTypeConnectNetworkToken); >=20 > ASSERT (ConfigToken->Token.ConnectNetworkToken !=3D NULL); > + > + Status =3D gBS->LocateProtocol (&gEfiWiFiProfileSyncProtocolGuid,=20 > + NULL, (VOID **)&WiFiProfileSyncProtocol); if (!EFI_ERROR (Status)) { > + WiFiProfileSyncProtocol->WifiProfileSyncSetConnectState=20 > + (ConfigToken- > >Token.ConnectNetworkToken->ResultCode); > + if ((WifiConnectionCount < MAX_WIFI_CONNETION_ATTEMPTS) && > + (ConfigToken->Token.ConnectNetworkToken->ResultCode !=3D > ConnectSuccess)) > + { > + WifiConnectionCount++; > + gBS->CloseEvent (Event); > + Status =3D ConnectionRetry (WiFiProfileSyncProtocol); > + if (!EFI_ERROR (Status)) { > + return; > + } > + > + WiFiProfileSyncProtocol->WifiProfileSyncSetConnectState (Status); > + } > + } > + > if (ConfigToken->Token.ConnectNetworkToken->Status !=3D EFI_SUCCESS) { > if (ConfigToken->Nic->OneTimeConnectRequest) { > // > diff --git > a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.c > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.c > index 4ad5643c24..87adfc5033 100644 > --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.c > +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrMisc.c > @@ -672,10 +672,23 @@ WifiMgrCleanProfileSecrets ( > IN WIFI_MGR_NETWORK_PROFILE *Profile > ) > { > + EFI_STATUS Status; > + EFI_WIFI_PROFILE_SYNC_PROTOCOL *WiFiProfileSyncProtocol; > + > ZeroMem (Profile->Password, sizeof (CHAR16) *=20 > PASSWORD_STORAGE_SIZE); > ZeroMem (Profile->EapPassword, sizeof (CHAR16) *=20 > PASSWORD_STORAGE_SIZE); > ZeroMem (Profile->PrivateKeyPassword, sizeof (CHAR16) *=20 > PASSWORD_STORAGE_SIZE); >=20 > + // > + // When EFI WiFi profile sync protocol is found the system is=20 > + performing a recovery boot in secure // boot mode. The profile=20 > + sync driver will manage the CA certificate, client certificate, and=20 > + key // data, > cleaning them at exit boot services. > + // > + Status =3D gBS->LocateProtocol (&gEfiWiFiProfileSyncProtocolGuid,=20 > + NULL, (VOID **)&WiFiProfileSyncProtocol); if (!EFI_ERROR (Status)) { > + return; > + } > + > if (Profile->CACertData !=3D NULL) { > ZeroMem (Profile->CACertData, Profile->CACertSize); > FreePool (Profile->CACertData); > -- > 2.26.2.windows.1 >=20 >=20 >=20 >=20 >=20