CryptoPkg/OpensslLib: refresh OpensslLib.inf, opensslconf.h after 32387e00

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / OpensslLib.inf

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index a9e793a940d8f578c013fbd472bee1bdbd353c3f..42f523a611e56083a3c9524c0d473b937fbfda8a 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -20,7 +20,7 @@
   MODULE_TYPE                    = BASE\r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = OpensslLib\r
-  DEFINE OPENSSL_PATH            = openssl-1.0.2h\r
+  DEFINE OPENSSL_PATH            = openssl-1.0.2j\r
   DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE\r
 \r
 #\r
@@ -470,9 +470,60 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c\r
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c\r
   $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c\r
+  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c\r
   $(OPENSSL_PATH)/crypto/cmac/cmac.c\r
   $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c\r
   $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c\r
+  $(OPENSSL_PATH)/ssl/s2_meth.c\r
+  $(OPENSSL_PATH)/ssl/s2_srvr.c\r
+  $(OPENSSL_PATH)/ssl/s2_clnt.c\r
+  $(OPENSSL_PATH)/ssl/s2_lib.c\r
+  $(OPENSSL_PATH)/ssl/s2_enc.c\r
+  $(OPENSSL_PATH)/ssl/s2_pkt.c\r
+  $(OPENSSL_PATH)/ssl/s3_meth.c\r
+  $(OPENSSL_PATH)/ssl/s3_srvr.c\r
+  $(OPENSSL_PATH)/ssl/s3_clnt.c\r
+  $(OPENSSL_PATH)/ssl/s3_lib.c\r
+  $(OPENSSL_PATH)/ssl/s3_enc.c\r
+  $(OPENSSL_PATH)/ssl/s3_pkt.c\r
+  $(OPENSSL_PATH)/ssl/s3_both.c\r
+  $(OPENSSL_PATH)/ssl/s3_cbc.c\r
+  $(OPENSSL_PATH)/ssl/s23_meth.c\r
+  $(OPENSSL_PATH)/ssl/s23_srvr.c\r
+  $(OPENSSL_PATH)/ssl/s23_clnt.c\r
+  $(OPENSSL_PATH)/ssl/s23_lib.c\r
+  $(OPENSSL_PATH)/ssl/s23_pkt.c\r
+  $(OPENSSL_PATH)/ssl/t1_meth.c\r
+  $(OPENSSL_PATH)/ssl/t1_srvr.c\r
+  $(OPENSSL_PATH)/ssl/t1_clnt.c\r
+  $(OPENSSL_PATH)/ssl/t1_lib.c\r
+  $(OPENSSL_PATH)/ssl/t1_enc.c\r
+  $(OPENSSL_PATH)/ssl/t1_ext.c\r
+  $(OPENSSL_PATH)/ssl/d1_meth.c\r
+  $(OPENSSL_PATH)/ssl/d1_srvr.c\r
+  $(OPENSSL_PATH)/ssl/d1_clnt.c\r
+  $(OPENSSL_PATH)/ssl/d1_lib.c\r
+  $(OPENSSL_PATH)/ssl/d1_pkt.c\r
+  $(OPENSSL_PATH)/ssl/d1_both.c\r
+  $(OPENSSL_PATH)/ssl/d1_srtp.c\r
+  $(OPENSSL_PATH)/ssl/ssl_lib.c\r
+  $(OPENSSL_PATH)/ssl/ssl_err2.c\r
+  $(OPENSSL_PATH)/ssl/ssl_cert.c\r
+  $(OPENSSL_PATH)/ssl/ssl_sess.c\r
+  $(OPENSSL_PATH)/ssl/ssl_ciph.c\r
+  $(OPENSSL_PATH)/ssl/ssl_stat.c\r
+  $(OPENSSL_PATH)/ssl/ssl_rsa.c\r
+  $(OPENSSL_PATH)/ssl/ssl_asn1.c\r
+  $(OPENSSL_PATH)/ssl/ssl_txt.c\r
+  $(OPENSSL_PATH)/ssl/ssl_algs.c\r
+  $(OPENSSL_PATH)/ssl/ssl_conf.c\r
+  $(OPENSSL_PATH)/ssl/bio_ssl.c\r
+  $(OPENSSL_PATH)/ssl/ssl_err.c\r
+  $(OPENSSL_PATH)/ssl/kssl.c\r
+  $(OPENSSL_PATH)/ssl/t1_reneg.c\r
+  $(OPENSSL_PATH)/ssl/tls_srp.c\r
+  $(OPENSSL_PATH)/ssl/t1_trce.c\r
+  $(OPENSSL_PATH)/ssl/ssl_utst.c\r
 \r
 # Autogenerated files list ends here\r
 \r
@@ -500,7 +551,7 @@
   # C4702: Potentially uninitialized local variable name used\r
   # C4311: pointer truncation from 'type' to 'type'\r
   #\r
-  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4701 /wd4702 /wd4706\r
+  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4245 /wd4701 /wd4702 /wd4706\r
   MSFT:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706 /wd4311\r
   MSFT:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706\r
 \r
@@ -509,7 +560,7 @@
   INTEL:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
 \r
   GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
-  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -UNO_BUILTIN_VA_FUNCS -DNO_MSABI_VA_FUNCS\r
+  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_VA_FUNCS\r
   GCC:*_*_IPF_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
   GCC:*_*_ARM_CC_FLAGS      = $(OPENSSL_FLAGS) -w\r
   GCC:*_*_AARCH64_CC_FLAGS  = $(OPENSSL_FLAGS) -w\r