]> git.proxmox.com Git - mirror_edk2.git/commitdiff
projects / mirror_edk2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a49e2a)
CryptoPkg: Reconfigure OpensslLib to add EC algorithms
authoryi1 li <yi1.li@intel.com>
Wed, 13 Apr 2022 07:02:01 +0000 (15:02 +0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Thu, 14 Apr 2022 03:16:59 +0000 (03:16 +0000)
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3679
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3828

Reconfigure OpensslLib to add elliptic curve cipher algorithms.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: yi1 li <yi1.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
CryptoPkg/Library/Include/openssl/opensslconf.h patch | blob | blame | history
CryptoPkg/Library/OpensslLib/OpensslLib.inf patch | blob | blame | history
CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf patch | blob | blame | history
CryptoPkg/Library/OpensslLib/process_files.pl patch | blob | blame | history

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index b119212ed856b5b623c9dccb14600833f86b155e..7ea976b2252ed5907c544b738097196c77087bed 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -55,9 +55,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DSA\r
 #define OPENSSL_NO_DSA\r
 #endif\r
-#ifndef OPENSSL_NO_EC\r
-#define OPENSSL_NO_EC\r
-#endif\r
 #ifndef OPENSSL_NO_IDEA\r
 #define OPENSSL_NO_IDEA\r
 #endif\r
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index d84bde056af2a72dc6b92323259c953d0beaac75..1d67ed55e1b1440b2116845cf5cb66c7a0fd663e 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -199,6 +199,43 @@
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve25519.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_check.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_curve.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_err.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_key.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_lib.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_mult.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_print.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c\r
+  $(OPENSSL_PATH)/crypto/ec/eck_prn.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
   $(OPENSSL_PATH)/crypto/evp/bio_b64.c\r
@@ -496,6 +533,15 @@
   $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/ec_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/field.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/word.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h\r
   $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index cdeed0d073eb3816f28df8445eb06a98fd20c0c0..66ca5b1250c13163f4f9c505d3021c9e88c4b75e 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -199,6 +199,43 @@
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve25519.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_check.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_curve.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_err.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_key.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_lib.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_mult.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/ec/ec_print.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c\r
+  $(OPENSSL_PATH)/crypto/ec/eck_prn.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c\r
+  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
   $(OPENSSL_PATH)/crypto/evp/bio_b64.c\r
@@ -496,6 +533,15 @@
   $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/ec_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/field.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/word.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h\r
+  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h\r
   $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 42bff05fa629bd93340d467cde3b1e3809ad12c7..2ebfbbbca0de142a4021841285e8e2af5f7f270d 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -169,7 +169,6 @@ BEGIN {
                 "no-dgram",\r
                 "no-dsa",\r
                 "no-dynamic-engine",\r
-                "no-ec",\r
                 "no-ec2m",\r
                 "no-engine",\r
                 "no-err",\r
EFI Development Kit II mirror for PVE