Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Tuesday, April 3, 2018 10:52 PM
> To: edk2-devel-01 <edk2-devel@lists.01.org>
> Cc: Wu, Jiaxin <jiaxin.wu@intel.com>; Fu, Siyuan <siyuan.fu@intel.com>
> Subject: [PATCH 04/13] NetworkPkg/TlsDxe: clean up byte order conversion
> for EfiTlsCipherList
>
> Fix the following style issues:
>
> - "Data" is accessed through a pointer to UINT16 rather than to a pointer
> to EFI_TLS_CIPHER. While technically correct, UINT16 is harder to
> interpret against the UEFI spec.
>
> - Array subscripting is written with weird *(Pointer + Offset)
> expressions, rather than with Pointer[Offset].
>
> - The byte order is converted with HTONS(), while it should be NTOHS().
> Either way, use the Data1 and Data2 fields of EFI_TLS_CIPHER instead.
>
> Cc: Jiaxin Wu <jiaxin.wu@intel.com>
> Cc: Siyuan Fu <siyuan.fu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=915
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> NetworkPkg/TlsDxe/TlsProtocol.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/NetworkPkg/TlsDxe/TlsProtocol.c
> b/NetworkPkg/TlsDxe/TlsProtocol.c
> index a5f95a098345..298ffdd659a2 100644
> --- a/NetworkPkg/TlsDxe/TlsProtocol.c
> +++ b/NetworkPkg/TlsDxe/TlsProtocol.c
> @@ -57,12 +57,13 @@ TlsSetSessionData (
> IN UINTN DataSize
> )
> {
> EFI_STATUS Status;
> TLS_INSTANCE *Instance;
> UINT16 *CipherId;
> + CONST EFI_TLS_CIPHER *TlsCipherList;
> UINTN CipherCount;
> UINTN Index;
>
> EFI_TPL OldTpl;
>
> Status = EFI_SUCCESS;
> @@ -110,15 +111,17 @@ TlsSetSessionData (
> CipherId = AllocatePool (DataSize);
> if (CipherId == NULL) {
> Status = EFI_OUT_OF_RESOURCES;
> goto ON_EXIT;
> }
>
> + TlsCipherList = (CONST EFI_TLS_CIPHER *) Data;
> CipherCount = DataSize / sizeof (EFI_TLS_CIPHER);
> for (Index = 0; Index < CipherCount; Index++) {
> - *(CipherId +Index) = HTONS (*(((UINT16 *) Data) + Index));
> + CipherId[Index] = ((TlsCipherList[Index].Data1 << 8) |
> + TlsCipherList[Index].Data2);
> }
>
> Status = TlsSetCipherList (Instance->TlsConn, CipherId, CipherCount);
>
> FreePool (CipherId);
> break;
> --
> 2.14.1.3.gb7cf6e02401b
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel