CryptoPkg/OpensslLib: Set ARC4 disable in OpensslLib

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

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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 10710e4a7cd7bfef5b834972615cb700236ab7aa..dfaefd1c08f28e0eedfe7335a2724a9b9702cda4 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -374,8 +374,6 @@
   $(OPENSSL_PATH)/crypto/rand/rand_unix.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_vms.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_win.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c\r
@@ -531,7 +529,6 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
   $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
   $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
   $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index d9782a3098a3f599c737fd60e180889d3cc34b93..080e1d9305ba11ad47984be3865e53ba07ad30ee 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -374,8 +374,6 @@
   $(OPENSSL_PATH)/crypto/rand/rand_unix.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_vms.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_win.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c\r
@@ -531,7 +529,6 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
   $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
   $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-  $(OPENSSL_PATH)/crypto/rc4/rc4_locl.h\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
   $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
   $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index bd4a84da24409813b8eb04eaf5e7cc733fc1a924..254bc4dbcc5265f1718f91c4d1336cd966ef9e09 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -80,6 +80,7 @@ BEGIN {
                 "no-poly1305",\r
                 "no-posix-io",\r
                 "no-rc2",\r
+                "no-rc4",\r
                 "no-rfc3779",\r
                 "no-rmd160",\r
                 "no-scrypt",\r