CryptoPkg/Library/OpensslLib: Combine all performance optimized INFs

* Remove IA32/X64 specific INF files for performance
  optimized OpensslLib and combine into OpensslLibAccel.inf
  and OpensslLibFullAccel.inf.
* Remove use of PcdOpensslEcEnabled and let the platform
  select the EC feature by using either OpensslLibFull.inf
  or OpensslLibFullAccel.inf.
* With PcdOpensslEcEnabled removed, roll back style of opensslconf.h
  and remove  opensslconf_generated.h. Move the choice to disable
  EC/SM2 into OpensslLib INF files using OPENSSL_FLAGS define.
* Update OpensslLibContructor() API to be compatible with all
  FW phases by using types from Base.h and using RETURN_STATUS
  type and values instead of EFI_STATUS type and values.
* Add /wd4718 to VS2015x86 for IA32 and X64 to disable warning
  for recursive call with no side effects.  This is a false
  positive warning that is not produced with VS2017 or VS2019.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Christopher Zurcher <christopher.zurcher@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

1 files changed, 126 insertions, 64 deletions

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 195016fd3d..3e344f8515 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -1,5 +1,6 @@
 ## @file

-#  This module provides OpenSSL Library implementation.

+#  This module provides OpenSSL Library implementation with ECC and TLS

+#  features removed and features have performance optimizations enabled.

 #

 #  Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.<BR>

 #  (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>

@@ -16,14 +17,18 @@
   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

   LIBRARY_CLASS                  = OpensslLib

+  CONSTRUCTOR                    = OpensslLibConstructor

+

   DEFINE OPENSSL_PATH            = openssl

-  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_ASM

+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_TLS1_3 -DOPENSSL_NO_SM2 -DOPENSSL_NO_ASM

+  DEFINE OPENSSL_FLAGS_CONFIG    =

 

 #

 #  VALID_ARCHITECTURES           = IA32 X64 ARM AARCH64

 #

 

 [Sources]

+  OpensslLibConstructor.c

   $(OPENSSL_PATH)/e_os.h

   $(OPENSSL_PATH)/ms/uplink.h

 # Autogenerated files list starts here

@@ -200,43 +205,43 @@
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c

   $(OPENSSL_PATH)/crypto/dso/dso_win32.c

   $(OPENSSL_PATH)/crypto/ebcdic.c

-  $(OPENSSL_PATH)/crypto/ec/curve25519.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_check.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_curve.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_key.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_lib.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_mult.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ec_print.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/eck_prn.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

+#  $(OPENSSL_PATH)/crypto/ec/curve25519.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_tables.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/eddsa.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/f_generic.c

+#  $(OPENSSL_PATH)/crypto/ec/curve448/scalar.c

+#  $(OPENSSL_PATH)/crypto/ec/ec2_oct.c

+#  $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_ameth.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_asn1.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_check.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_curve.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_cvt.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_err.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_key.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_kmeth.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_lib.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_mult.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_oct.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c

+#  $(OPENSSL_PATH)/crypto/ec/ec_print.c

+#  $(OPENSSL_PATH)/crypto/ec/ecdh_kdf.c

+#  $(OPENSSL_PATH)/crypto/ec/ecdh_ossl.c

+#  $(OPENSSL_PATH)/crypto/ec/ecdsa_ossl.c

+#  $(OPENSSL_PATH)/crypto/ec/ecdsa_sign.c

+#  $(OPENSSL_PATH)/crypto/ec/ecdsa_vrf.c

+#  $(OPENSSL_PATH)/crypto/ec/eck_prn.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_mont.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_nist.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp224.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp256.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_nistp521.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_nistputil.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_oct.c

+#  $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c

+#  $(OPENSSL_PATH)/crypto/ec/ecx_meth.c

   $(OPENSSL_PATH)/crypto/err/err.c

   $(OPENSSL_PATH)/crypto/err/err_prn.c

   $(OPENSSL_PATH)/crypto/evp/bio_b64.c

@@ -422,10 +427,10 @@
   $(OPENSSL_PATH)/crypto/siphash/siphash.c

   $(OPENSSL_PATH)/crypto/siphash/siphash_ameth.c

   $(OPENSSL_PATH)/crypto/siphash/siphash_pmeth.c

-  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

+#  $(OPENSSL_PATH)/crypto/sm2/sm2_crypt.c

+#  $(OPENSSL_PATH)/crypto/sm2/sm2_err.c

+#  $(OPENSSL_PATH)/crypto/sm2/sm2_pmeth.c

+#  $(OPENSSL_PATH)/crypto/sm2/sm2_sign.c

   $(OPENSSL_PATH)/crypto/sm3/m_sm3.c

   $(OPENSSL_PATH)/crypto/sm3/sm3.c

   $(OPENSSL_PATH)/crypto/sm4/sm4.c

@@ -538,15 +543,15 @@
   $(OPENSSL_PATH)/crypto/conf/conf_local.h

   $(OPENSSL_PATH)/crypto/dh/dh_local.h

   $(OPENSSL_PATH)/crypto/dso/dso_local.h

-  $(OPENSSL_PATH)/crypto/ec/ec_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/field.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/word.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

-  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h      |*|*|*|gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled

+#  $(OPENSSL_PATH)/crypto/ec/ec_local.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448_local.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/curve448utils.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/ed448.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/field.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/point_448.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/word.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/arch_intrinsics.h

+#  $(OPENSSL_PATH)/crypto/ec/curve448/arch_32/f_impl.h

   $(OPENSSL_PATH)/crypto/evp/evp_local.h

   $(OPENSSL_PATH)/crypto/hmac/hmac_local.h

   $(OPENSSL_PATH)/crypto/lhash/lhash_local.h

@@ -569,6 +574,57 @@
   $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h

   $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h

   $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h

+#  $(OPENSSL_PATH)/ssl/bio_ssl.c

+#  $(OPENSSL_PATH)/ssl/d1_lib.c

+#  $(OPENSSL_PATH)/ssl/d1_msg.c

+#  $(OPENSSL_PATH)/ssl/d1_srtp.c

+#  $(OPENSSL_PATH)/ssl/methods.c

+#  $(OPENSSL_PATH)/ssl/packet.c

+#  $(OPENSSL_PATH)/ssl/pqueue.c

+#  $(OPENSSL_PATH)/ssl/record/dtls1_bitmap.c

+#  $(OPENSSL_PATH)/ssl/record/rec_layer_d1.c

+#  $(OPENSSL_PATH)/ssl/record/rec_layer_s3.c

+#  $(OPENSSL_PATH)/ssl/record/ssl3_buffer.c

+#  $(OPENSSL_PATH)/ssl/record/ssl3_record.c

+#  $(OPENSSL_PATH)/ssl/record/ssl3_record_tls13.c

+#  $(OPENSSL_PATH)/ssl/s3_cbc.c

+#  $(OPENSSL_PATH)/ssl/s3_enc.c

+#  $(OPENSSL_PATH)/ssl/s3_lib.c

+#  $(OPENSSL_PATH)/ssl/s3_msg.c

+#  $(OPENSSL_PATH)/ssl/ssl_asn1.c

+#  $(OPENSSL_PATH)/ssl/ssl_cert.c

+#  $(OPENSSL_PATH)/ssl/ssl_ciph.c

+#  $(OPENSSL_PATH)/ssl/ssl_conf.c

+#  $(OPENSSL_PATH)/ssl/ssl_err.c

+#  $(OPENSSL_PATH)/ssl/ssl_init.c

+#  $(OPENSSL_PATH)/ssl/ssl_lib.c

+#  $(OPENSSL_PATH)/ssl/ssl_mcnf.c

+#  $(OPENSSL_PATH)/ssl/ssl_rsa.c

+#  $(OPENSSL_PATH)/ssl/ssl_sess.c

+#  $(OPENSSL_PATH)/ssl/ssl_stat.c

+#  $(OPENSSL_PATH)/ssl/ssl_txt.c

+#  $(OPENSSL_PATH)/ssl/ssl_utst.c

+#  $(OPENSSL_PATH)/ssl/statem/extensions.c

+#  $(OPENSSL_PATH)/ssl/statem/extensions_clnt.c

+#  $(OPENSSL_PATH)/ssl/statem/extensions_cust.c

+#  $(OPENSSL_PATH)/ssl/statem/extensions_srvr.c

+#  $(OPENSSL_PATH)/ssl/statem/statem.c

+#  $(OPENSSL_PATH)/ssl/statem/statem_clnt.c

+#  $(OPENSSL_PATH)/ssl/statem/statem_dtls.c

+#  $(OPENSSL_PATH)/ssl/statem/statem_lib.c

+#  $(OPENSSL_PATH)/ssl/statem/statem_srvr.c

+#  $(OPENSSL_PATH)/ssl/t1_enc.c

+#  $(OPENSSL_PATH)/ssl/t1_lib.c

+#  $(OPENSSL_PATH)/ssl/t1_trce.c

+#  $(OPENSSL_PATH)/ssl/tls13_enc.c

+#  $(OPENSSL_PATH)/ssl/tls_srp.c

+#  $(OPENSSL_PATH)/ssl/packet_local.h

+#  $(OPENSSL_PATH)/ssl/ssl_cert_table.h

+#  $(OPENSSL_PATH)/ssl/ssl_local.h

+#  $(OPENSSL_PATH)/ssl/record/record.h

+#  $(OPENSSL_PATH)/ssl/record/record_local.h

+#  $(OPENSSL_PATH)/ssl/statem/statem.h

+#  $(OPENSSL_PATH)/ssl/statem/statem_local.h

 # Autogenerated files list ends here

   buildinf.h

   ossl_store.c

@@ -587,15 +643,13 @@
 [LibraryClasses.ARM]

   ArmSoftFloatLib

 

-[FixedPcd]

-  gEfiCryptoPkgTokenSpaceGuid.PcdOpensslEcEnabled      ## CONSUMES

-

 [BuildOptions]

   #

   # Disables the following Visual Studio compiler warnings brought by openssl source,

   # so we do not break the build with /WX option:

   #   C4090: 'function' : different 'const' qualifiers

   #   C4132: 'object' : const object should be initialized (tls13_enc.c)

+  #   C4210: nonstandard extension used: function given file scope

   #   C4244: conversion from type1 to type2, possible loss of data

   #   C4245: conversion from type1 to type2, signed/unsigned mismatch

   #   C4267: conversion from size_t to type, possible loss of data

@@ -607,11 +661,19 @@
   #   C4706: assignment within conditional expression

   #   C4819: The file contains a character that cannot be represented in the current code page

   #

-  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4132 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819

-  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

+  MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4310 /wd4389 /wd4700 /wd4702 /wd4706 /wd4819

+  MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /wd4090 /wd4132 /wd4210 /wd4244 /wd4245 /wd4267 /wd4306 /wd4310 /wd4700 /wd4389 /wd4702 /wd4706 /wd4819

+

+  #

+  # Disable following Visual Studio 2015 compiler warnings brought by openssl source,

+  # so we do not break the build with /WX option:

+  #   C4718: recursive call has no side effects, deleting

+  #

+  MSFT:*_VS2015x86_IA32_CC_FLAGS = /wd4718

+  MSFT:*_VS2015x86_X64_CC_FLAGS  = /wd4718

 

-  INTEL:*_*_IA32_CC_FLAGS  = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w

-  INTEL:*_*_X64_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w

+  INTEL:*_*_IA32_CC_FLAGS  = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /w

+  INTEL:*_*_X64_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) /w

 

   #

   # Suppress the following build warnings in openssl so we don't break the build with -Werror

@@ -620,10 +682,10 @@
   #                   types appropriate to the format string specified.

   #   -Werror=unused-but-set-variable: Warn whenever a local variable is assigned to, but otherwise unused (aside from its declaration).

   #

-  GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable

-  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

+  GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable

+  GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -DNO_MSABI_VA_FUNCS

   GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable

-  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable

+  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable -Wno-error=format

   GCC:*_*_RISCV64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable

   GCC:*_*_LOONGARCH64_CC_FLAGS = $(OPENSSL_FLAGS) -Wno-error=maybe-uninitialized -Wno-format -Wno-error=unused-but-set-variable

   GCC:*_CLANG35_*_CC_FLAGS = -std=c99 -Wno-error=uninitialized

@@ -649,8 +711,8 @@
   #    1: ignore "#1-D: last line of file ends without a newline"

   # 3017: <entity> may be used before being set (NOTE: This was fixed in OpenSSL 1.1 HEAD with

   #       commit d9b8b89bec4480de3a10bdaf9425db371c19145b, and can be dropped then.)

-  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

-  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -std=c99 -Wno-error=uninitialized

+  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -w -std=c99 -Wno-error=uninitialized

+  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_FLAGS_CONFIG) -w -std=c99 -Wno-error=uninitialized

 

   #

   # AARCH64 uses strict alignment and avoids SIMD registers for code that may execute