Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
qianouyang 2011-04-20 10:01:48 +00:00
parent a33f9a786d
commit 0a7294f7a1
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
View File

@ -80,5 +80,5 @@
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIpSecProtocolGuid gEfiIpSec2ProtocolGuid # PROTOCOL ALWAYS_CONSUMED

2
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
View File

@ -514,7 +514,7 @@ Ip4IpSecProcessPacket (
ZeroMem (&ZeroHead, sizeof (IP4_HEAD)); ZeroMem (&ZeroHead, sizeof (IP4_HEAD));
if (mIpSec == NULL) { if (mIpSec == NULL) {
gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &mIpSec); gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);
if (mIpSec == NULL) { if (mIpSec == NULL) {
goto ON_EXIT; goto ON_EXIT;
} }

2
NetworkPkg/Application/IpsecConfig/IpSecConfig.c
View File

@ -648,7 +648,7 @@ InitializeIpSecConfig (
goto Done; goto Done;
} }
Status = LocateProtocol (&gEfiIpSecProtocolGuid, (VOID **) &mIpSec); Status = LocateProtocol (&gEfiIpSec2ProtocolGuid, (VOID **) &mIpSec);
if (EFI_ERROR (Status) || mIpSec == NULL) { if (EFI_ERROR (Status) || mIpSec == NULL) {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PROTOCOL_INEXISTENT), mHiiHandle, mAppName); ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_PROTOCOL_INEXISTENT), mHiiHandle, mAppName);
goto Done; goto Done;

2
NetworkPkg/Application/IpsecConfig/IpSecConfig.inf
View File

@ -57,5 +57,5 @@
UefiLib UefiLib
[Protocols] [Protocols]
gEfiIpSecProtocolGuid ##CONSUMS gEfiIpSec2ProtocolGuid ##CONSUMS
gEfiIpSecConfigProtocolGuid ##CONSUMS gEfiIpSecConfigProtocolGuid ##CONSUMS

2
NetworkPkg/Ip6Dxe/Ip6Dxe.inf
View File

@ -93,7 +93,7 @@
gEfiIp6ConfigProtocolGuid gEfiIp6ConfigProtocolGuid
gEfiDhcp6ServiceBindingProtocolGuid gEfiDhcp6ServiceBindingProtocolGuid
gEfiDhcp6ProtocolGuid gEfiDhcp6ProtocolGuid
gEfiIpSecProtocolGuid gEfiIpSec2ProtocolGuid
gEfiHiiConfigAccessProtocolGuid gEfiHiiConfigAccessProtocolGuid
[Guids] [Guids]

2
NetworkPkg/Ip6Dxe/Ip6Input.c
View File

@ -536,7 +536,7 @@ Ip6IpSecProcessPacket (
ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER)); ZeroMem (&ZeroHead, sizeof (EFI_IP6_HEADER));
if (mIpSec == NULL) { if (mIpSec == NULL) {
gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &mIpSec); gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &mIpSec);
// //
// Check whether the ipsec protocol is available. // Check whether the ipsec protocol is available.

18
NetworkPkg/IpSecDxe/IpSecDriver.c
View File

@ -94,7 +94,7 @@ IpSecDriverBindingStart (
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath OPTIONAL
) )
{ {
EFI_IPSEC_PROTOCOL *IpSec; EFI_IPSEC2_PROTOCOL *IpSec;
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS Udp4Status; EFI_STATUS Udp4Status;
EFI_STATUS Udp6Status; EFI_STATUS Udp6Status;
@ -103,7 +103,7 @@ IpSecDriverBindingStart (
// //
// Ipsec protocol should be installed when load image. // Ipsec protocol should be installed when load image.
// //
Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec); Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -171,7 +171,7 @@ IpSecDriverBindingStop (
IN EFI_HANDLE *ChildHandleBuffer IN EFI_HANDLE *ChildHandleBuffer
) )
{ {
EFI_IPSEC_PROTOCOL *IpSec; EFI_IPSEC2_PROTOCOL *IpSec;
EFI_STATUS Status; EFI_STATUS Status;
IPSEC_PRIVATE_DATA *Private; IPSEC_PRIVATE_DATA *Private;
IKE_UDP_SERVICE *UdpSrv; IKE_UDP_SERVICE *UdpSrv;
@ -181,7 +181,7 @@ IpSecDriverBindingStop (
// //
// Locate ipsec protocol to get private data. // Locate ipsec protocol to get private data.
// //
Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec); Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -301,12 +301,12 @@ IpSecDriverEntryPoint (
{ {
EFI_STATUS Status; EFI_STATUS Status;
IPSEC_PRIVATE_DATA *Private; IPSEC_PRIVATE_DATA *Private;
EFI_IPSEC_PROTOCOL *IpSec; EFI_IPSEC2_PROTOCOL *IpSec;
// //
// Check whether ipsec protocol has already been installed. // Check whether ipsec protocol has already been installed.
// //
Status = gBS->LocateProtocol (&gEfiIpSecProtocolGuid, NULL, (VOID **) &IpSec); Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **) &IpSec);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
DEBUG ((DEBUG_WARN, "_ModuleEntryPoint: IpSec has been already loaded\n")); DEBUG ((DEBUG_WARN, "_ModuleEntryPoint: IpSec has been already loaded\n"));
@ -345,7 +345,7 @@ IpSecDriverEntryPoint (
Private->Signature = IPSEC_PRIVATE_DATA_SIGNATURE; Private->Signature = IPSEC_PRIVATE_DATA_SIGNATURE;
Private->ImageHandle = ImageHandle; Private->ImageHandle = ImageHandle;
CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC_PROTOCOL)); CopyMem (&Private->IpSec, &mIpSecInstance, sizeof (EFI_IPSEC2_PROTOCOL));
// //
// Initilize Private's members. Thess members is used for IKE. // Initilize Private's members. Thess members is used for IKE.
@ -371,7 +371,7 @@ IpSecDriverEntryPoint (
// //
Status = gBS->InstallMultipleProtocolInterfaces ( Status = gBS->InstallMultipleProtocolInterfaces (
&Private->Handle, &Private->Handle,
&gEfiIpSecProtocolGuid, &gEfiIpSec2ProtocolGuid,
&Private->IpSec, &Private->IpSec,
NULL NULL
); );
@ -396,7 +396,7 @@ IpSecDriverEntryPoint (
ON_UNINSTALL_IPSEC: ON_UNINSTALL_IPSEC:
gBS->UninstallProtocolInterface ( gBS->UninstallProtocolInterface (
Private->Handle, Private->Handle,
&gEfiIpSecProtocolGuid, &gEfiIpSec2ProtocolGuid,
&Private->IpSec &Private->IpSec
); );
ON_UNINSTALL_CONFIG: ON_UNINSTALL_CONFIG:

2
NetworkPkg/IpSecDxe/IpSecDxe.inf
View File

@ -89,7 +89,7 @@
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIpSecConfigProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiIpSecConfigProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiIpSecProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiIpSec2ProtocolGuid # PROTOCOL ALWAYS_PRODUCED
[Pcd] [Pcd]
gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled gEfiNetworkPkgTokenSpaceGuid.PcdIpsecCertificateEnabled

2
NetworkPkg/IpSecDxe/IpSecImpl.h
View File

@ -346,7 +346,7 @@ IpSecLookupSadBySpi (
The behavior is that it can perform one of the following actions: The behavior is that it can perform one of the following actions:
bypass the packet, discard the packet, or protect the packet. bypass the packet, discard the packet, or protect the packet.
@param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance. @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.
@param[in] NicHandle Instance of the network interface. @param[in] NicHandle Instance of the network interface.
@param[in] IpVersion IPV4 or IPV6. @param[in] IpVersion IPV4 or IPV6.
@param[in, out] IpHead Pointer to the IP Header. @param[in, out] IpHead Pointer to the IP Header.

2
NetworkPkg/IpSecDxe/IpSecMain.c
View File

@ -25,7 +25,7 @@ EFI_IPSEC2_PROTOCOL mIpSecInstance = { IpSecProcess, NULL, TRUE };
The behavior is that it can perform one of the following actions: The behavior is that it can perform one of the following actions:
bypass the packet, discard the packet, or protect the packet. bypass the packet, discard the packet, or protect the packet.
@param[in] This Pointer to the EFI_IPSEC_PROTOCOL instance. @param[in] This Pointer to the EFI_IPSEC2_PROTOCOL instance.
@param[in] NicHandle Instance of the network interface. @param[in] NicHandle Instance of the network interface.
@param[in] IpVersion IPV4 or IPV6. @param[in] IpVersion IPV4 or IPV6.
@param[in, out] IpHead Pointer to the IP Header. @param[in, out] IpHead Pointer to the IP Header.