[edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID

Zhang, Chao B posted 1 patch 5 years, 8 months ago
Failed in applying to current master (apply log)
SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf | 2 +-
SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID
Posted by Zhang, Chao B 5 years, 8 months ago
2 file GUIDs conflict with existing SHA256 Lib. Update them.

Cc: Long Qin <qin.long@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
---
 SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf | 2 +-
 SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
index 76677794fa..cf12587354 100644
--- a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
@@ -15,11 +15,11 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = HashInstanceLibSha384
   MODULE_UNI_FILE                = HashInstanceLibSha384.uni
-  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
+  FILE_GUID                      = 74223710-17A9-478f-9B24-E354496B968B
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL
   CONSTRUCTOR                    = HashInstanceLibSha384Constructor
 
diff --git a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
index 94929a8736..917c23f3d5 100644
--- a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
+++ b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
@@ -15,11 +15,11 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = HashInstanceLibSha512
   MODULE_UNI_FILE                = HashInstanceLibSha512.uni
-  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
+  FILE_GUID                      = 959C3685-AC3F-4f3e-AC5B-7E2A64BADD36
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL
   CONSTRUCTOR                    = HashInstanceLibSha512Constructor
 
-- 
2.16.2.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID
Posted by Long, Qin 5 years, 8 months ago
Chao, Please change the lowercase letters in the new GUID to uppercase letters when committing this.

Reviewed-by: Long Qin <qin.long@intel.com>


Best Regards & Thanks,
LONG, Qin

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Zhang,
> Chao B
> Sent: Wednesday, August 8, 2018 11:06 PM
> To: edk2-devel@lists.01.org
> Cc: Long, Qin <qin.long@intel.com>
> Subject: [edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID
> 
> 2 file GUIDs conflict with existing SHA256 Lib. Update them.
> 
> Cc: Long Qin <qin.long@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com>
> ---
>  SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf | 2 +-
> SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> index 76677794fa..cf12587354 100644
> --- a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> +++ b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.in
> +++ f
> @@ -15,11 +15,11 @@
> 
>  [Defines]
>    INF_VERSION                    = 0x00010005
>    BASE_NAME                      = HashInstanceLibSha384
>    MODULE_UNI_FILE                = HashInstanceLibSha384.uni
> -  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
> +  FILE_GUID                      = 74223710-17A9-478f-9B24-E354496B968B
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = NULL
>    CONSTRUCTOR                    = HashInstanceLibSha384Constructor
> 
> diff --git
> a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> index 94929a8736..917c23f3d5 100644
> --- a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> +++ b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.in
> +++ f
> @@ -15,11 +15,11 @@
> 
>  [Defines]
>    INF_VERSION                    = 0x00010005
>    BASE_NAME                      = HashInstanceLibSha512
>    MODULE_UNI_FILE                = HashInstanceLibSha512.uni
> -  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
> +  FILE_GUID                      = 959C3685-AC3F-4f3e-AC5B-7E2A64BADD36
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = NULL
>    CONSTRUCTOR                    = HashInstanceLibSha512Constructor
> 
> --
> 2.16.2.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID
Posted by Zhang, Chao B 5 years, 8 months ago
Tks for comments. I will update GUID before check-in

From: Long, Qin
Sent: Thursday, August 9, 2018 2:22 PM
To: Zhang, Chao B <chao.b.zhang@intel.com>; edk2-devel@lists.01.org
Subject: RE: [edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID

Chao, Please change the lowercase letters in the new GUID to uppercase letters when committing this.

Reviewed-by: Long Qin <qin.long@intel.com<mailto:qin.long@intel.com>>


Best Regards & Thanks,
LONG, Qin

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Zhang,
> Chao B
> Sent: Wednesday, August 8, 2018 11:06 PM
> To: edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> Cc: Long, Qin <qin.long@intel.com<mailto:qin.long@intel.com>>
> Subject: [edk2] [Patch] SecurityPkg: HashLib: Update HashLib file GUID
>
> 2 file GUIDs conflict with existing SHA256 Lib. Update them.
>
> Cc: Long Qin <qin.long@intel.com<mailto:qin.long@intel.com>>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Zhang, Chao B <chao.b.zhang@intel.com<mailto:chao.b.zhang@intel.com>>
> ---
>  SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf | 2 +-
> SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git
> a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> index 76677794fa..cf12587354 100644
> --- a/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
> +++ b/SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.in
> +++ f
> @@ -15,11 +15,11 @@
>
>  [Defines]
>    INF_VERSION                    = 0x00010005
>    BASE_NAME                      = HashInstanceLibSha384
>    MODULE_UNI_FILE                = HashInstanceLibSha384.uni
> -  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
> +  FILE_GUID                      = 74223710-17A9-478f-9B24-E354496B968B
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = NULL
>    CONSTRUCTOR                    = HashInstanceLibSha384Constructor
>
> diff --git
> a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> index 94929a8736..917c23f3d5 100644
> --- a/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
> +++ b/SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.in
> +++ f
> @@ -15,11 +15,11 @@
>
>  [Defines]
>    INF_VERSION                    = 0x00010005
>    BASE_NAME                      = HashInstanceLibSha512
>    MODULE_UNI_FILE                = HashInstanceLibSha512.uni
> -  FILE_GUID                      = 5810798A-ED30-4080-8DD7-B9667A748C02
> +  FILE_GUID                      = 959C3685-AC3F-4f3e-AC5B-7E2A64BADD36
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = NULL
>    CONSTRUCTOR                    = HashInstanceLibSha512Constructor
>
> --
> 2.16.2.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org<mailto:edk2-devel@lists.01.org>
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel