1 files changed, 40 insertions, 91 deletions
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
index 98b07fd2ea..103ef7bda2 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
@@ -205,43 +205,6 @@
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c
   $(OPENSSL_PATH)/crypto/ebcdic.c
-#  $(OPENSSL_PATH)/crypto/ec/curve25519.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c
-#  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c
-#  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c
-#  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_check.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_curve.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_err.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_key.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_lib.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_mult.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_oct.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c
-#  $(OPENSSL_PATH)/crypto/ec/ec_print.c
-#  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c
-#  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c
-#  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c
-#  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c
-#  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c
-#  $(OPENSSL_PATH)/crypto/ec/eck_prn.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c
-#  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c
-#  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c
   $(OPENSSL_PATH)/crypto/err/err.c
   $(OPENSSL_PATH)/crypto/err/err_prn.c
   $(OPENSSL_PATH)/crypto/evp/bio_b64.c
@@ -320,7 +283,6 @@
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
   $(OPENSSL_PATH)/crypto/md5/md5_one.c
   $(OPENSSL_PATH)/crypto/mem.c
-#  $(OPENSSL_PATH)/crypto/mem_clr.c   # Replaced by assembly optimized NASM/S files
   $(OPENSSL_PATH)/crypto/mem_dbg.c
   $(OPENSSL_PATH)/crypto/mem_sec.c
   $(OPENSSL_PATH)/crypto/modes/cbc128.c
@@ -427,10 +389,6 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c
   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c
   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c
-#  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c
   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c
   $(OPENSSL_PATH)/crypto/sm3/sm3.c
   $(OPENSSL_PATH)/crypto/sm4/sm4.c
@@ -543,15 +501,6 @@
   $(OPENSSL_PATH)/crypto/conf/conf_local.h
   $(OPENSSL_PATH)/crypto/dh/dh_local.h
   $(OPENSSL_PATH)/crypto/dso/dso_local.h
-#  $(OPENSSL_PATH)/crypto/ec/ec_local.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/field.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/word.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h
-#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h
   $(OPENSSL_PATH)/crypto/evp/evp_local.h
   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h
   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h
@@ -634,57 +583,57 @@
 
 [Sources.IA32]
 # Autogenerated IA32 files list starts here
-  IA32/crypto/aes/aesni-x86.nasm    | MSFT
-  IA32/crypto/aes/vpaes-x86.nasm    | MSFT
-  IA32/crypto/modes/ghash-x86.nasm  | MSFT
-  IA32/crypto/sha/sha1-586.nasm     | MSFT
-  IA32/crypto/sha/sha256-586.nasm   | MSFT
-  IA32/crypto/sha/sha512-586.nasm   | MSFT
-  IA32/crypto/x86cpuid.nasm         | MSFT
+  IA32/crypto/aes/aesni-x86.nasm  |MSFT
+  IA32/crypto/aes/vpaes-x86.nasm  |MSFT
+  IA32/crypto/modes/ghash-x86.nasm  |MSFT
+  IA32/crypto/sha/sha1-586.nasm  |MSFT
+  IA32/crypto/sha/sha256-586.nasm  |MSFT
+  IA32/crypto/sha/sha512-586.nasm  |MSFT
+  IA32/crypto/x86cpuid.nasm  |MSFT
 # Autogenerated files list ends here
 
 # Autogenerated IA32Gcc files list starts here
-  IA32Gcc/crypto/aes/aesni-x86.S    | GCC
-  IA32Gcc/crypto/aes/vpaes-x86.S    | GCC
-  IA32Gcc/crypto/modes/ghash-x86.S  | GCC
-  IA32Gcc/crypto/sha/sha1-586.S     | GCC
-  IA32Gcc/crypto/sha/sha256-586.S   | GCC
-  IA32Gcc/crypto/sha/sha512-586.S   | GCC
-  IA32Gcc/crypto/x86cpuid.S         | GCC
+  IA32Gcc/crypto/aes/aesni-x86.S  |GCC
+  IA32Gcc/crypto/aes/vpaes-x86.S  |GCC
+  IA32Gcc/crypto/modes/ghash-x86.S  |GCC
+  IA32Gcc/crypto/sha/sha1-586.S  |GCC
+  IA32Gcc/crypto/sha/sha256-586.S  |GCC
+  IA32Gcc/crypto/sha/sha512-586.S  |GCC
+  IA32Gcc/crypto/x86cpuid.S  |GCC
 # Autogenerated files list ends here
 
 [Sources.X64]
   X64/ApiHooks.c
 # Autogenerated X64 files list starts here
-  X64/crypto/aes/aesni-mb-x86_64.nasm      | MSFT
-  X64/crypto/aes/aesni-sha1-x86_64.nasm    | MSFT
-  X64/crypto/aes/aesni-sha256-x86_64.nasm  | MSFT
-  X64/crypto/aes/aesni-x86_64.nasm         | MSFT
-  X64/crypto/aes/vpaes-x86_64.nasm         | MSFT
-  X64/crypto/modes/aesni-gcm-x86_64.nasm   | MSFT
-  X64/crypto/modes/ghash-x86_64.nasm       | MSFT
-  X64/crypto/sha/sha1-mb-x86_64.nasm       | MSFT
-  X64/crypto/sha/sha1-x86_64.nasm          | MSFT
-  X64/crypto/sha/sha256-mb-x86_64.nasm     | MSFT
-  X64/crypto/sha/sha256-x86_64.nasm        | MSFT
-  X64/crypto/sha/sha512-x86_64.nasm        | MSFT
-  X64/crypto/x86_64cpuid.nasm              | MSFT
+  X64/crypto/aes/aesni-mb-x86_64.nasm  |MSFT
+  X64/crypto/aes/aesni-sha1-x86_64.nasm  |MSFT
+  X64/crypto/aes/aesni-sha256-x86_64.nasm  |MSFT
+  X64/crypto/aes/aesni-x86_64.nasm  |MSFT
+  X64/crypto/aes/vpaes-x86_64.nasm  |MSFT
+  X64/crypto/modes/aesni-gcm-x86_64.nasm  |MSFT
+  X64/crypto/modes/ghash-x86_64.nasm  |MSFT
+  X64/crypto/sha/sha1-mb-x86_64.nasm  |MSFT
+  X64/crypto/sha/sha1-x86_64.nasm  |MSFT
+  X64/crypto/sha/sha256-mb-x86_64.nasm  |MSFT
+  X64/crypto/sha/sha256-x86_64.nasm  |MSFT
+  X64/crypto/sha/sha512-x86_64.nasm  |MSFT
+  X64/crypto/x86_64cpuid.nasm  |MSFT
 # Autogenerated files list ends here
 
 # Autogenerated X64Gcc files list starts here
-  X64Gcc/crypto/aes/aesni-mb-x86_64.S      | GCC
-  X64Gcc/crypto/aes/aesni-sha1-x86_64.S    | GCC
-  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  | GCC
-  X64Gcc/crypto/aes/aesni-x86_64.S         | GCC
-  X64Gcc/crypto/aes/vpaes-x86_64.S         | GCC
-  X64Gcc/crypto/modes/aesni-gcm-x86_64.S   | GCC
-  X64Gcc/crypto/modes/ghash-x86_64.S       | GCC
-  X64Gcc/crypto/sha/sha1-mb-x86_64.S       | GCC
-  X64Gcc/crypto/sha/sha1-x86_64.S          | GCC
-  X64Gcc/crypto/sha/sha256-mb-x86_64.S     | GCC
-  X64Gcc/crypto/sha/sha256-x86_64.S        | GCC
-  X64Gcc/crypto/sha/sha512-x86_64.S        | GCC
-  X64Gcc/crypto/x86_64cpuid.S              | GCC
+  X64Gcc/crypto/aes/aesni-mb-x86_64.S  |GCC
+  X64Gcc/crypto/aes/aesni-sha1-x86_64.S  |GCC
+  X64Gcc/crypto/aes/aesni-sha256-x86_64.S  |GCC
+  X64Gcc/crypto/aes/aesni-x86_64.S  |GCC
+  X64Gcc/crypto/aes/vpaes-x86_64.S  |GCC
+  X64Gcc/crypto/modes/aesni-gcm-x86_64.S  |GCC
+  X64Gcc/crypto/modes/ghash-x86_64.S  |GCC
+  X64Gcc/crypto/sha/sha1-mb-x86_64.S  |GCC
+  X64Gcc/crypto/sha/sha1-x86_64.S  |GCC
+  X64Gcc/crypto/sha/sha256-mb-x86_64.S  |GCC
+  X64Gcc/crypto/sha/sha256-x86_64.S  |GCC
+  X64Gcc/crypto/sha/sha512-x86_64.S  |GCC
+  X64Gcc/crypto/x86_64cpuid.S  |GCC
 # Autogenerated files list ends here
 
 [Packages]