CryptoPkg/OpensslLib: Set TDES disable in OpensslLib

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

This patch is create by adding the setting "no_des" of
process_files.pl and running it thru perl.
It would remove the TDES from OpensslLib.

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/Include/openssl/opensslconf.h b/CryptoPkg/Library/Include/openssl/opensslconf.h
index f55b27ae81613eb5488431ebade6c6343c8237df..70862e1054ff5eea398b898fd81aeaf647cc4369 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -49,6 +49,9 @@ extern "C" {
 #ifndef OPENSSL_NO_CT
 # define OPENSSL_NO_CT
 #endif
+#ifndef OPENSSL_NO_DES\r
+# define OPENSSL_NO_DES\r
+#endif\r
 #ifndef OPENSSL_NO_DSA
 # define OPENSSL_NO_DSA
 #endif

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index dfaefd1c08f28e0eedfe7335a2724a9b9702cda4..d66f1cb03fb42002b1a8239d467f16ce66cfc2f7 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -178,25 +178,6 @@
   $(OPENSSL_PATH)/crypto/cryptlib.c\r
   $(OPENSSL_PATH)/crypto/ctype.c\r
   $(OPENSSL_PATH)/crypto/cversion.c\r
-  $(OPENSSL_PATH)/crypto/des/cbc_cksm.c\r
-  $(OPENSSL_PATH)/crypto/des/cbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb64ede.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb64enc.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/des_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ecb3_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ecb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/fcrypt.c\r
-  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb64ede.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb64enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/pcbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/qud_cksm.c\r
-  $(OPENSSL_PATH)/crypto/des/rand_key.c\r
-  $(OPENSSL_PATH)/crypto/des/set_key.c\r
-  $(OPENSSL_PATH)/crypto/des/str2key.c\r
-  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_ameth.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_check.c\r
@@ -514,8 +495,6 @@
   $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/des/des_locl.h\r
-  $(OPENSSL_PATH)/crypto/des/spr.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
   $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 080e1d9305ba11ad47984be3865e53ba07ad30ee..5788d13cf7a7cca4fac10e1947367d0f75296607 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -178,25 +178,6 @@
   $(OPENSSL_PATH)/crypto/cryptlib.c\r
   $(OPENSSL_PATH)/crypto/ctype.c\r
   $(OPENSSL_PATH)/crypto/cversion.c\r
-  $(OPENSSL_PATH)/crypto/des/cbc_cksm.c\r
-  $(OPENSSL_PATH)/crypto/des/cbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb64ede.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb64enc.c\r
-  $(OPENSSL_PATH)/crypto/des/cfb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/des_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ecb3_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ecb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/fcrypt.c\r
-  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb64ede.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb64enc.c\r
-  $(OPENSSL_PATH)/crypto/des/ofb_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/pcbc_enc.c\r
-  $(OPENSSL_PATH)/crypto/des/qud_cksm.c\r
-  $(OPENSSL_PATH)/crypto/des/rand_key.c\r
-  $(OPENSSL_PATH)/crypto/des/set_key.c\r
-  $(OPENSSL_PATH)/crypto/des/str2key.c\r
-  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_ameth.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_check.c\r
@@ -514,8 +495,6 @@
   $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
   $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-  $(OPENSSL_PATH)/crypto/des/des_locl.h\r
-  $(OPENSSL_PATH)/crypto/des/spr.h\r
   $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
   $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
   $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 254bc4dbcc5265f1718f91c4d1336cd966ef9e09..5ceedf5d3783eb26d057e8fadd37a0c4a1cbc29e 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -62,6 +62,7 @@ BEGIN {
                 "no-cms",\r
                 "no-ct",\r
                 "no-deprecated",\r
+                "no-des",\r
                 "no-dgram",\r
                 "no-dsa",\r
                 "no-dynamic-engine",\r