Update ipsecconfig and ping6 due to ShellLib update.

[mirror_edk2.git] / NetworkPkg / Application / IpsecConfig / IpSecConfig.c

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
index 8006d8486073f1827125be5eebc763d726979805..3554355bd7081f516d8fbfd11fbc12cce863d266 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.c
@@ -178,14 +178,14 @@ STR2INT mMapIpSecProtocol[] = {
 // --auth-algo\r
 //\r
 STR2INT mMapAuthAlgo[] = {\r
-  { L"NONE",         EFI_IPSEC_AALG_NONE },\r
-  { L"MD5HMAC",      EFI_IPSEC_AALG_MD5HMAC },\r
-  { L"SHA1HMAC",     EFI_IPSEC_AALG_SHA1HMAC },\r
-  { L"SHA2-256HMAC", EFI_IPSEC_AALG_SHA2_256HMAC },\r
-  { L"SHA2-384HMAC", EFI_IPSEC_AALG_SHA2_384HMAC },\r
-  { L"SHA2-512HMAC", EFI_IPSEC_AALG_SHA2_512HMAC },\r
-  { L"AES-XCBC-MAC", EFI_IPSEC_AALG_AES_XCBC_MAC },\r
-  { L"NULL",         EFI_IPSEC_AALG_NULL },\r
+  { L"NONE",         IPSEC_AALG_NONE },\r
+  { L"MD5HMAC",      IPSEC_AALG_MD5HMAC },\r
+  { L"SHA1HMAC",     IPSEC_AALG_SHA1HMAC },\r
+  { L"SHA2-256HMAC", IPSEC_AALG_SHA2_256HMAC },\r
+  { L"SHA2-384HMAC", IPSEC_AALG_SHA2_384HMAC },\r
+  { L"SHA2-512HMAC", IPSEC_AALG_SHA2_512HMAC },\r
+  { L"AES-XCBC-MAC", IPSEC_AALG_AES_XCBC_MAC },\r
+  { L"NULL",         IPSEC_AALG_NULL },\r
   { NULL,            0 },\r
 };\r
 \r
@@ -193,20 +193,20 @@ STR2INT mMapAuthAlgo[] = {
 // --encrypt-algo\r
 //\r
 STR2INT mMapEncAlgo[] = {\r
-  { L"NONE",         EFI_IPSEC_EALG_NONE },\r
-  { L"DESCBC",       EFI_IPSEC_EALG_DESCBC },\r
-  { L"3DESCBC",      EFI_IPSEC_EALG_3DESCBC },\r
-  { L"CASTCBC",      EFI_IPSEC_EALG_CASTCBC },\r
-  { L"BLOWFISHCBC",  EFI_IPSEC_EALG_BLOWFISHCBC },\r
-  { L"NULL",         EFI_IPSEC_EALG_NULL },\r
-  { L"AESCBC",       EFI_IPSEC_EALG_AESCBC },\r
-  { L"AESCTR",       EFI_IPSEC_EALG_AESCTR },\r
-  { L"AES-CCM-ICV8", EFI_IPSEC_EALG_AES_CCM_ICV8 },\r
-  { L"AES-CCM-ICV12",EFI_IPSEC_EALG_AES_CCM_ICV12 },\r
-  { L"AES-CCM-ICV16",EFI_IPSEC_EALG_AES_CCM_ICV16 },\r
-  { L"AES-GCM-ICV8", EFI_IPSEC_EALG_AES_GCM_ICV8 },\r
-  { L"AES-GCM-ICV12",EFI_IPSEC_EALG_AES_GCM_ICV12 },\r
-  { L"AES-GCM-ICV16",EFI_IPSEC_EALG_AES_GCM_ICV16 },\r
+  { L"NONE",         IPSEC_EALG_NONE },\r
+  { L"DESCBC",       IPSEC_EALG_DESCBC },\r
+  { L"3DESCBC",      IPSEC_EALG_3DESCBC },\r
+  { L"CASTCBC",      IPSEC_EALG_CASTCBC },\r
+  { L"BLOWFISHCBC",  IPSEC_EALG_BLOWFISHCBC },\r
+  { L"NULL",         IPSEC_EALG_NULL },\r
+  { L"AESCBC",       IPSEC_EALG_AESCBC },\r
+  { L"AESCTR",       IPSEC_EALG_AESCTR },\r
+  { L"AES-CCM-ICV8", IPSEC_EALG_AES_CCM_ICV8 },\r
+  { L"AES-CCM-ICV12",IPSEC_EALG_AES_CCM_ICV12 },\r
+  { L"AES-CCM-ICV16",IPSEC_EALG_AES_CCM_ICV16 },\r
+  { L"AES-GCM-ICV8", IPSEC_EALG_AES_GCM_ICV8 },\r
+  { L"AES-GCM-ICV12",IPSEC_EALG_AES_GCM_ICV12 },\r
+  { L"AES-GCM-ICV16",IPSEC_EALG_AES_GCM_ICV16 },\r
   { NULL,            0 },\r
 };\r
 \r
@@ -228,7 +228,7 @@ STR2INT mMapAuthMethod[] = {
   { NULL,               0 },\r
 };\r
 \r
-EFI_IPSEC_PROTOCOL           *mIpSec;\r
+EFI_IPSEC2_PROTOCOL          *mIpSec;\r
 EFI_IPSEC_CONFIG_PROTOCOL    *mIpSecConfig;\r
 EFI_HII_HANDLE               mHiiHandle;\r
 EFI_GUID                     mEfiIpSecConfigGuid = EFI_IPSEC_CONFIG_GUID;\r
@@ -711,7 +711,6 @@ InitializeIpSecConfig (
     } else {\r
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_CONFIG_STATUS_ENABLE), mHiiHandle, mAppName);\r
     }\r
-\r
     goto Done;\r
   }\r
 \r
@@ -754,7 +753,7 @@ InitializeIpSecConfig (
     goto Done;\r
   }\r
 \r
-  NonOptionCount = ShellCommandLineGetCount ();\r
+  NonOptionCount = ShellCommandLineGetCount (ParamPackage);\r
   if ((NonOptionCount - 1) > 0) {\r
     ValueStr = ShellCommandLineGetRawValue (ParamPackage, (UINT32) (NonOptionCount - 1));\r
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IPSEC_REDUNDANCY_MANY), mHiiHandle, mAppName, ValueStr);\r