SecurityPkg FmpAuthenticationLibRsa2048Sha256: Remove PCD reference

PcdRsa2048Sha256PublicKeyBuffer is referenced but not used in the
library, that makes me a little confusing.
Actually, the PublicKeyData should be from the caller of
AuthenticateFmpImage() as input parameter, for example
EdkiiSystemCapsuleLib.

This patch is to remove the PCD reference in this library instance
to be aligned with FmpAuthenticationLibPkcs7 that does not reference
PcdPkcs7CertBuffer.

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
index b40993fd1b000b3fe8331eeb2b358c5f33dc0509..038e124477824e857e965128ba0980881d066c5e 100644 (file)
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
+++ b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.c
@@ -10,7 +10,7 @@
   FmpAuthenticatedHandlerRsa2048Sha256(), AuthenticateFmpImage() will receive\r
   untrusted input and do basic validation.\r
 \r
   FmpAuthenticatedHandlerRsa2048Sha256(), AuthenticateFmpImage() will receive\r
   untrusted input and do basic validation.\r
 \r

-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -133,7 +133,7 @@ FmpAuthenticatedHandlerRsa2048Sha256 (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Fail if the PublicKey is not one of the public keys in PcdRsa2048Sha256PublicKeyBuffer\r
+  // Fail if the PublicKey is not one of the public keys in the input PublicKeyData.\r

   //\r
   PublicKey = (VOID *)PublicKeyData;\r
   PublicKeyBufferSize = PublicKeyDataLength;\r
   //\r
   PublicKey = (VOID *)PublicKeyData;\r
   PublicKeyBufferSize = PublicKeyDataLength;\r

diff --git a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
index b190eca8805c3a93bcef6bc542908613692ba0e3..cdd22429c274fafd7a425a0bd7a011e2371de459 100644 (file)
--- a/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
+++ b/SecurityPkg/Library/FmpAuthenticationLibRsa2048Sha256/FmpAuthenticationLibRsa2048Sha256.inf
@@ -3,7 +3,7 @@
 #\r
 # Instance of FmpAuthentication Library for DXE/PEI post memory phase.\r
 #\r
 #\r
 # Instance of FmpAuthentication Library for DXE/PEI post memory phase.\r
 #\r

-#  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r


@@ -45,9 +45,6 @@
   MemoryAllocationLib\r
   BaseCryptLib\r
 \r
   MemoryAllocationLib\r
   BaseCryptLib\r
 \r

-[Pcd]\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdRsa2048Sha256PublicKeyBuffer     ## CONSUMES\r
-\r

 [Guids]\r
   gEfiCertTypeRsa2048Sha256Guid         ## SOMETIMES_CONSUMES   ## GUID # Unique ID for the type of the certificate.\r
   gEfiHashAlgorithmSha256Guid           ## SOMETIMES_CONSUMES   ## GUID\r
 [Guids]\r
   gEfiCertTypeRsa2048Sha256Guid         ## SOMETIMES_CONSUMES   ## GUID # Unique ID for the type of the certificate.\r
   gEfiHashAlgorithmSha256Guid           ## SOMETIMES_CONSUMES   ## GUID\r