## @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
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
$(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
$(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
$(OPENSSL_PATH)/crypto/asn1/x_algor.c\r
$(OPENSSL_PATH)/crypto/asn1/x_bignum.c\r
$(OPENSSL_PATH)/crypto/asn1/x_info.c\r
+ $(OPENSSL_PATH)/crypto/asn1/x_int64.c\r
$(OPENSSL_PATH)/crypto/asn1/x_long.c\r
$(OPENSSL_PATH)/crypto/asn1/x_pkey.c\r
$(OPENSSL_PATH)/crypto/asn1/x_sig.c\r
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(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
$(OPENSSL_PATH)/crypto/x509v3/v3err.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
# 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\r
- MSFT:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706\r
- MSFT:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706\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
- GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)\r
- GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -DNO_MSABI_VA_FUNCS\r
- GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)\r
- GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS)\r
- GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)\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 -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:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized\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
# 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
+ # with the MMU off. This involves SEC, PEI_CORE and PEIM modules as well as BASE\r
+ # libraries, given that they may be included into such modules.\r
+ # This library, even though of the BASE type, is never used in such cases, and\r
+ # avoiding the SIMD register file (which is shared with the FPU) prevents the\r
+ # compiler from successfully building some of the OpenSSL source files that\r
+ # use floating point types, so clear the flags here.\r
+ #\r
+ GCC:*_*_AARCH64_CC_XIPFLAGS ==\r
projects / mirror_edk2.git / blobdiff