* [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update
@ 2023-02-24 6:49 Li, Yi
2023-02-24 6:49 ` [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t Li, Yi
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Li, Yi @ 2023-02-24 6:49 UTC (permalink / raw)
To: devel; +Cc: Yi Li, Zhichao Gao, Ming Tan, Heng Luo
Patch 1: update openssl to 1.1.1t
Patch 2: fix wrong name in tls 1.2 cipher suite
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ming Tan <ming.tan@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
Yi Li (2):
CryptoPkg: update openssl to 1.1.1t
CryptoPkg: fix wrong name in tls 1.2 cipher suite
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
CryptoPkg/Library/OpensslLib/openssl | 2 +-
CryptoPkg/Library/TlsLib/TlsConfig.c | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
--
2.31.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t
2023-02-24 6:49 [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Li, Yi
@ 2023-02-24 6:49 ` Li, Yi
2023-02-28 8:15 ` Heng Luo
2023-02-24 6:49 ` [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite Li, Yi
2023-02-28 8:16 ` [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Heng Luo
2 siblings, 1 reply; 6+ messages in thread
From: Li, Yi @ 2023-02-24 6:49 UTC (permalink / raw)
To: devel; +Cc: Yi Li, Zhichao Gao, Ming Tan, Heng Luo
Pick up bugfixes from the latest openssl release.
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ming Tan <ming.tan@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
---
CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
CryptoPkg/Library/OpensslLib/openssl | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 1d67ed55e1..c112b737ba 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -157,6 +157,7 @@
$(OPENSSL_PATH)/crypto/bn/bn_srp.c
$(OPENSSL_PATH)/crypto/bn/bn_word.c
$(OPENSSL_PATH)/crypto/bn/bn_x931p.c
+ $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
$(OPENSSL_PATH)/crypto/buffer/buf_err.c
$(OPENSSL_PATH)/crypto/buffer/buffer.c
$(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/OpensslLib/openssl
index 52c587d60b..830bf8e1e4 160000
--- a/CryptoPkg/Library/OpensslLib/openssl
+++ b/CryptoPkg/Library/OpensslLib/openssl
@@ -1 +1 @@
-Subproject commit 52c587d60be67c337364b830dd3fdc15404a2f04
+Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite
2023-02-24 6:49 [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Li, Yi
2023-02-24 6:49 ` [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t Li, Yi
@ 2023-02-24 6:49 ` Li, Yi
2023-02-28 8:15 ` Heng Luo
2023-02-28 8:16 ` [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Heng Luo
2 siblings, 1 reply; 6+ messages in thread
From: Li, Yi @ 2023-02-24 6:49 UTC (permalink / raw)
To: devel; +Cc: Yi Li, Zhichao Gao, Ming Tan, Heng Luo
Keep cipher name consistent with openssl.
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ming Tan <ming.tan@intel.com>
Cc: Heng Luo <heng.luo@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
---
CryptoPkg/Library/TlsLib/TlsConfig.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c b/CryptoPkg/Library/TlsLib/TlsConfig.c
index 3a3490c2ac..30247b931b 100644
--- a/CryptoPkg/Library/TlsLib/TlsConfig.c
+++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
@@ -70,8 +70,8 @@ STATIC CONST TLS_CIPHER_MAPPING TlsCipherMappingTable[] = {
MAP (0x1302, "TLS_AES_256_GCM_SHA384"), /// TLS_AES_256_GCM_SHA384
MAP (0x1303, "TLS_CHACHA20_POLY1305_SHA256"), /// TLS_CHACHA20_POLY1305_SHA256
MAP (0x1301, "TLS_AES_128_GCM_SHA256"), /// TLS_AES_128_GCM_SHA256
- MAP (0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"), /// TLS_ECDHE_ECDSA_AES128_GCM_SHA256
- MAP (0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"), /// TLS_ECDHE_ECDSA_AES256_GCM_SHA384
+ MAP (0xC02B, "ECDHE-ECDSA-AES128-GCM-SHA256"), /// TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+ MAP (0xC02C, "ECDHE-ECDSA-AES256-GCM-SHA384"), /// TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
MAP (0xC030, "ECDHE-RSA-AES256-GCM-SHA384"), /// TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
};
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t
2023-02-24 6:49 ` [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t Li, Yi
@ 2023-02-28 8:15 ` Heng Luo
0 siblings, 0 replies; 6+ messages in thread
From: Heng Luo @ 2023-02-28 8:15 UTC (permalink / raw)
To: Li, Yi1, devel@edk2.groups.io; +Cc: Gao, Zhichao, Tan, Ming
Reviewed-by: Heng Luo <heng.luo@intel.com>
> -----Original Message-----
> From: Li, Yi1 <yi1.li@intel.com>
> Sent: Friday, February 24, 2023 2:49 PM
> To: devel@edk2.groups.io
> Cc: Li, Yi1 <yi1.li@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Tan,
> Ming <ming.tan@intel.com>; Luo, Heng <heng.luo@intel.com>
> Subject: [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t
>
> Pick up bugfixes from the latest openssl release.
>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ming Tan <ming.tan@intel.com>
> Cc: Heng Luo <heng.luo@intel.com>
> Signed-off-by: Yi Li <yi1.li@intel.com>
> ---
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
> CryptoPkg/Library/OpensslLib/openssl | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 1d67ed55e1..c112b737ba 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -157,6 +157,7 @@
> $(OPENSSL_PATH)/crypto/bn/bn_srp.c
> $(OPENSSL_PATH)/crypto/bn/bn_word.c
> $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
> + $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c
> $(OPENSSL_PATH)/crypto/buffer/buf_err.c
> $(OPENSSL_PATH)/crypto/buffer/buffer.c
> $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
> diff --git a/CryptoPkg/Library/OpensslLib/openssl
> b/CryptoPkg/Library/OpensslLib/openssl
> index 52c587d60b..830bf8e1e4 160000
> --- a/CryptoPkg/Library/OpensslLib/openssl
> +++ b/CryptoPkg/Library/OpensslLib/openssl
> @@ -1 +1 @@
> -Subproject commit 52c587d60be67c337364b830dd3fdc15404a2f04
> +Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba
> --
> 2.31.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite
2023-02-24 6:49 ` [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite Li, Yi
@ 2023-02-28 8:15 ` Heng Luo
0 siblings, 0 replies; 6+ messages in thread
From: Heng Luo @ 2023-02-28 8:15 UTC (permalink / raw)
To: Li, Yi1, devel@edk2.groups.io; +Cc: Gao, Zhichao, Tan, Ming
Reviewed-by: Heng Luo <heng.luo@intel.com>
> -----Original Message-----
> From: Li, Yi1 <yi1.li@intel.com>
> Sent: Friday, February 24, 2023 2:49 PM
> To: devel@edk2.groups.io
> Cc: Li, Yi1 <yi1.li@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Tan,
> Ming <ming.tan@intel.com>; Luo, Heng <heng.luo@intel.com>
> Subject: [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2
> cipher suite
>
> Keep cipher name consistent with openssl.
>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ming Tan <ming.tan@intel.com>
> Cc: Heng Luo <heng.luo@intel.com>
> Signed-off-by: Yi Li <yi1.li@intel.com>
> ---
> CryptoPkg/Library/TlsLib/TlsConfig.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/CryptoPkg/Library/TlsLib/TlsConfig.c
> b/CryptoPkg/Library/TlsLib/TlsConfig.c
> index 3a3490c2ac..30247b931b 100644
> --- a/CryptoPkg/Library/TlsLib/TlsConfig.c
> +++ b/CryptoPkg/Library/TlsLib/TlsConfig.c
> @@ -70,8 +70,8 @@ STATIC CONST TLS_CIPHER_MAPPING
> TlsCipherMappingTable[] = {
> MAP (0x1302, "TLS_AES_256_GCM_SHA384"), ///
> TLS_AES_256_GCM_SHA384
> MAP (0x1303, "TLS_CHACHA20_POLY1305_SHA256"), ///
> TLS_CHACHA20_POLY1305_SHA256
> MAP (0x1301, "TLS_AES_128_GCM_SHA256"), ///
> TLS_AES_128_GCM_SHA256
> - MAP (0xC02B, "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"), ///
> TLS_ECDHE_ECDSA_AES128_GCM_SHA256
> - MAP (0xC02C, "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"), ///
> TLS_ECDHE_ECDSA_AES256_GCM_SHA384
> + MAP (0xC02B, "ECDHE-ECDSA-AES128-GCM-SHA256"), ///
> TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
> + MAP (0xC02C, "ECDHE-ECDSA-AES256-GCM-SHA384"), ///
> TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
> MAP (0xC030, "ECDHE-RSA-AES256-GCM-SHA384"), ///
> TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
> };
>
> --
> 2.31.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update
2023-02-24 6:49 [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Li, Yi
2023-02-24 6:49 ` [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t Li, Yi
2023-02-24 6:49 ` [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite Li, Yi
@ 2023-02-28 8:16 ` Heng Luo
2 siblings, 0 replies; 6+ messages in thread
From: Heng Luo @ 2023-02-28 8:16 UTC (permalink / raw)
To: Li, Yi1, devel@edk2.groups.io; +Cc: Gao, Zhichao, Tan, Ming
For this series:
Reviewed-by: Heng Luo <heng.luo@intel.com>
> -----Original Message-----
> From: Li, Yi1 <yi1.li@intel.com>
> Sent: Friday, February 24, 2023 2:49 PM
> To: devel@edk2.groups.io
> Cc: Li, Yi1 <yi1.li@intel.com>; Gao, Zhichao <zhichao.gao@intel.com>; Tan,
> Ming <ming.tan@intel.com>; Luo, Heng <heng.luo@intel.com>
> Subject: [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update
>
> Patch 1: update openssl to 1.1.1t
> Patch 2: fix wrong name in tls 1.2 cipher suite
>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ming Tan <ming.tan@intel.com>
> Cc: Heng Luo <heng.luo@intel.com>
> Signed-off-by: Yi Li <yi1.li@intel.com>
>
> Yi Li (2):
> CryptoPkg: update openssl to 1.1.1t
> CryptoPkg: fix wrong name in tls 1.2 cipher suite
>
> CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 +
> CryptoPkg/Library/OpensslLib/openssl | 2 +-
> CryptoPkg/Library/TlsLib/TlsConfig.c | 4 ++--
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> --
> 2.31.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-28 8:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-24 6:49 [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Li, Yi
2023-02-24 6:49 ` [edk2-staging][PATCH 1/2] CryptoPkg: update openssl to 1.1.1t Li, Yi
2023-02-28 8:15 ` Heng Luo
2023-02-24 6:49 ` [edk2-staging][PATCH 2/2] CryptoPkg: fix wrong name in tls 1.2 cipher suite Li, Yi
2023-02-28 8:15 ` Heng Luo
2023-02-28 8:16 ` [edk2-staging][PATCH 0/2] CryptoPkg: openssl submodule update Heng Luo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox