CryptoPkg/OpensslLib: Set MD4 disable in OpensslLib

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

This patch is create by adding the setting "no_md4" of
process_files.pl and running it thru perl.
It would remove the MD4 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 bd34e53ef29f807581e1f56a80277f04c5f1a410..70d24f99ac281a1f5b393afc107f1d611d8cfada 100644 (file)
--- a/CryptoPkg/Library/Include/openssl/opensslconf.h
+++ b/CryptoPkg/Library/Include/openssl/opensslconf.h
@@ -61,6 +61,9 @@ extern "C" {
 #ifndef OPENSSL_NO_MD2
 # define OPENSSL_NO_MD2
 #endif
+#ifndef OPENSSL_NO_MD4\r
+# define OPENSSL_NO_MD4\r
+#endif\r
 #ifndef OPENSSL_NO_MDC2
 # define OPENSSL_NO_MDC2
 #endif

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 9ed01755535c959ba277574d9133881dfaf0c56d..10710e4a7cd7bfef5b834972615cb700236ab7aa 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -294,8 +294,6 @@
   $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c\r
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c\r
   $(OPENSSL_PATH)/crypto/lhash/lhash.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_one.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
   $(OPENSSL_PATH)/crypto/mem.c\r
@@ -525,7 +523,6 @@
   $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
   $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
   $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
   $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 03da26662757a00877b80aeec297cc1866761bea..d9782a3098a3f599c737fd60e180889d3cc34b93 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -294,8 +294,6 @@
   $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c\r
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c\r
   $(OPENSSL_PATH)/crypto/lhash/lhash.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c\r
-  $(OPENSSL_PATH)/crypto/md4/md4_one.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c\r
   $(OPENSSL_PATH)/crypto/md5/md5_one.c\r
   $(OPENSSL_PATH)/crypto/mem.c\r
@@ -525,7 +523,6 @@
   $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
   $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
   $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-  $(OPENSSL_PATH)/crypto/md4/md4_locl.h\r
   $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
   $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
   $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 4ba25da4073147d828515eea49b3108fc8f931ea..bd4a84da24409813b8eb04eaf5e7cc733fc1a924 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -73,6 +73,7 @@ BEGIN {
                 "no-gost",\r
                 "no-hw",\r
                 "no-idea",\r
+                "no-md4",\r
                 "no-mdc2",\r
                 "no-pic",\r
                 "no-ocb",\r