Re: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate name and guid

2016-07-29 Thread Palmer, Thomas 
Reviewed by Thomas Palmer 

-Original Message-
From: Jiaxin Wu [mailto:jiaxin...@intel.com] 
Sent: Monday, July 4, 2016 8:41 PM
To: edk2-devel@lists.01.org
Cc: Palmer, Thomas ; Ye Ting ; Fu 
Siyuan 
Subject: [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate 
name and guid

This patch is used to centralize TlsCaCertificate name and guid to 
TlsAuthentication.h

Cc: Palmer Thomas 
Cc: Ye Ting 
Cc: Fu Siyuan 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu 
---
 NetworkPkg/HttpDxe/HttpDriver.h  |  2 ++
 NetworkPkg/HttpDxe/HttpDxe.inf   |  4 
 NetworkPkg/HttpDxe/HttpsSupport.c|  7 ++
 NetworkPkg/HttpDxe/HttpsSupport.h| 10 
 NetworkPkg/Include/Guid/TlsAuthentication.h  | 29 
 NetworkPkg/NetworkPkg.dec|  5 +++-
 NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf |  1 +  
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c  | 14 +---  
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h  | 12 ++
 9 files changed, 50 insertions(+), 34 deletions(-)  create mode 100644 
NetworkPkg/Include/Guid/TlsAuthentication.h

diff --git a/NetworkPkg/HttpDxe/HttpDriver.h b/NetworkPkg/HttpDxe/HttpDriver.h 
index 3c30c12..73c211a 100644
--- a/NetworkPkg/HttpDxe/HttpDriver.h
+++ b/NetworkPkg/HttpDxe/HttpDriver.h
@@ -58,10 +58,12 @@
 //
 // Produced Protocols
 //
 #include 
 
+#include 
+
 //
 // Driver Version
 //
 #define HTTP_DRIVER_VERSION 0xa
 
diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf b/NetworkPkg/HttpDxe/HttpDxe.inf 
index a228c3d..1118181 100644
--- a/NetworkPkg/HttpDxe/HttpDxe.inf
+++ b/NetworkPkg/HttpDxe/HttpDxe.inf
@@ -24,10 +24,11 @@
   MODULE_UNI_FILE   = HttpDxe.uni
 
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [Sources]
   ComponentName.h
   ComponentName.c
   HttpDns.h
@@ -69,7 +70,10 @@
   gEfiIp6ConfigProtocolGuid## SOMETIMES_CONSUMES
   gEfiTlsServiceBindingProtocolGuid## SOMETIMES_CONSUMES
   gEfiTlsProtocolGuid  ## SOMETIMES_CONSUMES
   gEfiTlsConfigurationProtocolGuid ## SOMETIMES_CONSUMES
 
+[Guids]
+  gEfiTlsCaCertificateGuid ## CONSUMES  ## GUID
+
 [UserExtensions.TianoCore."ExtraFiles"]
   HttpDxeExtra.uni
\ No newline at end of file
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c 
b/NetworkPkg/HttpDxe/HttpsSupport.c
index 09aaa46..36f658c 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.c
+++ b/NetworkPkg/HttpDxe/HttpsSupport.c
@@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 
 **/
 
 #include "HttpDriver.h"
 
-EFI_GUID mEfiTlsCaCertificateGuid = EFI_TLS_CA_CERTIFICATE_GUID;
-
 /**
   Returns the first occurrence of a Null-terminated ASCII sub-string in a 
Null-terminated 
   ASCII string and ignore case during the search process.
 
   This function scans the contents of the ASCII string specified by String @@ 
-395,11 +393,11 @@ TlsConfigCertificate (
   // Try to read the TlsCaCertificate variable.
   //
   CACertSize = 0;
   Status  = gRT->GetVariable (
EFI_TLS_CA_CERTIFICATE_VARIABLE,
-   ,
+   ,
NULL,
,
NULL
);
 
@@ -412,11 +410,11 @@ TlsConfigCertificate (
   return EFI_OUT_OF_RESOURCES;
 }
 
 Status = gRT->GetVariable (
 EFI_TLS_CA_CERTIFICATE_VARIABLE,
-,
+,
 NULL,
 ,
 CACert
 );
 if (EFI_ERROR (Status)) {
@@ -453,11 +451,10 @@ TlsConfigCertificate (
   }
   
   Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList->SignatureSize);
 }
 
-
 ItemDataSize -= CertList->SignatureListSize;
 CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + 
CertList->SignatureListSize);
   }
   
   return Status;
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.h 
b/NetworkPkg/HttpDxe/HttpsSupport.h
index 682a6b6..05b6e69 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.h
+++ b/NetworkPkg/HttpDxe/HttpsSupport.h
@@ -20,20 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #define HTTPS_DEFAULT_PORT   443
 
 #define HTTPS_FLAG   "https"
 
 //
-// Private variable for CA Certificate configuration -// -#define 
EFI_TLS_CA_CERTIFICATE_GUID \
-  { \
-0xfd2340D0, 0x3dab, 0x4349, { 0xa6, 0xc7, 0x3b, 0x4f, 0x12, 0xb4, 0x8e, 
0xae } \
-  }
-
-#define EFI_TLS_CA_CERTIFICATE_VARIABLE  L"TlsCaCertificate"
-
-//
 // TLS Version
 //
 #define TLS10_PROTOCOL_VERSION_MAJOR  0x03  #define

Re: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate name and guid

2016-07-06 Thread Palmer, Thomas 
Reviewed-by: Thomas Palmer 

-Original Message-
From: Jiaxin Wu [mailto:jiaxin...@intel.com] 
Sent: Monday, July 4, 2016 8:41 PM
To: edk2-devel@lists.01.org
Cc: Palmer, Thomas ; Ye Ting ; Fu 
Siyuan 
Subject: [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate 
name and guid

This patch is used to centralize TlsCaCertificate name and guid to 
TlsAuthentication.h

Cc: Palmer Thomas 
Cc: Ye Ting 
Cc: Fu Siyuan 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu 
---
 NetworkPkg/HttpDxe/HttpDriver.h  |  2 ++
 NetworkPkg/HttpDxe/HttpDxe.inf   |  4 
 NetworkPkg/HttpDxe/HttpsSupport.c|  7 ++
 NetworkPkg/HttpDxe/HttpsSupport.h| 10 
 NetworkPkg/Include/Guid/TlsAuthentication.h  | 29 
 NetworkPkg/NetworkPkg.dec|  5 +++-
 NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf |  1 +  
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c  | 14 +---  
NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h  | 12 ++
 9 files changed, 50 insertions(+), 34 deletions(-)  create mode 100644 
NetworkPkg/Include/Guid/TlsAuthentication.h

diff --git a/NetworkPkg/HttpDxe/HttpDriver.h b/NetworkPkg/HttpDxe/HttpDriver.h 
index 3c30c12..73c211a 100644
--- a/NetworkPkg/HttpDxe/HttpDriver.h
+++ b/NetworkPkg/HttpDxe/HttpDriver.h
@@ -58,10 +58,12 @@
 //
 // Produced Protocols
 //
 #include 
 
+#include 
+
 //
 // Driver Version
 //
 #define HTTP_DRIVER_VERSION 0xa
 
diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf b/NetworkPkg/HttpDxe/HttpDxe.inf 
index a228c3d..1118181 100644
--- a/NetworkPkg/HttpDxe/HttpDxe.inf
+++ b/NetworkPkg/HttpDxe/HttpDxe.inf
@@ -24,10 +24,11 @@
   MODULE_UNI_FILE   = HttpDxe.uni
 
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
+  NetworkPkg/NetworkPkg.dec
 
 [Sources]
   ComponentName.h
   ComponentName.c
   HttpDns.h
@@ -69,7 +70,10 @@
   gEfiIp6ConfigProtocolGuid## SOMETIMES_CONSUMES
   gEfiTlsServiceBindingProtocolGuid## SOMETIMES_CONSUMES
   gEfiTlsProtocolGuid  ## SOMETIMES_CONSUMES
   gEfiTlsConfigurationProtocolGuid ## SOMETIMES_CONSUMES
 
+[Guids]
+  gEfiTlsCaCertificateGuid ## CONSUMES  ## GUID
+
 [UserExtensions.TianoCore."ExtraFiles"]
   HttpDxeExtra.uni
\ No newline at end of file
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c 
b/NetworkPkg/HttpDxe/HttpsSupport.c
index 09aaa46..36f658c 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.c
+++ b/NetworkPkg/HttpDxe/HttpsSupport.c
@@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 
 **/
 
 #include "HttpDriver.h"
 
-EFI_GUID mEfiTlsCaCertificateGuid = EFI_TLS_CA_CERTIFICATE_GUID;
-
 /**
   Returns the first occurrence of a Null-terminated ASCII sub-string in a 
Null-terminated 
   ASCII string and ignore case during the search process.
 
   This function scans the contents of the ASCII string specified by String @@ 
-395,11 +393,11 @@ TlsConfigCertificate (
   // Try to read the TlsCaCertificate variable.
   //
   CACertSize = 0;
   Status  = gRT->GetVariable (
EFI_TLS_CA_CERTIFICATE_VARIABLE,
-   ,
+   ,
NULL,
,
NULL
);
 
@@ -412,11 +410,11 @@ TlsConfigCertificate (
   return EFI_OUT_OF_RESOURCES;
 }
 
 Status = gRT->GetVariable (
 EFI_TLS_CA_CERTIFICATE_VARIABLE,
-,
+,
 NULL,
 ,
 CACert
 );
 if (EFI_ERROR (Status)) {
@@ -453,11 +451,10 @@ TlsConfigCertificate (
   }
   
   Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList->SignatureSize);
 }
 
-
 ItemDataSize -= CertList->SignatureListSize;
 CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + 
CertList->SignatureListSize);
   }
   
   return Status;
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.h 
b/NetworkPkg/HttpDxe/HttpsSupport.h
index 682a6b6..05b6e69 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.h
+++ b/NetworkPkg/HttpDxe/HttpsSupport.h
@@ -20,20 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER 
EXPRESS OR IMPLIED.
 #define HTTPS_DEFAULT_PORT   443
 
 #define HTTPS_FLAG   "https"
 
 //
-// Private variable for CA Certificate configuration -// -#define 
EFI_TLS_CA_CERTIFICATE_GUID \
-  { \
-0xfd2340D0, 0x3dab, 0x4349, { 0xa6, 0xc7, 0x3b, 0x4f, 0x12, 0xb4, 0x8e, 
0xae } \
-  }
-
-#define EFI_TLS_CA_CERTIFICATE_VARIABLE  L"TlsCaCertificate"
-
-//
 // TLS Version
 //
 #define TLS10_PROTOCOL_VERSION_MAJOR  0x03  #define

Re: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate name and guid

2016-07-04 Thread Samer El Haj Mahmoud 
Reviewed-by: Samer El-Haj-Mahmoud <smahm...@lenovo.com>



-Original Message-
From: Wu, Jiaxin [jiaxin...@intel.com]
Received: Monday, 04 Jul 2016, 9:45PM
To: Palmer, Thomas [thomas.pal...@hpe.com]; Wu, Jiaxin [jiaxin...@intel.com]; 
edk2-devel@lists.01.org [edk2-devel@lists.01.org]
CC: Ye, Ting [ting...@intel.com]; Fu, Siyuan [siyuan...@intel.com]
Subject: Re: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize 
TlsCaCertificate name and guid

It should be "[edk2-staging/HTTPS-TLS][PATCH]".

Sorry for incorrect subject-prefix.

Jiaxin

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Jiaxin Wu
> Sent: Tuesday, July 5, 2016 9:41 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting <ting...@intel.com>; Fu, Siyuan <siyuan...@intel.com>
> Subject: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize
> TlsCaCertificate name and guid
>
> This patch is used to centralize TlsCaCertificate name and guid to
> TlsAuthentication.h
>
> Cc: Palmer Thomas <thomas.pal...@hpe.com>
> Cc: Ye Ting <ting...@intel.com>
> Cc: Fu Siyuan <siyuan...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu <jiaxin...@intel.com>
> ---
>  NetworkPkg/HttpDxe/HttpDriver.h  |  2 ++
>  NetworkPkg/HttpDxe/HttpDxe.inf   |  4 
>  NetworkPkg/HttpDxe/HttpsSupport.c|  7 ++
>  NetworkPkg/HttpDxe/HttpsSupport.h| 10 
>  NetworkPkg/Include/Guid/TlsAuthentication.h  | 29
> 
>  NetworkPkg/NetworkPkg.dec|  5 +++-
>  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf |  1 +
> NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c  | 14 +---
> NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h  | 12 ++
>  9 files changed, 50 insertions(+), 34 deletions(-)  create mode 100644
> NetworkPkg/Include/Guid/TlsAuthentication.h
>
> diff --git a/NetworkPkg/HttpDxe/HttpDriver.h
> b/NetworkPkg/HttpDxe/HttpDriver.h index 3c30c12..73c211a 100644
> --- a/NetworkPkg/HttpDxe/HttpDriver.h
> +++ b/NetworkPkg/HttpDxe/HttpDriver.h
> @@ -58,10 +58,12 @@
>  //
>  // Produced Protocols
>  //
>  #include 
>
> +#include 
> +
>  //
>  // Driver Version
>  //
>  #define HTTP_DRIVER_VERSION 0xa
>
> diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf
> b/NetworkPkg/HttpDxe/HttpDxe.inf index a228c3d..1118181 100644
> --- a/NetworkPkg/HttpDxe/HttpDxe.inf
> +++ b/NetworkPkg/HttpDxe/HttpDxe.inf
> @@ -24,10 +24,11 @@
>MODULE_UNI_FILE   = HttpDxe.uni
>
>  [Packages]
>MdePkg/MdePkg.dec
>MdeModulePkg/MdeModulePkg.dec
> +  NetworkPkg/NetworkPkg.dec
>
>  [Sources]
>ComponentName.h
>ComponentName.c
>HttpDns.h
> @@ -69,7 +70,10 @@
>gEfiIp6ConfigProtocolGuid## SOMETIMES_CONSUMES
>gEfiTlsServiceBindingProtocolGuid## SOMETIMES_CONSUMES
>gEfiTlsProtocolGuid  ## SOMETIMES_CONSUMES
>gEfiTlsConfigurationProtocolGuid ## SOMETIMES_CONSUMES
>
> +[Guids]
> +  gEfiTlsCaCertificateGuid ## CONSUMES  ## GUID
> +
>  [UserExtensions.TianoCore."ExtraFiles"]
>HttpDxeExtra.uni
> \ No newline at end of file
> diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c
> b/NetworkPkg/HttpDxe/HttpsSupport.c
> index 09aaa46..36f658c 100644
> --- a/NetworkPkg/HttpDxe/HttpsSupport.c
> +++ b/NetworkPkg/HttpDxe/HttpsSupport.c
> @@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
>
>  **/
>
>  #include "HttpDriver.h"
>
> -EFI_GUID mEfiTlsCaCertificateGuid = EFI_TLS_CA_CERTIFICATE_GUID;
> -
>  /**
>Returns the first occurrence of a Null-terminated ASCII sub-string in a 
> Null-
> terminated
>ASCII string and ignore case during the search process.
>
>This function scans the contents of the ASCII string specified by String 
> @@ -
> 395,11 +393,11 @@ TlsConfigCertificate (
>// Try to read the TlsCaCertificate variable.
>//
>CACertSize = 0;
>Status  = gRT->GetVariable (
> EFI_TLS_CA_CERTIFICATE_VARIABLE,
> -   ,
> +   ,
> NULL,
> ,
> NULL
> );
>
> @@ -412,11 +410,11 @@ TlsConfigCertificate (
>return EFI_OUT_OF_RESOURCES;
>  }
>
>  Status = gRT->GetVariable (
>  EFI_TLS_CA_CERTIFICATE_VARIABLE,
> -,
> +,
>  NULL,
>

Re: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize TlsCaCertificate name and guid

2016-07-04 Thread Wu, Jiaxin 
It should be "[edk2-staging/HTTPS-TLS][PATCH]".

Sorry for incorrect subject-prefix.

Jiaxin

> -Original Message-
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Jiaxin Wu
> Sent: Tuesday, July 5, 2016 9:41 AM
> To: edk2-devel@lists.01.org
> Cc: Ye, Ting ; Fu, Siyuan 
> Subject: [edk2] [staging/HTTPS-TLS][PATCH] NetworkPkg: Centralize
> TlsCaCertificate name and guid
> 
> This patch is used to centralize TlsCaCertificate name and guid to
> TlsAuthentication.h
> 
> Cc: Palmer Thomas 
> Cc: Ye Ting 
> Cc: Fu Siyuan 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu 
> ---
>  NetworkPkg/HttpDxe/HttpDriver.h  |  2 ++
>  NetworkPkg/HttpDxe/HttpDxe.inf   |  4 
>  NetworkPkg/HttpDxe/HttpsSupport.c|  7 ++
>  NetworkPkg/HttpDxe/HttpsSupport.h| 10 
>  NetworkPkg/Include/Guid/TlsAuthentication.h  | 29
> 
>  NetworkPkg/NetworkPkg.dec|  5 +++-
>  NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf |  1 +
> NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c  | 14 +---
> NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.h  | 12 ++
>  9 files changed, 50 insertions(+), 34 deletions(-)  create mode 100644
> NetworkPkg/Include/Guid/TlsAuthentication.h
> 
> diff --git a/NetworkPkg/HttpDxe/HttpDriver.h
> b/NetworkPkg/HttpDxe/HttpDriver.h index 3c30c12..73c211a 100644
> --- a/NetworkPkg/HttpDxe/HttpDriver.h
> +++ b/NetworkPkg/HttpDxe/HttpDriver.h
> @@ -58,10 +58,12 @@
>  //
>  // Produced Protocols
>  //
>  #include 
> 
> +#include 
> +
>  //
>  // Driver Version
>  //
>  #define HTTP_DRIVER_VERSION 0xa
> 
> diff --git a/NetworkPkg/HttpDxe/HttpDxe.inf
> b/NetworkPkg/HttpDxe/HttpDxe.inf index a228c3d..1118181 100644
> --- a/NetworkPkg/HttpDxe/HttpDxe.inf
> +++ b/NetworkPkg/HttpDxe/HttpDxe.inf
> @@ -24,10 +24,11 @@
>MODULE_UNI_FILE   = HttpDxe.uni
> 
>  [Packages]
>MdePkg/MdePkg.dec
>MdeModulePkg/MdeModulePkg.dec
> +  NetworkPkg/NetworkPkg.dec
> 
>  [Sources]
>ComponentName.h
>ComponentName.c
>HttpDns.h
> @@ -69,7 +70,10 @@
>gEfiIp6ConfigProtocolGuid## SOMETIMES_CONSUMES
>gEfiTlsServiceBindingProtocolGuid## SOMETIMES_CONSUMES
>gEfiTlsProtocolGuid  ## SOMETIMES_CONSUMES
>gEfiTlsConfigurationProtocolGuid ## SOMETIMES_CONSUMES
> 
> +[Guids]
> +  gEfiTlsCaCertificateGuid ## CONSUMES  ## GUID
> +
>  [UserExtensions.TianoCore."ExtraFiles"]
>HttpDxeExtra.uni
> \ No newline at end of file
> diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c
> b/NetworkPkg/HttpDxe/HttpsSupport.c
> index 09aaa46..36f658c 100644
> --- a/NetworkPkg/HttpDxe/HttpsSupport.c
> +++ b/NetworkPkg/HttpDxe/HttpsSupport.c
> @@ -12,12 +12,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> 
>  **/
> 
>  #include "HttpDriver.h"
> 
> -EFI_GUID mEfiTlsCaCertificateGuid = EFI_TLS_CA_CERTIFICATE_GUID;
> -
>  /**
>Returns the first occurrence of a Null-terminated ASCII sub-string in a 
> Null-
> terminated
>ASCII string and ignore case during the search process.
> 
>This function scans the contents of the ASCII string specified by String 
> @@ -
> 395,11 +393,11 @@ TlsConfigCertificate (
>// Try to read the TlsCaCertificate variable.
>//
>CACertSize = 0;
>Status  = gRT->GetVariable (
> EFI_TLS_CA_CERTIFICATE_VARIABLE,
> -   ,
> +   ,
> NULL,
> ,
> NULL
> );
> 
> @@ -412,11 +410,11 @@ TlsConfigCertificate (
>return EFI_OUT_OF_RESOURCES;
>  }
> 
>  Status = gRT->GetVariable (
>  EFI_TLS_CA_CERTIFICATE_VARIABLE,
> -,
> +,
>  NULL,
>  ,
>  CACert
>  );
>  if (EFI_ERROR (Status)) {
> @@ -453,11 +451,10 @@ TlsConfigCertificate (
>}
> 
>Cert = (EFI_SIGNATURE_DATA *) ((UINT8 *) Cert + CertList-
> >SignatureSize);
>  }
> 
> -
>  ItemDataSize -= CertList->SignatureListSize;
>  CertList = (EFI_SIGNATURE_LIST *) ((UINT8 *) CertList + CertList-
> >SignatureListSize);
>}
> 
>return Status;
> diff --git a/NetworkPkg/HttpDxe/HttpsSupport.h
> b/NetworkPkg/HttpDxe/HttpsSupport.h
> index 682a6b6..05b6e69 100644
> --- a/NetworkPkg/HttpDxe/HttpsSupport.h
> +++ b/NetworkPkg/HttpDxe/HttpsSupport.h
> @@ -20,20 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
>  #define HTTPS_DEFAULT_PORT   443
> 
>  #define HTTPS_FLAG   "https"
> 
>  //
> -// Private variable for CA