Update the relevant drivers to use the correct GUID for EFI_IPSEC2_PROTOCOL.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11576 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index ec1904b5661625ce268637d5197b771fe0ec6f53..02699248e9e41d81dd7515181e699b934d70a740 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -80,5 +80,5 @@
   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

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 0946e1af88d6abbcb28e4fc03d98742add77df06..cfa13e45cb812067f2accaf7da8f01fc957d94e3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -514,7 +514,7 @@ Ip4IpSecProcessPacket (
   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

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index f64cf9728e93b140d618dfa338e35370e5705095..44a1a0cbd4ea711144a7c924455068428fcced2d 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -648,7 +648,7 @@ InitializeIpSecConfig (
     goto Done;\r
   }\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

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf b/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
index 1e0d4f44db2b7b75101e023266e935ea37926e38..19a867957d7447b5e43fb3451390400da7dbd011 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
@@ -57,5 +57,5 @@
   UefiLib\r
 \r
 [Protocols]\r
-  gEfiIpSecProtocolGuid                         ##CONSUMS\r
+  gEfiIpSec2ProtocolGuid                        ##CONSUMS\r
   gEfiIpSecConfigProtocolGuid                   ##CONSUMS\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
index aeb341cdc31f29e84c126e6f00ded866327c3865..1510927e4b24f18bc8624724e7f22f538edaa6b1 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
+++ b/NetworkPkg/Ip6Dxe/Ip6Dxe.inf
@@ -93,7 +93,7 @@
   gEfiIp6ConfigProtocolGuid\r
   gEfiDhcp6ServiceBindingProtocolGuid\r
   gEfiDhcp6ProtocolGuid\r
-  gEfiIpSecProtocolGuid\r
+  gEfiIpSec2ProtocolGuid\r
   gEfiHiiConfigAccessProtocolGuid\r
 \r
 [Guids]\r

diff --git a/NetworkPkg/Ip6Dxe/Ip6Input.c b/NetworkPkg/Ip6Dxe/Ip6Input.c
index 55f0ae869ad80aa55d37555c41132fd777573d57..89cdc3554264a5fc9c7803027204bc98d2c38f8d 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Input.c
+++ b/NetworkPkg/Ip6Dxe/Ip6Input.c
@@ -536,7 +536,7 @@ Ip6IpSecProcessPacket (
   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

diff --git a/NetworkPkg/IpSecDxe/IpSecDriver.c b/NetworkPkg/IpSecDxe/IpSecDriver.c
index 7e0d1fa4ed5e9ffd1b24c1fbbddadc26a0b5f947..bd12aa2e07a29b695af34002a76b2eca1776f77a 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecDriver.c
+++ b/NetworkPkg/IpSecDxe/IpSecDriver.c
@@ -94,7 +94,7 @@ IpSecDriverBindingStart (
   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
@@ -103,7 +103,7 @@ IpSecDriverBindingStart (
   //\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
@@ -171,7 +171,7 @@ IpSecDriverBindingStop (
   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
@@ -181,7 +181,7 @@ IpSecDriverBindingStop (
   //\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
@@ -301,12 +301,12 @@ IpSecDriverEntryPoint (
 {\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
-  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
@@ -345,7 +345,7 @@ IpSecDriverEntryPoint (
 \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
@@ -371,7 +371,7 @@ IpSecDriverEntryPoint (
   //\r
   Status = gBS->InstallMultipleProtocolInterfaces (\r
                   &Private->Handle,\r
-                  &gEfiIpSecProtocolGuid,\r
+                  &gEfiIpSec2ProtocolGuid,\r
                   &Private->IpSec,\r
                   NULL\r
                   );\r
@@ -396,7 +396,7 @@ IpSecDriverEntryPoint (
 ON_UNINSTALL_IPSEC:\r
   gBS->UninstallProtocolInterface (\r
          Private->Handle,\r
-         &gEfiIpSecProtocolGuid,\r
+         &gEfiIpSec2ProtocolGuid,\r
          &Private->IpSec\r
          );\r
 ON_UNINSTALL_CONFIG:\r

diff --git a/NetworkPkg/IpSecDxe/IpSecDxe.inf b/NetworkPkg/IpSecDxe/IpSecDxe.inf
index 208a0443c6846e03e60102640c0fd95ed9936706..2fcaeace784c425129c8d38cbfeafd235e947125 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecDxe.inf
+++ b/NetworkPkg/IpSecDxe/IpSecDxe.inf
@@ -89,7 +89,7 @@
   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

diff --git a/NetworkPkg/IpSecDxe/IpSecImpl.h b/NetworkPkg/IpSecDxe/IpSecImpl.h
index 47805f3b9f8ad538e31e6ae7714b04a36251b48c..4237119d93c54d32d2f5c2c6a7d72c8d93807795 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecImpl.h
+++ b/NetworkPkg/IpSecDxe/IpSecImpl.h
@@ -346,7 +346,7 @@ IpSecLookupSadBySpi (
   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

diff --git a/NetworkPkg/IpSecDxe/IpSecMain.c b/NetworkPkg/IpSecDxe/IpSecMain.c
index 247dab33815a9003a4939e3d19523890692f299e..f98f809ab8ba76f8baefe3da747d61965615c82d 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecMain.c
+++ b/NetworkPkg/IpSecDxe/IpSecMain.c
@@ -25,7 +25,7 @@ EFI_IPSEC2_PROTOCOL  mIpSecInstance = { IpSecProcess, NULL, TRUE };
   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