X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=NetworkPkg%2FApplication%2FIpsecConfig%2FIpSecConfig.c;h=1e63bc96221bdc62767ff2d08e0bd0e6c5db75ac;hb=2244198233db695f8f29bb34c7d6cfe5e995f42c;hp=8006d8486073f1827125be5eebc763d726979805;hpb=a3bcde70e6dc69000f85cc5deee98101d2ae200a;p=mirror_edk2.git

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index 8006d84860..1e63bc9622 100644
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -82,7 +82,8 @@ SHELL_PARAM_ITEM    mIpSecConfigParamList[] = {
   // --ipsec-proto
   //
   { L"--spi",                 TypeValue },
-  { L"--dest",                TypeValue },
+  { L"--tunnel-dest",         TypeValue },
+  { L"--tunnel-source",       TypeValue },
   { L"--lookup-spi",          TypeValue },
   { L"--lookup-ipsec-proto",  TypeValue },
   { L"--lookup-dest",         TypeValue },
@@ -178,14 +179,14 @@ STR2INT mMapIpSecProtocol[] = {
 // --auth-algo
 //
 STR2INT mMapAuthAlgo[] = {
-  { L"NONE",         EFI_IPSEC_AALG_NONE },
-  { L"MD5HMAC",      EFI_IPSEC_AALG_MD5HMAC },
-  { L"SHA1HMAC",     EFI_IPSEC_AALG_SHA1HMAC },
-  { L"SHA2-256HMAC", EFI_IPSEC_AALG_SHA2_256HMAC },
-  { L"SHA2-384HMAC", EFI_IPSEC_AALG_SHA2_384HMAC },
-  { L"SHA2-512HMAC", EFI_IPSEC_AALG_SHA2_512HMAC },
-  { L"AES-XCBC-MAC", EFI_IPSEC_AALG_AES_XCBC_MAC },
-  { L"NULL",         EFI_IPSEC_AALG_NULL },
+  { L"NONE",         IPSEC_AALG_NONE },
+  { L"MD5HMAC",      IPSEC_AALG_MD5HMAC },
+  { L"SHA1HMAC",     IPSEC_AALG_SHA1HMAC },
+  { L"SHA2-256HMAC", IPSEC_AALG_SHA2_256HMAC },
+  { L"SHA2-384HMAC", IPSEC_AALG_SHA2_384HMAC },
+  { L"SHA2-512HMAC", IPSEC_AALG_SHA2_512HMAC },
+  { L"AES-XCBC-MAC", IPSEC_AALG_AES_XCBC_MAC },
+  { L"NULL",         IPSEC_AALG_NULL },
   { NULL,            0 },
 };
 
@@ -193,20 +194,20 @@ STR2INT mMapAuthAlgo[] = {
 // --encrypt-algo
 //
 STR2INT mMapEncAlgo[] = {
-  { L"NONE",         EFI_IPSEC_EALG_NONE },
-  { L"DESCBC",       EFI_IPSEC_EALG_DESCBC },
-  { L"3DESCBC",      EFI_IPSEC_EALG_3DESCBC },
-  { L"CASTCBC",      EFI_IPSEC_EALG_CASTCBC },
-  { L"BLOWFISHCBC",  EFI_IPSEC_EALG_BLOWFISHCBC },
-  { L"NULL",         EFI_IPSEC_EALG_NULL },
-  { L"AESCBC",       EFI_IPSEC_EALG_AESCBC },
-  { L"AESCTR",       EFI_IPSEC_EALG_AESCTR },
-  { L"AES-CCM-ICV8", EFI_IPSEC_EALG_AES_CCM_ICV8 },
-  { L"AES-CCM-ICV12",EFI_IPSEC_EALG_AES_CCM_ICV12 },
-  { L"AES-CCM-ICV16",EFI_IPSEC_EALG_AES_CCM_ICV16 },
-  { L"AES-GCM-ICV8", EFI_IPSEC_EALG_AES_GCM_ICV8 },
-  { L"AES-GCM-ICV12",EFI_IPSEC_EALG_AES_GCM_ICV12 },
-  { L"AES-GCM-ICV16",EFI_IPSEC_EALG_AES_GCM_ICV16 },
+  { L"NONE",         IPSEC_EALG_NONE },
+  { L"DESCBC",       IPSEC_EALG_DESCBC },
+  { L"3DESCBC",      IPSEC_EALG_3DESCBC },
+  { L"CASTCBC",      IPSEC_EALG_CASTCBC },
+  { L"BLOWFISHCBC",  IPSEC_EALG_BLOWFISHCBC },
+  { L"NULL",         IPSEC_EALG_NULL },
+  { L"AESCBC",       IPSEC_EALG_AESCBC },
+  { L"AESCTR",       IPSEC_EALG_AESCTR },
+  { L"AES-CCM-ICV8", IPSEC_EALG_AES_CCM_ICV8 },
+  { L"AES-CCM-ICV12",IPSEC_EALG_AES_CCM_ICV12 },
+  { L"AES-CCM-ICV16",IPSEC_EALG_AES_CCM_ICV16 },
+  { L"AES-GCM-ICV8", IPSEC_EALG_AES_GCM_ICV8 },
+  { L"AES-GCM-ICV12",IPSEC_EALG_AES_GCM_ICV12 },
+  { L"AES-GCM-ICV16",IPSEC_EALG_AES_GCM_ICV16 },
   { NULL,            0 },
 };
 
@@ -228,7 +229,7 @@ STR2INT mMapAuthMethod[] = {
   { NULL,               0 },
 };
 
-EFI_IPSEC_PROTOCOL           *mIpSec;
+EFI_IPSEC2_PROTOCOL          *mIpSec;
 EFI_IPSEC_CONFIG_PROTOCOL    *mIpSecConfig;
 EFI_HII_HANDLE               mHiiHandle;
 EFI_GUID                     mEfiIpSecConfigGuid = EFI_IPSEC_CONFIG_GUID;
@@ -292,7 +293,8 @@ VAR_CHECK_ITEM    mIpSecConfigVarCheckList[] = {
   // --ipsec-proto
   //
   { L"--spi",                0,              0,       BIT(1),               0 },
-  { L"--dest",               0,              0,       BIT(1),               0 },
+  { L"--tunnel-dest",        0,              0,       BIT(1),               0 },
+  { L"--tunnel-source",      0,              0,       BIT(1),               0 },
   { L"--lookup-spi",         0,              0,       BIT(1),               0 },
   { L"--lookup-ipsec-proto", 0,              0,       BIT(1),               0 },
   { L"--lookup-dest",        0,              0,       BIT(1),               0 },
@@ -548,7 +550,7 @@ IpSecConfigRetriveCheckListByName (
   for (Node = GetFirstNode (ParamPackage); !IsNull (ParamPackage, Node); Node = GetNextNode (ParamPackage, Node)) {
     if (((SHELL_PARAM_PACKAGE *) Node)->Name != NULL) {
       //
-	  // Enumerate the check list that defines the conflicted attributes of each flag.
+      // Enumerate the check list that defines the conflicted attributes of each flag.
       //
       for (; Item->VarName != NULL; Item++) {
         if (StrCmp (((SHELL_PARAM_PACKAGE *) Node)->Name, Item->VarName) == 0) {
@@ -711,7 +713,6 @@ InitializeIpSecConfig (
     } else {
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_STATUS_ENABLE), mHiiHandle, mAppName);
     }
-
     goto Done;
   }
 
@@ -754,7 +755,7 @@ InitializeIpSecConfig (
     goto Done;
   }
 
-  NonOptionCount = ShellCommandLineGetCount ();
+  NonOptionCount = ShellCommandLineGetCount (ParamPackage);
   if ((NonOptionCount - 1) > 0) {
     ValueStr = ShellCommandLineGetRawValue (ParamPackage, (UINT32) (NonOptionCount - 1));
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_REDUNDANCY_MANY), mHiiHandle, mAppName, ValueStr);