CryptoPkg: update openssl submodule to 1.1.1n

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

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 8c290caacf1bf2279f1f9258c2f352b9bcc0a507..cdeed0d073eb3816f28df8445eb06a98fd20c0c0 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -1,7 +1,8 @@
 ## @file\r
 #  This module provides OpenSSL Library implementation.\r
 #\r
-#  Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>\r
+#  (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
@@ -15,7 +16,7 @@
   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\r
+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_ASM\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64\r
@@ -23,11 +24,11 @@
 \r
 [Sources]\r
   $(OPENSSL_PATH)/e_os.h\r
+  $(OPENSSL_PATH)/ms/uplink.h\r
 # Autogenerated files list starts here\r
   $(OPENSSL_PATH)/crypto/aes/aes_cbc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_cfb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_core.c\r
-  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ige.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c\r
   $(OPENSSL_PATH)/crypto/aes/aes_ofb.c\r
@@ -176,25 +177,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
@@ -218,7 +200,6 @@
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c\r
   $(OPENSSL_PATH)/crypto/ebcdic.c\r
   $(OPENSSL_PATH)/crypto/err/err.c\r
-  $(OPENSSL_PATH)/crypto/err/err_all.c\r
   $(OPENSSL_PATH)/crypto/err/err_prn.c\r
   $(OPENSSL_PATH)/crypto/evp/bio_b64.c\r
   $(OPENSSL_PATH)/crypto/evp/bio_enc.c\r
@@ -293,8 +274,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
@@ -375,8 +354,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
@@ -494,23 +471,58 @@
   $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c\r
   $(OPENSSL_PATH)/crypto/x509v3/v3err.c\r
+  $(OPENSSL_PATH)/crypto/arm_arch.h\r
+  $(OPENSSL_PATH)/crypto/mips_arch.h\r
+  $(OPENSSL_PATH)/crypto/ppc_arch.h\r
+  $(OPENSSL_PATH)/crypto/s390x_arch.h\r
+  $(OPENSSL_PATH)/crypto/sparc_arch.h\r
+  $(OPENSSL_PATH)/crypto/vms_rms.h\r
+  $(OPENSSL_PATH)/crypto/aes/aes_local.h\r
+  $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
+  $(OPENSSL_PATH)/crypto/asn1/asn1_local.h\r
+  $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
+  $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
+  $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
+  $(OPENSSL_PATH)/crypto/async/async_local.h\r
+  $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
+  $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
+  $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
+  $(OPENSSL_PATH)/crypto/bio/bio_local.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_local.h\r
+  $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
+  $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
+  $(OPENSSL_PATH)/crypto/comp/comp_local.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
+  $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
+  $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
+  $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
+  $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
+  $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
+  $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
+  $(OPENSSL_PATH)/crypto/md5/md5_local.h\r
+  $(OPENSSL_PATH)/crypto/modes/modes_local.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_local.h\r
+  $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h\r
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h\r
+  $(OPENSSL_PATH)/crypto/rand/rand_local.h\r
+  $(OPENSSL_PATH)/crypto/rsa/rsa_local.h\r
+  $(OPENSSL_PATH)/crypto/sha/sha_local.h\r
+  $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
+  $(OPENSSL_PATH)/crypto/sm3/sm3_local.h\r
+  $(OPENSSL_PATH)/crypto/store/store_local.h\r
+  $(OPENSSL_PATH)/crypto/ui/ui_local.h\r
+  $(OPENSSL_PATH)/crypto/x509/x509_local.h\r
+  $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h\r
+  $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
+  $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
 # Autogenerated files list ends here\r
-\r
+  buildinf.h\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
@@ -518,7 +530,8 @@
 [LibraryClasses]\r
   BaseLib\r
   DebugLib\r
-  TimerLib\r
+  RngLib\r
+  PrintLib\r
 \r
 [LibraryClasses.ARM]\r
   ArmSoftFloatLib\r
@@ -557,7 +570,10 @@
   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:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable\r
+  GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
   GCC:*_CLANG38_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\r
+  GCC:*_CLANGPDB_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized -Wno-error=incompatible-pointer-types -Wno-error=pointer-sign -Wno-error=implicit-function-declaration -Wno-error=ignored-pragma-optimize\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
@@ -579,8 +595,8 @@
   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with\r
   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)\r
   RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) --library_interface=aeabi_clib99 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188,128,546,1,3017 -JCryptoPkg/Include\r
-  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
-  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w\r
+  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
+  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized\r
 \r
   #\r
   # AARCH64 uses strict alignment and avoids SIMD registers for code that may execute\r