Re: [edk2-devel] [PATCH v2 10/10] SecurityPkg/DxeImageVerificationLib: change IsCertHashFoundInDatabase name(CVE-2019-14575)

2020-02-13 Thread Yao, Jiewen
Reviewed-by: Jiewen Yao 

> -Original Message-
> From: Wang, Jian J 
> Sent: Friday, February 14, 2020 3:28 PM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen ; Zhang, Chao B
> 
> Subject: [PATCH v2 10/10] SecurityPkg/DxeImageVerificationLib: change
> IsCertHashFoundInDatabase name(CVE-2019-14575)
> 
> IsCertHashFoundInDatabase() is actually used only for searching dbx,
> according to the function logic, its comments and its use cases. Changing
> it to IsCertHashFoundInDbx to avoid confusion.
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1608
> Cc: Jiewen Yao 
> Cc: Chao Zhang 
> Signed-off-by: Jian J Wang 
> ---
>  .../DxeImageVerificationLib/DxeImageVerificationLib.c   | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> index 0e1587bc3c..b7fa8ea8c5 100644
> --- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> +++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
> @@ -829,7 +829,7 @@ AddImageExeInfo (
> 
> 
>  **/
> 
>  EFI_STATUS
> 
> -IsCertHashFoundInDatabase (
> 
> +IsCertHashFoundInDbx (
> 
>IN  UINT8   *Certificate,
> 
>IN  UINTN   CertSize,
> 
>IN  EFI_SIGNATURE_LIST  *SignatureList,
> 
> @@ -1362,7 +1362,7 @@ IsForbiddenByDbx (
>  //
> 
>  CertPtr = CertPtr + sizeof (UINT32) + CertSize;
> 
> 
> 
> -Status = IsCertHashFoundInDatabase (Cert, CertSize, (EFI_SIGNATURE_LIST
> *)Data, DataSize, , );
> 
> +Status = IsCertHashFoundInDbx (Cert, CertSize, (EFI_SIGNATURE_LIST 
> *)Data,
> DataSize, , );
> 
>  if (EFI_ERROR (Status)) {
> 
>//
> 
>// Error in searching dbx. Consider it as 'found'. RevocationTime might
> 
> @@ -1528,7 +1528,7 @@ IsAllowedByDb (
>  //
> 
>  // Here We still need to check if this RootCert's Hash is revoked
> 
>  //
> 
> -Status = IsCertHashFoundInDatabase (RootCert, RootCertSize,
> (EFI_SIGNATURE_LIST *)DbxData, DbxDataSize, , );
> 
> +Status = IsCertHashFoundInDbx (RootCert, RootCertSize,
> (EFI_SIGNATURE_LIST *)DbxData, DbxDataSize, , );
> 
>  if (EFI_ERROR (Status)) {
> 
>//
> 
>// Error in searching dbx. Consider it as 'found'. 
> RevocationTime might
> 
> --
> 2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54427): https://edk2.groups.io/g/devel/message/54427
Mute This Topic: https://groups.io/mt/71264909/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



[edk2-devel] [PATCH v2 10/10] SecurityPkg/DxeImageVerificationLib: change IsCertHashFoundInDatabase name(CVE-2019-14575)

2020-02-13 Thread Wang, Jian J
IsCertHashFoundInDatabase() is actually used only for searching dbx,
according to the function logic, its comments and its use cases. Changing
it to IsCertHashFoundInDbx to avoid confusion.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1608
Cc: Jiewen Yao 
Cc: Chao Zhang 
Signed-off-by: Jian J Wang 
---
 .../DxeImageVerificationLib/DxeImageVerificationLib.c   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c 
b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 0e1587bc3c..b7fa8ea8c5 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -829,7 +829,7 @@ AddImageExeInfo (
 
 **/
 EFI_STATUS
-IsCertHashFoundInDatabase (
+IsCertHashFoundInDbx (
   IN  UINT8   *Certificate,
   IN  UINTN   CertSize,
   IN  EFI_SIGNATURE_LIST  *SignatureList,
@@ -1362,7 +1362,7 @@ IsForbiddenByDbx (
 //
 CertPtr = CertPtr + sizeof (UINT32) + CertSize;
 
-Status = IsCertHashFoundInDatabase (Cert, CertSize, (EFI_SIGNATURE_LIST 
*)Data, DataSize, , );
+Status = IsCertHashFoundInDbx (Cert, CertSize, (EFI_SIGNATURE_LIST *)Data, 
DataSize, , );
 if (EFI_ERROR (Status)) {
   //
   // Error in searching dbx. Consider it as 'found'. RevocationTime might
@@ -1528,7 +1528,7 @@ IsAllowedByDb (
 //
 // Here We still need to check if this RootCert's Hash is revoked
 //
-Status = IsCertHashFoundInDatabase (RootCert, RootCertSize, 
(EFI_SIGNATURE_LIST *)DbxData, DbxDataSize, , );
+Status = IsCertHashFoundInDbx (RootCert, RootCertSize, 
(EFI_SIGNATURE_LIST *)DbxData, DbxDataSize, , );
 if (EFI_ERROR (Status)) {
   //
   // Error in searching dbx. Consider it as 'found'. 
RevocationTime might
-- 
2.24.0.windows.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#54426): https://edk2.groups.io/g/devel/message/54426
Mute This Topic: https://groups.io/mt/71264909/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-