1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v3] UefiPayloadPkg: Remove deprecate Crypto Service

Guo, Gua posted 1 patch 1 year, 6 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch | 40 ++++++++++++++++++++
UefiPayloadPkg/UefiPayloadPkg.dsc                         |  2 -
2 files changed, 40 insertions(+), 2 deletions(-)
[edk2-devel] [PATCH v3] UefiPayloadPkg: Remove deprecate Crypto Service
Posted by Guo, Gua 1 year, 6 months ago 
From: Gua Guo <gua.guo@intel.com>

REF : https://bugzilla.tianocore.org/show_bug.cgi?id=4096

TDES and ARC4 services are deprecated so set it as disable.

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: James Lu <james.lu@intel.com>
Signed-off-by: Gua Guo <gua.guo@intel.com>
---
 0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch | 40 ++++++++++++++++++++
 UefiPayloadPkg/UefiPayloadPkg.dsc                         |  2 -
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch b/0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch
new file mode 100644
index 0000000000..d81d45a9ff
--- /dev/null
+++ b/0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch
@@ -0,0 +1,40 @@
+From a1dc2255f4616c16684a39d1e85109c653b3e8de Mon Sep 17 00:00:00 2001
+Message-Id: <a1dc2255f4616c16684a39d1e85109c653b3e8de.1664960866.git.gua.guo@intel.com>
+From: Gua Guo <gua.guo@intel.com>
+Date: Wed, 5 Oct 2022 16:48:05 +0800
+Subject: [PATCH v2] UefiPayloadPkg: Remove deprecate Crypto Service
+
+REF : https://bugzilla.tianocore.org/show_bug.cgi?id=4096
+
+TDES and ARC4 services are deprecated so set it as disable.
+
+Cc: Guo Dong <guo.dong@intel.com>
+Cc: Ray Ni <ray.ni@intel.com>
+Cc: James Lu <james.lu@intel.com>
+Signed-off-by: Gua Guo <gua.guo@intel.com>
+---
+ UefiPayloadPkg/UefiPayloadPkg.dsc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
+index 8f23802199..62959542a3 100644
+--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
++++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
+@@ -459,12 +459,12 @@
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family                            | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family                            | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
++  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              | FALSE                            # TDES is deprecated and unsupported any longer.
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize              | TRUE
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init                        | TRUE
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt                  | TRUE
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt                  | TRUE
+-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
++  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              | FALSE                            # ARC4 is deprecated and unsupported any longer.
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family                               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family                               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
+-- 
+2.31.1.windows.1
+
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 8f23802199..1150be6acd 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -459,12 +459,10 @@
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family                            | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family                            | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize              | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init                        | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt                  | TRUE
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt                  | TRUE
-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family                               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                              | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family                               | PCD_CRYPTO_SERVICE_ENABLE_FAMILY
-- 
2.31.1.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94749): https://edk2.groups.io/g/devel/message/94749
Mute This Topic: https://groups.io/mt/94132067/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v3] UefiPayloadPkg: Remove deprecate Crypto Service
Posted by Michael D Kinney 1 year, 6 months ago 
Hi,

The DEC default for these settings is disabled.  You only need to remove the family lines.

Also, setting to FALSE does not make sense for a Family bitmask.  If you set family
value, it must be a hex value.  The recommendation is is not present (DEC default
of 0x0) or PCD_CRYPTO_SERVICE_ENABLE_FAMILY (all bits set).

Mike


> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Guo, Gua
> Sent: Wednesday, October 5, 2022 2:54 AM
> To: devel@edk2.groups.io
> Cc: Guo, Gua <gua.guo@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Lu, James <james.lu@intel.com>
> Subject: [edk2-devel] [PATCH v3] UefiPayloadPkg: Remove deprecate Crypto Service
> 
> From: Gua Guo <gua.guo@intel.com>
> 
> REF : https://bugzilla.tianocore.org/show_bug.cgi?id=4096
> 
> TDES and ARC4 services are deprecated so set it as disable.
> 
> Cc: Guo Dong <guo.dong@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: James Lu <james.lu@intel.com>
> Signed-off-by: Gua Guo <gua.guo@intel.com>
> ---
>  0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch | 40 ++++++++++++++++++++
>  UefiPayloadPkg/UefiPayloadPkg.dsc                         |  2 -
>  2 files changed, 40 insertions(+), 2 deletions(-)
> 
> diff --git a/0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch b/0001-UefiPayloadPkg-Remove-deprecate-Crypto-
> Service.patch
> new file mode 100644
> index 0000000000..d81d45a9ff
> --- /dev/null
> +++ b/0001-UefiPayloadPkg-Remove-deprecate-Crypto-Service.patch
> @@ -0,0 +1,40 @@
> +From a1dc2255f4616c16684a39d1e85109c653b3e8de Mon Sep 17 00:00:00 2001
> +Message-Id: <a1dc2255f4616c16684a39d1e85109c653b3e8de.1664960866.git.gua.guo@intel.com>
> +From: Gua Guo <gua.guo@intel.com>
> +Date: Wed, 5 Oct 2022 16:48:05 +0800
> +Subject: [PATCH v2] UefiPayloadPkg: Remove deprecate Crypto Service
> +
> +REF : https://bugzilla.tianocore.org/show_bug.cgi?id=4096
> +
> +TDES and ARC4 services are deprecated so set it as disable.
> +
> +Cc: Guo Dong <guo.dong@intel.com>
> +Cc: Ray Ni <ray.ni@intel.com>
> +Cc: James Lu <james.lu@intel.com>
> +Signed-off-by: Gua Guo <gua.guo@intel.com>
> +---
> + UefiPayloadPkg/UefiPayloadPkg.dsc | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
> +index 8f23802199..62959542a3 100644
> +--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
> ++++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
> +@@ -459,12 +459,12 @@
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family                            |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family                            |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> ++  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              | FALSE
> # TDES is deprecated and unsupported any longer.
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize              | TRUE
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init                        | TRUE
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt                  | TRUE
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt                  | TRUE
> 
> +-  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> ++  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              | FALSE
> # ARC4 is deprecated and unsupported any longer.
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family                               |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +   gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family                               |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> +--
> +2.31.1.windows.1
> +
> diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
> index 8f23802199..1150be6acd 100644
> --- a/UefiPayloadPkg/UefiPayloadPkg.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
> @@ -459,12 +459,10 @@
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha384.Family                            |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sha512.Family                            |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.X509.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> -  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tdes.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.GetContextSize              | TRUE
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.Init                        | TRUE
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcEncrypt                  | TRUE
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Aes.Services.CbcDecrypt                  | TRUE
> 
> -  gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Arc4.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Sm3.Family                               |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Hkdf.Family                              |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
>    gEfiCryptoPkgTokenSpaceGuid.PcdCryptoServiceFamilyEnable.Tls.Family                               |
> PCD_CRYPTO_SERVICE_ENABLE_FAMILY
> 
> --
> 2.31.1.windows.1
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#94749): https://edk2.groups.io/g/devel/message/94749
> Mute This Topic: https://groups.io/mt/94132067/1643496
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
> -=-=-=-=-=-=
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#94761): https://edk2.groups.io/g/devel/message/94761
Mute This Topic: https://groups.io/mt/94132067/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.