CryptoPkg/Library/OpensslLib: update auto-generated files

Update OpensslLib INF files to match results from running
process_files.pl to auto-generate the INF files.
* OpensslLib.inf
* OpensslLibAccel.inf
* OpensslLibCrypto.inf
* OpensslLibFull.inf
* OpensslLibFullAccel.inf

These INF files are generated by running the following
perl scripts:
* process_files.pl
* process_files.pl X64
* process_files.pl X64Gcc
* process_files.pl IA32
* process_files.pl IA32Gcc

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Christopher Zurcher <christopher.zurcher@microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Yi Li <yi1.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index b98b068b3d3b940f28d7a4a7eefeef9836beccce..09a6641ffcf971a32abcc591a9db71f66950ca07 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -250,11 +250,11 @@ extern "C" {
 #   undef DECLARE_DEPRECATED\r
 #   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
 #  endif\r
-#elif defined(__SUNPRO_C)\r
-#if (__SUNPRO_C >= 0x5130)\r
-#undef DECLARE_DEPRECATED\r
-#define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
-#endif\r
+# elif defined(__SUNPRO_C)\r
+#  if (__SUNPRO_C >= 0x5130)\r
+#   undef DECLARE_DEPRECATED\r
+#   define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));\r
+#  endif\r
 # endif\r
 #endif\r
 \r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 82ffe4ec2f8e63e8de761d4f3cbf88647feb17b4..60c6c24b0a67f5891f31b5902e0d1c58ea56408d 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -204,43 +204,6 @@
   $(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
@@ -426,10 +389,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -542,15 +501,6 @@
   $(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/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
index 98b07fd2eab94ba51adb70c5e78fea820c6733db..103ef7bda2a31b6c3264479679a0ab91448d8a2e 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
@@ -205,43 +205,6 @@
   $(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
@@ -320,7 +283,6 @@
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
   $(OPENSSL_PATH)/crypto/mem.c\r
-#  $(OPENSSL_PATH)/crypto/mem_clr.c   # Replaced by assembly optimized NASM/S files\r
   $(OPENSSL_PATH)/crypto/mem_dbg.c\r
   $(OPENSSL_PATH)/crypto/mem_sec.c\r
   $(OPENSSL_PATH)/crypto/modes/cbc128.c\r
@@ -427,10 +389,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -543,15 +501,6 @@
   $(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
@@ -634,57 +583,57 @@
 \r
 [Sources.IA32]\r
 # Autogenerated IA32 files list starts here\r
-  IA32/crypto/aes/aesni-x86.nasm    | MSFT\r
-  IA32/crypto/aes/vpaes-x86.nasm    | MSFT\r
-  IA32/crypto/modes/ghash-x86.nasm  | MSFT\r
-  IA32/crypto/sha/sha1-586.nasm     | MSFT\r
-  IA32/crypto/sha/sha256-586.nasm   | MSFT\r
-  IA32/crypto/sha/sha512-586.nasm   | MSFT\r
-  IA32/crypto/x86cpuid.nasm         | MSFT\r
+  IA32/crypto/aes/aesni-x86.nasm  |MSFT\r
+  IA32/crypto/aes/vpaes-x86.nasm  |MSFT\r
+  IA32/crypto/modes/ghash-x86.nasm  |MSFT\r
+  IA32/crypto/sha/sha1-586.nasm  |MSFT\r
+  IA32/crypto/sha/sha256-586.nasm  |MSFT\r
+  IA32/crypto/sha/sha512-586.nasm  |MSFT\r
+  IA32/crypto/x86cpuid.nasm  |MSFT\r
 # Autogenerated files list ends here\r
 \r
 # Autogenerated IA32Gcc files list starts here\r
-  IA32Gcc/crypto/aes/aesni-x86.S    | GCC\r
-  IA32Gcc/crypto/aes/vpaes-x86.S    | GCC\r
-  IA32Gcc/crypto/modes/ghash-x86.S  | GCC\r
-  IA32Gcc/crypto/sha/sha1-586.S     | GCC\r
-  IA32Gcc/crypto/sha/sha256-586.S   | GCC\r
-  IA32Gcc/crypto/sha/sha512-586.S   | GCC\r
-  IA32Gcc/crypto/x86cpuid.S         | GCC\r
+  IA32Gcc/crypto/aes/aesni-x86.S  |GCC\r
+  IA32Gcc/crypto/aes/vpaes-x86.S  |GCC\r
+  IA32Gcc/crypto/modes/ghash-x86.S  |GCC\r
+  IA32Gcc/crypto/sha/sha1-586.S  |GCC\r
+  IA32Gcc/crypto/sha/sha256-586.S  |GCC\r
+  IA32Gcc/crypto/sha/sha512-586.S  |GCC\r
+  IA32Gcc/crypto/x86cpuid.S  |GCC\r
 # Autogenerated files list ends here\r
 \r
 [Sources.X64]\r
   X64/ApiHooks.c\r
 # Autogenerated X64 files list starts here\r
-  X64/crypto/aes/aesni-mb-x86_64.nasm      | MSFT\r
-  X64/crypto/aes/aesni-sha1-x86_64.nasm    | MSFT\r
-  X64/crypto/aes/aesni-sha256-x86_64.nasm  | MSFT\r
-  X64/crypto/aes/aesni-x86_64.nasm         | MSFT\r
-  X64/crypto/aes/vpaes-x86_64.nasm         | MSFT\r
-  X64/crypto/modes/aesni-gcm-x86_64.nasm   | MSFT\r
-  X64/crypto/modes/ghash-x86_64.nasm       | MSFT\r
-  X64/crypto/sha/sha1-mb-x86_64.nasm       | MSFT\r
-  X64/crypto/sha/sha1-x86_64.nasm          | MSFT\r
-  X64/crypto/sha/sha256-mb-x86_64.nasm     | MSFT\r
-  X64/crypto/sha/sha256-x86_64.nasm        | MSFT\r
-  X64/crypto/sha/sha512-x86_64.nasm        | MSFT\r
-  X64/crypto/x86_64cpuid.nasm              | MSFT\r
+  X64/crypto/aes/aesni-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-sha1-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-sha256-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/vpaes-x86_64.nasm  |MSFT\r
+  X64/crypto/modes/aesni-gcm-x86_64.nasm  |MSFT\r
+  X64/crypto/modes/ghash-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha1-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha1-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha256-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha256-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha512-x86_64.nasm  |MSFT\r
+  X64/crypto/x86_64cpuid.nasm  |MSFT\r
 # Autogenerated files list ends here\r
 \r
 # Autogenerated X64Gcc files list starts here\r
-  X64Gcc/crypto/aes/aesni-mb-x86_64.S      | GCC\r
-  X64Gcc/crypto/aes/aesni-sha1-x86_64.S    | GCC\r
-  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  | GCC\r
-  X64Gcc/crypto/aes/aesni-x86_64.S         | GCC\r
-  X64Gcc/crypto/aes/vpaes-x86_64.S         | GCC\r
-  X64Gcc/crypto/modes/aesni-gcm-x86_64.S   | GCC\r
-  X64Gcc/crypto/modes/ghash-x86_64.S       | GCC\r
-  X64Gcc/crypto/sha/sha1-mb-x86_64.S       | GCC\r
-  X64Gcc/crypto/sha/sha1-x86_64.S          | GCC\r
-  X64Gcc/crypto/sha/sha256-mb-x86_64.S     | GCC\r
-  X64Gcc/crypto/sha/sha256-x86_64.S        | GCC\r
-  X64Gcc/crypto/sha/sha512-x86_64.S        | GCC\r
-  X64Gcc/crypto/x86_64cpuid.S              | GCC\r
+  X64Gcc/crypto/aes/aesni-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-sha1-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/vpaes-x86_64.S  |GCC\r
+  X64Gcc/crypto/modes/aesni-gcm-x86_64.S  |GCC\r
+  X64Gcc/crypto/modes/ghash-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha1-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha1-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha256-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha256-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha512-x86_64.S  |GCC\r
+  X64Gcc/crypto/x86_64cpuid.S  |GCC\r
 # Autogenerated files list ends here\r
 \r
 [Packages]\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index d02769428b86b3a14f893924be6ed476b11c6be3..c4eaea888c1ae42ba551fe71875333d747676202 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -205,43 +205,6 @@
   $(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
@@ -427,10 +390,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -543,15 +502,6 @@
   $(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
@@ -574,57 +524,6 @@
   $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h\r
   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
-#  $(OPENSSL_PATH)/ssl/bio_ssl.c\r
-#  $(OPENSSL_PATH)/ssl/d1_lib.c\r
-#  $(OPENSSL_PATH)/ssl/d1_msg.c\r
-#  $(OPENSSL_PATH)/ssl/d1_srtp.c\r
-#  $(OPENSSL_PATH)/ssl/methods.c\r
-#  $(OPENSSL_PATH)/ssl/packet.c\r
-#  $(OPENSSL_PATH)/ssl/pqueue.c\r
-#  $(OPENSSL_PATH)/ssl/record/dtls1_bitmap.c\r
-#  $(OPENSSL_PATH)/ssl/record/rec_layer_d1.c\r
-#  $(OPENSSL_PATH)/ssl/record/rec_layer_s3.c\r
-#  $(OPENSSL_PATH)/ssl/record/ssl3_buffer.c\r
-#  $(OPENSSL_PATH)/ssl/record/ssl3_record.c\r
-#  $(OPENSSL_PATH)/ssl/record/ssl3_record_tls13.c\r
-#  $(OPENSSL_PATH)/ssl/s3_cbc.c\r
-#  $(OPENSSL_PATH)/ssl/s3_enc.c\r
-#  $(OPENSSL_PATH)/ssl/s3_lib.c\r
-#  $(OPENSSL_PATH)/ssl/s3_msg.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_asn1.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_cert.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_ciph.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_conf.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_err.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_init.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_lib.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_mcnf.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_rsa.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_sess.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_stat.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_txt.c\r
-#  $(OPENSSL_PATH)/ssl/ssl_utst.c\r
-#  $(OPENSSL_PATH)/ssl/statem/extensions.c\r
-#  $(OPENSSL_PATH)/ssl/statem/extensions_clnt.c\r
-#  $(OPENSSL_PATH)/ssl/statem/extensions_cust.c\r
-#  $(OPENSSL_PATH)/ssl/statem/extensions_srvr.c\r
-#  $(OPENSSL_PATH)/ssl/statem/statem.c\r
-#  $(OPENSSL_PATH)/ssl/statem/statem_clnt.c\r
-#  $(OPENSSL_PATH)/ssl/statem/statem_dtls.c\r
-#  $(OPENSSL_PATH)/ssl/statem/statem_lib.c\r
-#  $(OPENSSL_PATH)/ssl/statem/statem_srvr.c\r
-#  $(OPENSSL_PATH)/ssl/t1_enc.c\r
-#  $(OPENSSL_PATH)/ssl/t1_lib.c\r
-#  $(OPENSSL_PATH)/ssl/t1_trce.c\r
-#  $(OPENSSL_PATH)/ssl/tls13_enc.c\r
-#  $(OPENSSL_PATH)/ssl/tls_srp.c\r
-#  $(OPENSSL_PATH)/ssl/packet_local.h\r
-#  $(OPENSSL_PATH)/ssl/ssl_cert_table.h\r
-#  $(OPENSSL_PATH)/ssl/ssl_local.h\r
-#  $(OPENSSL_PATH)/ssl/record/record.h\r
-#  $(OPENSSL_PATH)/ssl/record/record_local.h\r
-#  $(OPENSSL_PATH)/ssl/statem/statem.h\r
-#  $(OPENSSL_PATH)/ssl/statem/statem_local.h\r
 # Autogenerated files list ends here\r
   buildinf.h\r
   ossl_store.c\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
index aa73265931f7881e1d6a4e2c6110946b9827b78a..309e43055ce227ea360df33b93cd52982d88f15c 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
@@ -209,43 +209,6 @@
   $(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
@@ -431,10 +394,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -547,15 +506,6 @@
   $(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
@@ -629,6 +579,56 @@
   $(OPENSSL_PATH)/ssl/record/record_local.h\r
   $(OPENSSL_PATH)/ssl/statem/statem.h\r
   $(OPENSSL_PATH)/ssl/statem/statem_local.h\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/sm2/sm2_crypt.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\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
 # Autogenerated files list ends here\r
   buildinf.h\r
   ossl_store.c\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
index 6525b73a9e7becd8cb4ca44f26aec7dda875b936..4eeeeb79bd9483d0fe2d67e0b13f4cdff86c9f00 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
@@ -210,43 +210,6 @@
   $(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
@@ -325,7 +288,6 @@
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
   $(OPENSSL_PATH)/crypto/mem.c\r
-#  $(OPENSSL_PATH)/crypto/mem_clr.c   # Replaced by assembly optimized NASM/S files\r
   $(OPENSSL_PATH)/crypto/mem_dbg.c\r
   $(OPENSSL_PATH)/crypto/mem_sec.c\r
   $(OPENSSL_PATH)/crypto/modes/cbc128.c\r
@@ -432,10 +394,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
-  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\r
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
   $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
   $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
@@ -548,15 +506,6 @@
   $(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
@@ -630,6 +579,56 @@
   $(OPENSSL_PATH)/ssl/record/record_local.h\r
   $(OPENSSL_PATH)/ssl/statem/statem.h\r
   $(OPENSSL_PATH)/ssl/statem/statem_local.h\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/sm2/sm2_crypt.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c\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
 # Autogenerated files list ends here\r
   buildinf.h\r
   ossl_store.c\r
@@ -639,57 +638,57 @@
 \r
 [Sources.IA32]\r
 # Autogenerated IA32 files list starts here\r
-  IA32/crypto/aes/aesni-x86.nasm    | MSFT\r
-  IA32/crypto/aes/vpaes-x86.nasm    | MSFT\r
-  IA32/crypto/modes/ghash-x86.nasm  | MSFT\r
-  IA32/crypto/sha/sha1-586.nasm     | MSFT\r
-  IA32/crypto/sha/sha256-586.nasm   | MSFT\r
-  IA32/crypto/sha/sha512-586.nasm   | MSFT\r
-  IA32/crypto/x86cpuid.nasm         | MSFT\r
+  IA32/crypto/aes/aesni-x86.nasm  |MSFT\r
+  IA32/crypto/aes/vpaes-x86.nasm  |MSFT\r
+  IA32/crypto/modes/ghash-x86.nasm  |MSFT\r
+  IA32/crypto/sha/sha1-586.nasm  |MSFT\r
+  IA32/crypto/sha/sha256-586.nasm  |MSFT\r
+  IA32/crypto/sha/sha512-586.nasm  |MSFT\r
+  IA32/crypto/x86cpuid.nasm  |MSFT\r
 # Autogenerated files list ends here\r
 \r
 # Autogenerated IA32Gcc files list starts here\r
-  IA32Gcc/crypto/aes/aesni-x86.S    | GCC\r
-  IA32Gcc/crypto/aes/vpaes-x86.S    | GCC\r
-  IA32Gcc/crypto/modes/ghash-x86.S  | GCC\r
-  IA32Gcc/crypto/sha/sha1-586.S     | GCC\r
-  IA32Gcc/crypto/sha/sha256-586.S   | GCC\r
-  IA32Gcc/crypto/sha/sha512-586.S   | GCC\r
-  IA32Gcc/crypto/x86cpuid.S         | GCC\r
+  IA32Gcc/crypto/aes/aesni-x86.S  |GCC\r
+  IA32Gcc/crypto/aes/vpaes-x86.S  |GCC\r
+  IA32Gcc/crypto/modes/ghash-x86.S  |GCC\r
+  IA32Gcc/crypto/sha/sha1-586.S  |GCC\r
+  IA32Gcc/crypto/sha/sha256-586.S  |GCC\r
+  IA32Gcc/crypto/sha/sha512-586.S  |GCC\r
+  IA32Gcc/crypto/x86cpuid.S  |GCC\r
 # Autogenerated files list ends here\r
 \r
 [Sources.X64]\r
   X64/ApiHooks.c\r
 # Autogenerated X64 files list starts here\r
-  X64/crypto/aes/aesni-mb-x86_64.nasm      | MSFT\r
-  X64/crypto/aes/aesni-sha1-x86_64.nasm    | MSFT\r
-  X64/crypto/aes/aesni-sha256-x86_64.nasm  | MSFT\r
-  X64/crypto/aes/aesni-x86_64.nasm         | MSFT\r
-  X64/crypto/aes/vpaes-x86_64.nasm         | MSFT\r
-  X64/crypto/modes/aesni-gcm-x86_64.nasm   | MSFT\r
-  X64/crypto/modes/ghash-x86_64.nasm       | MSFT\r
-  X64/crypto/sha/sha1-mb-x86_64.nasm       | MSFT\r
-  X64/crypto/sha/sha1-x86_64.nasm          | MSFT\r
-  X64/crypto/sha/sha256-mb-x86_64.nasm     | MSFT\r
-  X64/crypto/sha/sha256-x86_64.nasm        | MSFT\r
-  X64/crypto/sha/sha512-x86_64.nasm        | MSFT\r
-  X64/crypto/x86_64cpuid.nasm              | MSFT\r
+  X64/crypto/aes/aesni-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-sha1-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-sha256-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/aesni-x86_64.nasm  |MSFT\r
+  X64/crypto/aes/vpaes-x86_64.nasm  |MSFT\r
+  X64/crypto/modes/aesni-gcm-x86_64.nasm  |MSFT\r
+  X64/crypto/modes/ghash-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha1-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha1-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha256-mb-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha256-x86_64.nasm  |MSFT\r
+  X64/crypto/sha/sha512-x86_64.nasm  |MSFT\r
+  X64/crypto/x86_64cpuid.nasm  |MSFT\r
 # Autogenerated files list ends here\r
 \r
 # Autogenerated X64Gcc files list starts here\r
-  X64Gcc/crypto/aes/aesni-mb-x86_64.S      | GCC\r
-  X64Gcc/crypto/aes/aesni-sha1-x86_64.S    | GCC\r
-  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  | GCC\r
-  X64Gcc/crypto/aes/aesni-x86_64.S         | GCC\r
-  X64Gcc/crypto/aes/vpaes-x86_64.S         | GCC\r
-  X64Gcc/crypto/modes/aesni-gcm-x86_64.S   | GCC\r
-  X64Gcc/crypto/modes/ghash-x86_64.S       | GCC\r
-  X64Gcc/crypto/sha/sha1-mb-x86_64.S       | GCC\r
-  X64Gcc/crypto/sha/sha1-x86_64.S          | GCC\r
-  X64Gcc/crypto/sha/sha256-mb-x86_64.S     | GCC\r
-  X64Gcc/crypto/sha/sha256-x86_64.S        | GCC\r
-  X64Gcc/crypto/sha/sha512-x86_64.S        | GCC\r
-  X64Gcc/crypto/x86_64cpuid.S              | GCC\r
+  X64Gcc/crypto/aes/aesni-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-sha1-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/aesni-x86_64.S  |GCC\r
+  X64Gcc/crypto/aes/vpaes-x86_64.S  |GCC\r
+  X64Gcc/crypto/modes/aesni-gcm-x86_64.S  |GCC\r
+  X64Gcc/crypto/modes/ghash-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha1-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha1-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha256-mb-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha256-x86_64.S  |GCC\r
+  X64Gcc/crypto/sha/sha512-x86_64.S  |GCC\r
+  X64Gcc/crypto/x86_64cpuid.S  |GCC\r
 # Autogenerated files list ends here\r
 \r
 [Packages]\r