git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11576
6f19259b-4bc3-4df7-8a09-
765794883524
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
- gEfiIpSecProtocolGuid\r
+ gEfiIpSec2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
\ No newline at end of file
\ No newline at end of file
ZeroMem (&ZeroHead, sizeof (IP4_HEAD));\r
\r
if (mIpSec == NULL) {\r
ZeroMem (&ZeroHead, sizeof (IP4_HEAD));\r
\r
if (mIpSec == NULL) {\r
- gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &mIpSec);\r
+ gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);\r
if (mIpSec == NULL) {\r
goto ON_EXIT;\r
}\r
if (mIpSec == NULL) {\r
goto ON_EXIT;\r
}\r
- Status = LocateProtocol (&gEfiIpSecProtocolGuid, (VOID **) &mIpSec);\r
+ Status = LocateProtocol (&gEfiIpSec2ProtocolGuid, (VOID **) &mIpSec);\r
if (EFI_ERROR (Status) || mIpSec == NULL) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PROTOCOL_INEXISTENT), mHiiHandle, mAppName);\r
goto Done;\r
if (EFI_ERROR (Status) || mIpSec == NULL) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PROTOCOL_INEXISTENT), mHiiHandle, mAppName);\r
goto Done;\r
UefiLib\r
\r
[Protocols]\r
UefiLib\r
\r
[Protocols]\r
- gEfiIpSecProtocolGuid ##CONSUMS\r
+ gEfiIpSec2ProtocolGuid ##CONSUMS\r
gEfiIpSecConfigProtocolGuid ##CONSUMS\r
gEfiIpSecConfigProtocolGuid ##CONSUMS\r
gEfiIp6ConfigProtocolGuid\r
gEfiDhcp6ServiceBindingProtocolGuid\r
gEfiDhcp6ProtocolGuid\r
gEfiIp6ConfigProtocolGuid\r
gEfiDhcp6ServiceBindingProtocolGuid\r
gEfiDhcp6ProtocolGuid\r
- gEfiIpSecProtocolGuid\r
+ gEfiIpSec2ProtocolGuid\r
gEfiHiiConfigAccessProtocolGuid\r
\r
[Guids]\r
gEfiHiiConfigAccessProtocolGuid\r
\r
[Guids]\r
ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER));\r
\r
if (mIpSec == NULL) {\r
ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER));\r
\r
if (mIpSec == NULL) {\r
- gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &mIpSec);\r
+ gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);\r
\r
//\r
// Check whether the ipsec protocol is available.\r
\r
//\r
// Check whether the ipsec protocol is available.\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL\r
)\r
{\r
- EFI_IPSEC_PROTOCOL *IpSec;\r
+ EFI_IPSEC2_PROTOCOL *IpSec;\r
EFI_STATUS Status;\r
EFI_STATUS Udp4Status;\r
EFI_STATUS Udp6Status;\r
EFI_STATUS Status;\r
EFI_STATUS Udp4Status;\r
EFI_STATUS Udp6Status;\r
//\r
// Ipsec protocol should be installed when load image.\r
//\r
//\r
// Ipsec protocol should be installed when load image.\r
//\r
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);\r
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
IN EFI_HANDLE *ChildHandleBuffer\r
)\r
{\r
- EFI_IPSEC_PROTOCOL *IpSec;\r
+ EFI_IPSEC2_PROTOCOL *IpSec;\r
EFI_STATUS Status;\r
IPSEC_PRIVATE_DATA *Private;\r
IKE_UDP_SERVICE *UdpSrv;\r
EFI_STATUS Status;\r
IPSEC_PRIVATE_DATA *Private;\r
IKE_UDP_SERVICE *UdpSrv;\r
//\r
// Locate ipsec protocol to get private data.\r
//\r
//\r
// Locate ipsec protocol to get private data.\r
//\r
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);\r
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
{\r
EFI_STATUS Status;\r
IPSEC_PRIVATE_DATA *Private;\r
{\r
EFI_STATUS Status;\r
IPSEC_PRIVATE_DATA *Private;\r
- EFI_IPSEC_PROTOCOL *IpSec;\r
+ EFI_IPSEC2_PROTOCOL *IpSec;\r
\r
//\r
// Check whether ipsec protocol has already been installed.\r
//\r
\r
//\r
// Check whether ipsec protocol has already been installed.\r
//\r
- Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec);\r
+ Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);\r
\r
if (!EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_WARN, "_ModuleEntryPoint: IpSec has been already loaded\n"));\r
\r
if (!EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_WARN, "_ModuleEntryPoint: IpSec has been already loaded\n"));\r
\r
Private->Signature = IPSEC_PRIVATE_DATA_SIGNATURE;\r
Private->ImageHandle = ImageHandle;\r
\r
Private->Signature = IPSEC_PRIVATE_DATA_SIGNATURE;\r
Private->ImageHandle = ImageHandle;\r
- CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC_PROTOCOL));\r
+ CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC2_PROTOCOL));\r
\r
//\r
// Initilize Private's members. Thess members is used for IKE.\r
\r
//\r
// Initilize Private's members. Thess members is used for IKE.\r
//\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Private->Handle,\r
//\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Private->Handle,\r
- &gEfiIpSecProtocolGuid,\r
+ &gEfiIpSec2ProtocolGuid,\r
&Private->IpSec,\r
NULL\r
);\r
&Private->IpSec,\r
NULL\r
);\r
ON_UNINSTALL_IPSEC:\r
gBS->UninstallProtocolInterface (\r
Private->Handle,\r
ON_UNINSTALL_IPSEC:\r
gBS->UninstallProtocolInterface (\r
Private->Handle,\r
- &gEfiIpSecProtocolGuid,\r
+ &gEfiIpSec2ProtocolGuid,\r
&Private->IpSec\r
);\r
ON_UNINSTALL_CONFIG:\r
&Private->IpSec\r
);\r
ON_UNINSTALL_CONFIG:\r
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED \r
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiIpSecConfigProtocolGuid # PROTOCOL ALWAYS_PRODUCED\r
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED \r
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED\r
gEfiIpSecConfigProtocolGuid # PROTOCOL ALWAYS_PRODUCED\r
- gEfiIpSecProtocolGuid # PROTOCOL ALWAYS_PRODUCED\r
+ gEfiIpSec2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED\r
\r
[Pcd]\r
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled\r
\r
[Pcd]\r
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled\r
The behavior is that it can perform one of the following actions:\r
bypass the packet, discard the packet, or protect the packet.\r
\r
The behavior is that it can perform one of the following actions:\r
bypass the packet, discard the packet, or protect the packet.\r
\r
- @param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance.\r
+ @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.\r
@param[in] NicHandle Instance of the network interface.\r
@param[in] IpVersion IPV4 or IPV6.\r
@param[in, out] IpHead Pointer to the IP Header.\r
@param[in] NicHandle Instance of the network interface.\r
@param[in] IpVersion IPV4 or IPV6.\r
@param[in, out] IpHead Pointer to the IP Header.\r
The behavior is that it can perform one of the following actions:\r
bypass the packet, discard the packet, or protect the packet.\r
\r
The behavior is that it can perform one of the following actions:\r
bypass the packet, discard the packet, or protect the packet.\r
\r
- @param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance.\r
+ @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.\r
@param[in] NicHandle Instance of the network interface.\r
@param[in] IpVersion IPV4 or IPV6.\r
@param[in, out] IpHead Pointer to the IP Header.\r
@param[in] NicHandle Instance of the network interface.\r
@param[in] IpVersion IPV4 or IPV6.\r
@param[in, out] IpHead Pointer to the IP Header.\r