diff options
author | Jiaxin Wu <jiaxin.wu@intel.com> | 2017-01-05 11:34:07 +0800 |
---|---|---|
committer | Jiaxin Wu <jiaxin.wu@intel.com> | 2017-01-06 11:59:26 +0800 |
commit | 89f06051a5c89bcd81b1375f60bb9d1cb049c0de (patch) | |
tree | a09427ce6340373f8192ab737b76b8aa5882fbbe /NetworkPkg | |
parent | 42b85551615d62fb68f0dbd63c068445c4d3c511 (diff) | |
download | edk2-platforms-89f06051a5c89bcd81b1375f60bb9d1cb049c0de.tar.xz |
MdePkg, NetworkPkg: Refine the coding style.
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Diffstat (limited to 'NetworkPkg')
-rw-r--r-- | NetworkPkg/HttpDxe/HttpProto.c | 4 | ||||
-rw-r--r-- | NetworkPkg/HttpDxe/HttpsSupport.c | 16 | ||||
-rw-r--r-- | NetworkPkg/TlsDxe/TlsImpl.c | 6 | ||||
-rw-r--r-- | NetworkPkg/TlsDxe/TlsProtocol.c | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index 2e784def4c..2e8c42e629 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -1,7 +1,7 @@ /** @file
Miscellaneous routines for HttpDxe driver.
-Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -1491,7 +1491,7 @@ HttpTransmitTcp ( Status = EFI_OUT_OF_RESOURCES;
return Status;
}
- ((TLS_RECORD_HEADER *) Buffer)->ContentType = TLS_CONTENT_TYPE_APPLICATION_DATA;
+ ((TLS_RECORD_HEADER *) Buffer)->ContentType = TlsContentTypeApplicationData;
((TLS_RECORD_HEADER *) Buffer)->Version.Major = HttpInstance->TlsConfigData.Version.Major;
((TLS_RECORD_HEADER *) Buffer)->Version.Minor = HttpInstance->TlsConfigData.Version.Minor;
((TLS_RECORD_HEADER *) Buffer)->Length = (UINT16) (TxStringLen);
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c index c9e6988968..77e5371242 100644 --- a/NetworkPkg/HttpDxe/HttpsSupport.c +++ b/NetworkPkg/HttpDxe/HttpsSupport.c @@ -1,7 +1,7 @@ /** @file Miscellaneous routines specific to Https for HttpDxe driver. -Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -883,10 +883,10 @@ TlsReceiveOnePdu ( } RecordHeader = *(TLS_RECORD_HEADER *) Header; - if ((RecordHeader.ContentType == TLS_CONTENT_TYPE_HANDSHAKE || - RecordHeader.ContentType == TLS_CONTENT_TYPE_ALERT || - RecordHeader.ContentType == TLS_CONTENT_TYPE_CHANGE_CIPHER_SPEC || - RecordHeader.ContentType == TLS_CONTENT_TYPE_APPLICATION_DATA) && + if ((RecordHeader.ContentType == TlsContentTypeHandshake || + RecordHeader.ContentType == TlsContentTypeAlert || + RecordHeader.ContentType == TlsContentTypeChangeCipherSpec || + RecordHeader.ContentType == TlsContentTypeApplicationData) && (RecordHeader.Version.Major == 0x03) && /// Major versions are same. (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR || RecordHeader.Version.Minor ==TLS11_PROTOCOL_VERSION_MINOR || @@ -1497,7 +1497,7 @@ HttpsReceive ( // RecordHeader = *(TLS_RECORD_HEADER *) BufferIn; - if ((RecordHeader.ContentType == TLS_CONTENT_TYPE_APPLICATION_DATA) && + if ((RecordHeader.ContentType == TlsContentTypeApplicationData) && (RecordHeader.Version.Major == 0x03) && (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR || RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR || @@ -1587,7 +1587,7 @@ HttpsReceive ( // // Parsing buffer. // - ASSERT (((TLS_RECORD_HEADER *) (TempFragment.Bulk))->ContentType == TLS_CONTENT_TYPE_APPLICATION_DATA); + ASSERT (((TLS_RECORD_HEADER *) (TempFragment.Bulk))->ContentType == TlsContentTypeApplicationData); BufferInSize = ((TLS_RECORD_HEADER *) (TempFragment.Bulk))->Length; BufferIn = AllocateZeroPool (BufferInSize); @@ -1603,7 +1603,7 @@ HttpsReceive ( // FreePool (TempFragment.Bulk); - } else if ((RecordHeader.ContentType == TLS_CONTENT_TYPE_ALERT) && + } else if ((RecordHeader.ContentType == TlsContentTypeAlert) && (RecordHeader.Version.Major == 0x03) && (RecordHeader.Version.Minor == TLS10_PROTOCOL_VERSION_MINOR || RecordHeader.Version.Minor == TLS11_PROTOCOL_VERSION_MINOR || diff --git a/NetworkPkg/TlsDxe/TlsImpl.c b/NetworkPkg/TlsDxe/TlsImpl.c index bb71bd8dfd..efdec2d92d 100644 --- a/NetworkPkg/TlsDxe/TlsImpl.c +++ b/NetworkPkg/TlsDxe/TlsImpl.c @@ -1,7 +1,7 @@ /** @file The Miscellaneous Routines for TlsDxe driver. -Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -105,7 +105,7 @@ TlsEncryptPacket ( while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) { RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr; - if (RecordHeaderIn->ContentType != TLS_CONTENT_TYPE_APPLICATION_DATA) { + if (RecordHeaderIn->ContentType != TlsContentTypeApplicationData) { Status = EFI_INVALID_PARAMETER; goto ERROR; } @@ -256,7 +256,7 @@ TlsDecryptPacket ( while ((UINTN) BufferInPtr < (UINTN) BufferIn + BufferInSize) { RecordHeaderIn = (TLS_RECORD_HEADER *) BufferInPtr; - if (RecordHeaderIn->ContentType != TLS_CONTENT_TYPE_APPLICATION_DATA) { + if (RecordHeaderIn->ContentType != TlsContentTypeApplicationData) { Status = EFI_INVALID_PARAMETER; goto ERROR; } diff --git a/NetworkPkg/TlsDxe/TlsProtocol.c b/NetworkPkg/TlsDxe/TlsProtocol.c index ee1c496239..58a83c3ab7 100644 --- a/NetworkPkg/TlsDxe/TlsProtocol.c +++ b/NetworkPkg/TlsDxe/TlsProtocol.c @@ -1,7 +1,7 @@ /** @file Implementation of EFI TLS Protocol Interfaces. - Copyright (c) 2016, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -523,7 +523,7 @@ TlsBuildResponsePacket ( // // Must be alert message, Decrypt it and build the ResponsePacket. // - ASSERT (((TLS_RECORD_HEADER *) RequestBuffer)->ContentType == TLS_CONTENT_TYPE_ALERT); + ASSERT (((TLS_RECORD_HEADER *) RequestBuffer)->ContentType == TlsContentTypeAlert); Status = TlsHandleAlert ( Instance->TlsConn, |