Working on it: https://github.com/tianocore/edk2/pull/4584
> -----Original Message----- > From: Clark-williams, Zachary <[email protected]> > Sent: Tuesday, June 27, 2023 2:46 PM > To: Li, Yi1 <[email protected]>; [email protected]; Kinney, Michael D > <[email protected]>; Andrew Fish <[email protected]>; Leif Lindholm > <[email protected]> > Cc: Maciej Rabeda <[email protected]> > Subject: RE: [PATCH V3] NetworkPkg: Correct the length of EAP Identity when > in ASCII format > > Reviewed-by: Zachary Clark-Williams <[email protected]> > > Hey Michael, > Can you help with this change merge? > > Thanks, > Zack > > > -----Original Message----- > From: Li, Yi1 <[email protected]> > Sent: Sunday, June 25, 2023 10:41 PM > To: [email protected] > Cc: Li, Yi1 <[email protected]>; Maciej Rabeda > <[email protected]>; Clark-williams, Zachary <zachary.clark- > [email protected]> > Subject: [PATCH V3] NetworkPkg: Correct the length of EAP Identity when in > ASCII format > > FIX: https://bugzilla.tianocore.org/show_bug.cgi?id=4477 > > Tls connection fail over WiFi in AMT OCR flow due to invalid identity. > > This was due to missing conversion between unicode and ascii string which > resulted in invalid strlen. > > Cc: Maciej Rabeda <[email protected]> > Cc: Zachary Clark-Williams <[email protected]> > Signed-off-by: Yi Li <[email protected]> > --- > .../WifiConnectionMgrImpl.c | 21 +++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-) > > diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > index 2e596c1981..d1182e52bd 100644 > --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c > @@ -572,15 +572,28 @@ WifiMgrConfigEap ( > // Set Identity to Eap peer, Mandatory field for PEAP and TTLS > // > if (StrLen (Profile->EapIdentity) > 0) { > - IdentitySize = sizeof (CHAR8) * (StrLen (Profile->EapIdentity) + 1); > - Identity = AllocateZeroPool (IdentitySize); > + Status = gBS->LocateProtocol (&gEdkiiWiFiProfileSyncProtocolGuid, > NULL, (VOID **)&WiFiProfileSyncProtocol); > + if (!EFI_ERROR (Status)) { > + // > + // Max size of EapIdentity ::= sizeof (CHAR16) * sizeof (Profile- > >EapIdentity) ::= 2 * EAP_IDENTITY_SIZE > + // > + IdentitySize = sizeof (CHAR8) * (AsciiStrnLenS ((CHAR8 *)Profile- > >EapIdentity, sizeof (CHAR16) * sizeof (Profile->EapIdentity)) + 1); > + } else { > + IdentitySize = sizeof (CHAR8) * (StrLen (Profile->EapIdentity) + 1); > + } > + > + Identity = AllocateZeroPool (IdentitySize); > if (Identity == NULL) { > return EFI_OUT_OF_RESOURCES; > } > > - Status = gBS->LocateProtocol (&gEdkiiWiFiProfileSyncProtocolGuid, > NULL, (VOID **)&WiFiProfileSyncProtocol); > if (!EFI_ERROR (Status)) { > - CopyMem (Identity, &Profile->EapIdentity, IdentitySize); > + // > + // The size of Identity from Username may equal > + // to the max size of EapIdentity(EAP_IDENTITY_SIZE*2=128 bytes), > + // so here only valid characters except NULL characters are copied. > + // > + CopyMem (Identity, &Profile->EapIdentity, IdentitySize - 1); > } else { > UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, > IdentitySize); > } > -- > 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106448): https://edk2.groups.io/g/devel/message/106448 Mute This Topic: https://groups.io/mt/99782400/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
