CryptoPkg/OpensslLib: Remove the Aes Ecb file in the OpensslLib

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1898

Add the unrequired aes_ecb files in process_files.pl and run it
thru perl.
It would remove the unrequired aes_ecb files from OpensslLib inf.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index d66f1cb03fb42002b1a8239d467f16ce66cfc2f7..c8ec9454bd908e37dd6e2bd24801afe4bb063ba8 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -29,7 +29,6 @@
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_cfb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_core.c\r
-  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ige.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 5788d13cf7a7cca4fac10e1947367d0f75296607..2f232e3e128910c10a9200bcfe43c622e3661919 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -29,7 +29,6 @@
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_cfb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_core.c\r
-  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ige.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 5ceedf5d3783eb26d057e8fadd37a0c4a1cbc29e..65d07a2aed446f47c64bd64f84c329c578a5628b 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -144,6 +144,7 @@ foreach my $product ((@{$unified_info{libraries}},
             next if $s =~ "crypto/rand/randfile.c";\r
             next if $s =~ "crypto/store/";\r
             next if $s =~ "crypto/err/err_all.c";\r
+            next if $s =~ "crypto/aes/aes_ecb.c";\r
 \r
             if ($product =~ "libssl") {\r
                 push @sslfilelist, '  $(OPENSSL_PATH)/' . $s . "\r\n";\r