[edk2-devel] [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1u

Sheng Wei posted 1 patch 9 months, 2 weeks ago
Failed in applying to current master (apply log)
There is a newer version of this series
CryptoPkg/Library/OpensslLib/OpensslLib.inf          | 1 -
CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf     | 1 -
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf    | 1 -
CryptoPkg/Library/OpensslLib/OpensslLibFull.inf      | 1 -
CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 1 -
CryptoPkg/Library/OpensslLib/openssl                 | 2 +-
6 files changed, 1 insertion(+), 6 deletions(-)
[edk2-devel] [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1u
Posted by Sheng Wei 9 months, 2 weeks ago
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Signed-off-by: Sheng Wei <w.sheng@intel.com>
---
 CryptoPkg/Library/OpensslLib/OpensslLib.inf          | 1 -
 CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf     | 1 -
 CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf    | 1 -
 CryptoPkg/Library/OpensslLib/OpensslLibFull.inf      | 1 -
 CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 1 -
 CryptoPkg/Library/OpensslLib/openssl                 | 2 +-
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 0f64c9fa7e..64f4eac4c8 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -162,7 +162,6 @@
   $(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/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
index ebada80d9d..5b18e59e66 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
@@ -163,7 +163,6 @@
   $(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/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 311cd1e605..411d1e5717 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -163,7 +163,6 @@
   $(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/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
index 52bb4aeaa5..409242e7c3 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
@@ -167,7 +167,6 @@
   $(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/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
index 2ea117e506..f85c545d97 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
@@ -168,7 +168,6 @@
   $(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 830bf8e1e4..70c2912f63 160000
--- a/CryptoPkg/Library/OpensslLib/openssl
+++ b/CryptoPkg/Library/OpensslLib/openssl
@@ -1 +1 @@
-Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba
+Subproject commit 70c2912f635aac8ab28629a2b5ea0c09740d2bda
-- 
2.26.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#106981): https://edk2.groups.io/g/devel/message/106981
Mute This Topic: https://groups.io/mt/100210889/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1u
Posted by Yao, Jiewen 9 months, 1 week ago
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Sheng, W <w.sheng@intel.com>
> Sent: Tuesday, July 18, 2023 2:20 PM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> Subject: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1u
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> Signed-off-by: Sheng Wei <w.sheng@intel.com>
> ---
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf          | 1 -
>  CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf     | 1 -
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf    | 1 -
>  CryptoPkg/Library/OpensslLib/OpensslLibFull.inf      | 1 -
>  CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf | 1 -
>  CryptoPkg/Library/OpensslLib/openssl                 | 2 +-
>  6 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 0f64c9fa7e..64f4eac4c8 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -162,7 +162,6 @@
>    $(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/OpensslLibAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> index ebada80d9d..5b18e59e66 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
> @@ -163,7 +163,6 @@
>    $(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/OpensslLibCrypto.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index 311cd1e605..411d1e5717 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -163,7 +163,6 @@
>    $(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/OpensslLibFull.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> index 52bb4aeaa5..409242e7c3 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
> @@ -167,7 +167,6 @@
>    $(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/OpensslLibFullAccel.inf
> b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> index 2ea117e506..f85c545d97 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
> @@ -168,7 +168,6 @@
>    $(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 830bf8e1e4..70c2912f63 160000
> --- a/CryptoPkg/Library/OpensslLib/openssl
> +++ b/CryptoPkg/Library/OpensslLib/openssl
> @@ -1 +1 @@
> -Subproject commit 830bf8e1e4749ad65c51b6a1d0d769ae689404ba
> +Subproject commit 70c2912f635aac8ab28629a2b5ea0c09740d2bda
> --
> 2.26.2.windows.1



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