From: Tian, Hot Date: Wed, 22 Jan 2014 08:39:32 +0000 (+0000) Subject: Fix CRLF format X-Git-Tag: edk2-stable201903~11800 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=44de1013cfcd481efee629c1f75f4eebd99bc13c Fix CRLF format Signed-off-by: Tian, Hot git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15157 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/NetworkPkg/IpSecDxe/Ike.h b/NetworkPkg/IpSecDxe/Ike.h index 48c21cf773..50c680a528 100644 --- a/NetworkPkg/IpSecDxe/Ike.h +++ b/NetworkPkg/IpSecDxe/Ike.h @@ -93,10 +93,10 @@ #define IKE_TRANSFORM_NEXT_PAYLOAD_MORE 3 #define IKE_TRANSFORM_NEXT_PAYLOAD_NONE 0 -// -// Max size of the SA attribute -// -#define MAX_SA_ATTRS_SIZE 48 +// +// Max size of the SA attribute +// +#define MAX_SA_ATTRS_SIZE 48 #define SA_ATTR_FORMAT_BIT 0x8000 // // The definition for Information Message ID. diff --git a/NetworkPkg/IpSecDxe/IkeCommon.c b/NetworkPkg/IpSecDxe/IkeCommon.c index 898d5d9439..96e0d7930b 100644 --- a/NetworkPkg/IpSecDxe/IkeCommon.c +++ b/NetworkPkg/IpSecDxe/IkeCommon.c @@ -194,42 +194,42 @@ IkeGenerateIv ( } -/** - Find SPD entry by a specified SPD selector. - +/** + Find SPD entry by a specified SPD selector. + @param[in] SpdSel Point to SPD Selector to be searched for. - + @retval Point to SPD Entry if the SPD entry found. - @retval NULL if not found. - -**/ -IPSEC_SPD_ENTRY * + @retval NULL if not found. + +**/ +IPSEC_SPD_ENTRY * IkeSearchSpdEntry ( - IN EFI_IPSEC_SPD_SELECTOR *SpdSel - ) -{ - IPSEC_SPD_ENTRY *SpdEntry; - LIST_ENTRY *SpdList; - LIST_ENTRY *Entry; - - SpdList = &mConfigData[IPsecConfigDataTypeSpd]; - - NET_LIST_FOR_EACH (Entry, SpdList) { - SpdEntry = IPSEC_SPD_ENTRY_FROM_LIST (Entry); - - // + IN EFI_IPSEC_SPD_SELECTOR *SpdSel + ) +{ + IPSEC_SPD_ENTRY *SpdEntry; + LIST_ENTRY *SpdList; + LIST_ENTRY *Entry; + + SpdList = &mConfigData[IPsecConfigDataTypeSpd]; + + NET_LIST_FOR_EACH (Entry, SpdList) { + SpdEntry = IPSEC_SPD_ENTRY_FROM_LIST (Entry); + + // // Find the required SPD entry - // - if (CompareSpdSelector ( - (EFI_IPSEC_CONFIG_SELECTOR *) SpdSel, - (EFI_IPSEC_CONFIG_SELECTOR *) SpdEntry->Selector - )) { - return SpdEntry; - } - - } - - return NULL; + // + if (CompareSpdSelector ( + (EFI_IPSEC_CONFIG_SELECTOR *) SpdSel, + (EFI_IPSEC_CONFIG_SELECTOR *) SpdEntry->Selector + )) { + return SpdEntry; + } + + } + + return NULL; } /** diff --git a/NetworkPkg/IpSecDxe/IkeCommon.h b/NetworkPkg/IpSecDxe/IkeCommon.h index 4bcfe6c2a6..683264250a 100644 --- a/NetworkPkg/IpSecDxe/IkeCommon.h +++ b/NetworkPkg/IpSecDxe/IkeCommon.h @@ -167,18 +167,18 @@ IkeGetVersionFromSession ( IN UINT8 *Session ); -/** - Find SPD entry by a specified SPD selector. - +/** + Find SPD entry by a specified SPD selector. + @param[in] SpdSel Point to SPD Selector to be searched for. - - @retval Point to Spd Entry if the SPD entry found. - @retval NULL if not found. - -**/ -IPSEC_SPD_ENTRY * + + @retval Point to Spd Entry if the SPD entry found. + @retval NULL if not found. + +**/ +IPSEC_SPD_ENTRY * IkeSearchSpdEntry ( - IN EFI_IPSEC_SPD_SELECTOR *SpdSel + IN EFI_IPSEC_SPD_SELECTOR *SpdSel ); extern EFI_GUID mZeroGuid; diff --git a/NetworkPkg/IpSecDxe/Ikev2/Exchange.c b/NetworkPkg/IpSecDxe/Ikev2/Exchange.c index 7634d11a2a..37f9667d3d 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Exchange.c +++ b/NetworkPkg/IpSecDxe/Ikev2/Exchange.c @@ -779,11 +779,11 @@ Ikev2HandleInfo ( } } -IKE_EXCHANGE_INTERFACE mIkev1Exchange = { - 1, +IKE_EXCHANGE_INTERFACE mIkev1Exchange = { + 1, NULL, //Ikev1NegotiateSa NULL, //Ikev1NegotiateChildSa - NULL, + NULL, NULL, //Ikev1HandleSa, NULL, //Ikev1HandleChildSa NULL, //Ikev1HandleInfo diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c b/NetworkPkg/IpSecDxe/Ikev2/Utility.c index 80720ffb03..f12766f3cb 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c @@ -666,26 +666,26 @@ Ikev2ChildSaSessionLookupByMid ( { LIST_ENTRY *Entry; IKEV2_CHILD_SA_SESSION *ChildSaSession; - + NET_LIST_FOR_EACH (Entry, SaSessionList) { ChildSaSession = IKEV2_CHILD_SA_SESSION_BY_IKE_SA (Entry); - + if (ChildSaSession->MessageId == Mid) { - return ChildSaSession; - } + return ChildSaSession; + } } return NULL; } /** This function find the Child SA by the specified SPI. - - This functin find a ChildSA session by searching the ChildSaSessionlist of + + This functin find a ChildSA session by searching the ChildSaSessionlist of the input IKEV2_SA_SESSION by specified MessageID. - + @param[in] SaSessionList Pointer to List to be searched. @param[in] Spi Specified SPI. - + @return Pointer to IKEV2_CHILD_SA_SESSION or NULL. **/ @@ -697,14 +697,14 @@ Ikev2ChildSaSessionLookupBySpi ( { LIST_ENTRY *Entry; IKEV2_CHILD_SA_SESSION *ChildSaSession; - + NET_LIST_FOR_EACH (Entry, SaSessionList) { ChildSaSession = IKEV2_CHILD_SA_SESSION_BY_IKE_SA (Entry); - + if (ChildSaSession->RemotePeerSpi == Spi || ChildSaSession->LocalPeerSpi == Spi) { - return ChildSaSession; - } - } + return ChildSaSession; + } + } return NULL; } diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.h b/NetworkPkg/IpSecDxe/Ikev2/Utility.h index ea3e5cd2b5..c018f425fc 100644 --- a/NetworkPkg/IpSecDxe/Ikev2/Utility.h +++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.h @@ -195,13 +195,13 @@ Ikev2ChildSaSessionReg ( /** This function find the Child SA by the specified Spi. - - This functin find a ChildSA session by searching the ChildSaSessionlist of + + This functin find a ChildSA session by searching the ChildSaSessionlist of the input IKEV2_SA_SESSION by specified MessageID. - + @param[in] SaSessionList Pointer to List to be searched. @param[in] Spi Specified SPI. - + @return Pointer to IKEV2_CHILD_SA_SESSION. **/ diff --git a/NetworkPkg/IpSecDxe/IpSecImpl.h b/NetworkPkg/IpSecDxe/IpSecImpl.h index ff7a189395..8b63d24b52 100644 --- a/NetworkPkg/IpSecDxe/IpSecImpl.h +++ b/NetworkPkg/IpSecDxe/IpSecImpl.h @@ -124,9 +124,9 @@ typedef struct _IPSEC_RECYCLE_CONTEXT { // // Struct used to store the Hash and its data. // -typedef struct { - UINTN DataSize; - UINT8 *Data; +typedef struct { + UINTN DataSize; + UINT8 *Data; } HASH_DATA_FRAGMENT; struct _IPSEC_PRIVATE_DATA {