[PATCH] SecurityPkg/FmpAuthenticationLib: Refine to compare with same type

[PATCH] SecurityPkg/FmpAuthenticationLib: Refine to compare with same type

[Hao Wu]

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 .../Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c     | 4 ++--
 .../FmpAuthenticationLibRsa2048Sha256.c                               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
index d79f270..69c637c 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
+++ b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
@@ -10,7 +10,7 @@
   FmpAuthenticatedHandlerPkcs7(), AuthenticateFmpImage() will receive
   untrusted input and do basic validation.
 
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -181,7 +181,7 @@ AuthenticateFmpImage (
     DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too small\n"));
     return RETURN_INVALID_PARAMETER;
   }
-  if (Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
+  if ((UINTN) Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
     DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too big\n"));
     return RETURN_INVALID_PARAMETER;
   }
diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
index 4b2556c..b40993f 100644
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
+++ b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
@@ -10,7 +10,7 @@
   FmpAuthenticatedHandlerRsa2048Sha256(), AuthenticateFmpImage() will receive
   untrusted input and do basic validation.
 
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -319,7 +319,7 @@ AuthenticateFmpImage (
     DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too small\n"));
     return RETURN_INVALID_PARAMETER;
   }
-  if (Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
+  if ((UINTN) Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
     DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too big\n"));
     return RETURN_INVALID_PARAMETER;
   }
-- 
1.9.5.msysgit.0

Re: [PATCH] SecurityPkg/FmpAuthenticationLib: Refine to compare with same type

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Wu, Hao A
> Sent: Friday, January 6, 2017 4:56 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>;
> Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH] SecurityPkg/FmpAuthenticationLib: Refine to compare with
> same type
> 
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>  .../Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c     | 4
> ++--
>  .../FmpAuthenticationLibRsa2048Sha256.c                               |
> 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git
> a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
> b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
> index d79f270..69c637c 100644
> ---
> a/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
> +++
> b/SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.c
> @@ -10,7 +10,7 @@
>    FmpAuthenticatedHandlerPkcs7(), AuthenticateFmpImage() will receive
>    untrusted input and do basic validation.
> 
> -  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License
>    which accompanies this distribution.  The full text of the license may be
> found at
> @@ -181,7 +181,7 @@ AuthenticateFmpImage (
>      DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too
> small\n"));
>      return RETURN_INVALID_PARAMETER;
>    }
> -  if (Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
> +  if ((UINTN) Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
>      DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too big\n"));
>      return RETURN_INVALID_PARAMETER;
>    }
> diff --git
> a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationL
> ibRsa2048Sha256.c
> b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthentication
> LibRsa2048Sha256.c
> index 4b2556c..b40993f 100644
> ---
> a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationL
> ibRsa2048Sha256.c
> +++
> b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthentication
> LibRsa2048Sha256.c
> @@ -10,7 +10,7 @@
>    FmpAuthenticatedHandlerRsa2048Sha256(), AuthenticateFmpImage() will
> receive
>    untrusted input and do basic validation.
> 
> -  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>
>    This program and the accompanying materials
>    are licensed and made available under the terms and conditions of the BSD
> License
>    which accompanies this distribution.  The full text of the license may be
> found at
> @@ -319,7 +319,7 @@ AuthenticateFmpImage (
>      DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too
> small\n"));
>      return RETURN_INVALID_PARAMETER;
>    }
> -  if (Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
> +  if ((UINTN) Image->AuthInfo.Hdr.dwLength > MAX_UINTN - sizeof(UINT64)) {
>      DEBUG((DEBUG_ERROR, "AuthenticateFmpImage - dwLength too big\n"));
>      return RETURN_INVALID_PARAMETER;
>    }
> --
> 1.9.5.msysgit.0