CryptoPkg: Upgrade OpenSSL to 1.1.1b

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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 602953eefff7a889a54bf84b5a5e932d916444bd..39749518027c83e79063dc918c721b76bf30e251 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,14 +1,8 @@
 ## @file\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
-#  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution.  The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
@@ -21,10 +15,10 @@
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = OpensslLib\r
   DEFINE OPENSSL_PATH            = openssl\r
-  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNO_SYSLOG\r
+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE\r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64\r
+#  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64\r
 #\r
 \r
 [Sources]\r
@@ -38,6 +32,7 @@
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_wrap.c\r
+  $(OPENSSL_PATH)/crypto/aria/aria.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c\r
   $(OPENSSL_PATH)/crypto/asn1/a_digest.c\r
@@ -60,6 +55,7 @@
   $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_err.c\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c\r
+  $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.c\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c\r
   $(OPENSSL_PATH)/crypto/asn1/asn1_par.c\r
   $(OPENSSL_PATH)/crypto/asn1/asn_mime.c\r
@@ -175,8 +171,10 @@
   $(OPENSSL_PATH)/crypto/conf/conf_mall.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_mod.c\r
   $(OPENSSL_PATH)/crypto/conf/conf_sap.c\r
+  $(OPENSSL_PATH)/crypto/conf/conf_ssl.c\r
   $(OPENSSL_PATH)/crypto/cpt_err.c\r
   $(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
@@ -194,7 +192,6 @@
   $(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/rpc_enc.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
@@ -211,6 +208,7 @@
   $(OPENSSL_PATH)/crypto/dh/dh_pmeth.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_prn.c\r
   $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c\r
+  $(OPENSSL_PATH)/crypto/dh/dh_rfc7919.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c\r
   $(OPENSSL_PATH)/crypto/dso/dso_err.c\r
@@ -233,6 +231,7 @@
   $(OPENSSL_PATH)/crypto/evp/e_aes.c\r
   $(OPENSSL_PATH)/crypto/evp/e_aes_cbc_hmac_sha1.c\r
   $(OPENSSL_PATH)/crypto/evp/e_aes_cbc_hmac_sha256.c\r
+  $(OPENSSL_PATH)/crypto/evp/e_aria.c\r
   $(OPENSSL_PATH)/crypto/evp/e_bf.c\r
   $(OPENSSL_PATH)/crypto/evp/e_camellia.c\r
   $(OPENSSL_PATH)/crypto/evp/e_cast.c\r
@@ -247,6 +246,7 @@
   $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c\r
   $(OPENSSL_PATH)/crypto/evp/e_rc5.c\r
   $(OPENSSL_PATH)/crypto/evp/e_seed.c\r
+  $(OPENSSL_PATH)/crypto/evp/e_sm4.c\r
   $(OPENSSL_PATH)/crypto/evp/e_xcbc_d.c\r
   $(OPENSSL_PATH)/crypto/evp/encode.c\r
   $(OPENSSL_PATH)/crypto/evp/evp_cnf.c\r
@@ -264,6 +264,7 @@
   $(OPENSSL_PATH)/crypto/evp/m_null.c\r
   $(OPENSSL_PATH)/crypto/evp/m_ripemd.c\r
   $(OPENSSL_PATH)/crypto/evp/m_sha1.c\r
+  $(OPENSSL_PATH)/crypto/evp/m_sha3.c\r
   $(OPENSSL_PATH)/crypto/evp/m_sigver.c\r
   $(OPENSSL_PATH)/crypto/evp/m_wp.c\r
   $(OPENSSL_PATH)/crypto/evp/names.c\r
@@ -276,17 +277,19 @@
   $(OPENSSL_PATH)/crypto/evp/p_seal.c\r
   $(OPENSSL_PATH)/crypto/evp/p_sign.c\r
   $(OPENSSL_PATH)/crypto/evp/p_verify.c\r
+  $(OPENSSL_PATH)/crypto/evp/pbe_scrypt.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c\r
   $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c\r
-  $(OPENSSL_PATH)/crypto/evp/scrypt.c\r
   $(OPENSSL_PATH)/crypto/ex_data.c\r
+  $(OPENSSL_PATH)/crypto/getenv.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c\r
   $(OPENSSL_PATH)/crypto/hmac/hmac.c\r
   $(OPENSSL_PATH)/crypto/init.c\r
   $(OPENSSL_PATH)/crypto/kdf/hkdf.c\r
   $(OPENSSL_PATH)/crypto/kdf/kdf_err.c\r
+  $(OPENSSL_PATH)/crypto/kdf/scrypt.c\r
   $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c\r
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c\r
   $(OPENSSL_PATH)/crypto/lhash/lhash.c\r
@@ -364,14 +367,14 @@
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c\r
   $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c\r
-  $(OPENSSL_PATH)/crypto/rand/md_rand.c\r
+  $(OPENSSL_PATH)/crypto/rand/drbg_ctr.c\r
+  $(OPENSSL_PATH)/crypto/rand/drbg_lib.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_egd.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_err.c\r
   $(OPENSSL_PATH)/crypto/rand/rand_lib.c\r
   $(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/rand/randfile.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
@@ -383,8 +386,8 @@
   $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_meth.c\r
+  $(OPENSSL_PATH)/crypto/rsa/rsa_mp.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_none.c\r
-  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_ossl.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c\r
@@ -396,15 +399,27 @@
   $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c\r
   $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c\r
+  $(OPENSSL_PATH)/crypto/sha/keccak1600.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1_one.c\r
   $(OPENSSL_PATH)/crypto/sha/sha1dgst.c\r
   $(OPENSSL_PATH)/crypto/sha/sha256.c\r
   $(OPENSSL_PATH)/crypto/sha/sha512.c\r
+  $(OPENSSL_PATH)/crypto/siphash/siphash.c\r
+  $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c\r
+  $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c\r
+  $(OPENSSL_PATH)/crypto/sm3/m_sm3.c\r
+  $(OPENSSL_PATH)/crypto/sm3/sm3.c\r
+  $(OPENSSL_PATH)/crypto/sm4/sm4.c\r
   $(OPENSSL_PATH)/crypto/stack/stack.c\r
   $(OPENSSL_PATH)/crypto/threads_none.c\r
   $(OPENSSL_PATH)/crypto/threads_pthread.c\r
   $(OPENSSL_PATH)/crypto/threads_win.c\r
   $(OPENSSL_PATH)/crypto/txt_db/txt_db.c\r
+  $(OPENSSL_PATH)/crypto/ui/ui_err.c\r
+  $(OPENSSL_PATH)/crypto/ui/ui_lib.c\r
+  $(OPENSSL_PATH)/crypto/ui/ui_null.c\r
+  $(OPENSSL_PATH)/crypto/ui/ui_openssl.c\r
+  $(OPENSSL_PATH)/crypto/ui/ui_util.c\r
   $(OPENSSL_PATH)/crypto/uid.c\r
   $(OPENSSL_PATH)/crypto/x509/by_dir.c\r
   $(OPENSSL_PATH)/crypto/x509/by_file.c\r
@@ -418,6 +433,7 @@
   $(OPENSSL_PATH)/crypto/x509/x509_err.c\r
   $(OPENSSL_PATH)/crypto/x509/x509_ext.c\r
   $(OPENSSL_PATH)/crypto/x509/x509_lu.c\r
+  $(OPENSSL_PATH)/crypto/x509/x509_meth.c\r
   $(OPENSSL_PATH)/crypto/x509/x509_obj.c\r
   $(OPENSSL_PATH)/crypto/x509/x509_r2x.c\r
   $(OPENSSL_PATH)/crypto/x509/x509_req.c\r
@@ -448,6 +464,7 @@
   $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c\r
   $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c\r
+  $(OPENSSL_PATH)/crypto/x509v3/v3_admis.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c\r
@@ -482,12 +499,14 @@
   $(OPENSSL_PATH)/ssl/d1_msg.c\r
   $(OPENSSL_PATH)/ssl/d1_srtp.c\r
   $(OPENSSL_PATH)/ssl/methods.c\r
+  $(OPENSSL_PATH)/ssl/packet.c\r
   $(OPENSSL_PATH)/ssl/pqueue.c\r
   $(OPENSSL_PATH)/ssl/record/dtls1_bitmap.c\r
   $(OPENSSL_PATH)/ssl/record/rec_layer_d1.c\r
   $(OPENSSL_PATH)/ssl/record/rec_layer_s3.c\r
   $(OPENSSL_PATH)/ssl/record/ssl3_buffer.c\r
   $(OPENSSL_PATH)/ssl/record/ssl3_record.c\r
+  $(OPENSSL_PATH)/ssl/record/ssl3_record_tls13.c\r
   $(OPENSSL_PATH)/ssl/s3_cbc.c\r
   $(OPENSSL_PATH)/ssl/s3_enc.c\r
   $(OPENSSL_PATH)/ssl/s3_lib.c\r
@@ -505,25 +524,45 @@
   $(OPENSSL_PATH)/ssl/ssl_stat.c\r
   $(OPENSSL_PATH)/ssl/ssl_txt.c\r
   $(OPENSSL_PATH)/ssl/ssl_utst.c\r
+  $(OPENSSL_PATH)/ssl/statem/extensions.c\r
+  $(OPENSSL_PATH)/ssl/statem/extensions_clnt.c\r
+  $(OPENSSL_PATH)/ssl/statem/extensions_cust.c\r
+  $(OPENSSL_PATH)/ssl/statem/extensions_srvr.c\r
   $(OPENSSL_PATH)/ssl/statem/statem.c\r
   $(OPENSSL_PATH)/ssl/statem/statem_clnt.c\r
   $(OPENSSL_PATH)/ssl/statem/statem_dtls.c\r
   $(OPENSSL_PATH)/ssl/statem/statem_lib.c\r
   $(OPENSSL_PATH)/ssl/statem/statem_srvr.c\r
   $(OPENSSL_PATH)/ssl/t1_enc.c\r
-  $(OPENSSL_PATH)/ssl/t1_ext.c\r
   $(OPENSSL_PATH)/ssl/t1_lib.c\r
-  $(OPENSSL_PATH)/ssl/t1_reneg.c\r
   $(OPENSSL_PATH)/ssl/t1_trce.c\r
+  $(OPENSSL_PATH)/ssl/tls13_enc.c\r
   $(OPENSSL_PATH)/ssl/tls_srp.c\r
 # Autogenerated files list ends here\r
 \r
+  ossl_store.c\r
+  rand_pool.c\r
+\r
+[Sources.Ia32]\r
+  rand_pool_noise_tsc.c\r
+\r
+[Sources.X64]\r
+  rand_pool_noise_tsc.c\r
+\r
+[Sources.ARM]\r
+  rand_pool_noise.c\r
+\r
+[Sources.AARCH64]\r
+  rand_pool_noise.c\r
+\r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   CryptoPkg/CryptoPkg.dec\r
 \r
 [LibraryClasses]\r
+  BaseLib\r
   DebugLib\r
+  TimerLib\r
 \r
 [LibraryClasses.ARM]\r
   ArmSoftFloatLib\r
@@ -533,34 +572,36 @@
   # Disables the following Visual Studio compiler warnings brought by openssl source,\r
   # so we do not break the build with /WX option:\r
   #   C4090: 'function' : different 'const' qualifiers\r
+  #   C4132: 'object' : const object should be initialized (tls13_enc.c)\r
   #   C4244: conversion from type1 to type2, possible loss of data\r
   #   C4245: conversion from type1 to type2, signed/unsigned mismatch\r
   #   C4267: conversion from size_t to type, possible loss of data\r
   #   C4306: 'identifier' : conversion from 'type1' to 'type2' of greater size\r
+  #   C4310: cast truncates constant value\r
   #   C4389: 'operator' : signed/unsigned mismatch (xxxx)\r
+  #   C4700: uninitialized local variable 'name' used. (conf_sap.c(71))\r
   #   C4702: unreachable code\r
   #   C4706: assignment within conditional expression\r
   #   C4819: The file contains a character that cannot be represented in the current code page\r
   #\r
-  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706 /wd4819\r
-  MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819\r
-  MSFT:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4306 /wd4389 /wd4702 /wd4706 /wd4819\r
+  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819\r
+  MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819\r
 \r
   INTEL:*_*_IA32_CC_FLAGS  = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
   INTEL:*_*_X64_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
-  INTEL:*_*_IPF_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w\r
 \r
   #\r
   # Suppress the following build warnings in openssl so we don't break the build with -Werror\r
   #   -Werror=maybe-uninitialized: there exist some other paths for which the variable is not initialized.\r
   #   -Werror=format: Check calls to printf and scanf, etc., to make sure that the arguments supplied have\r
   #                   types appropriate to the format string specified.\r
+  #   -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration).\r
   #\r
-  GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized\r
-  GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -DNO_MSABI_VA_FUNCS\r
-  GCC:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format\r
-  GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS)\r
-  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=format\r
+  GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable\r
+  GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS\r
+  GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable\r
+  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
+  GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
 \r
   # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:\r
   # 1295: Deprecated declaration <entity> - give arg types\r