Re: [PATCH v1 1/9] CryptoPkg/OpensslLib: Update INF files to support OpenSSL-1.1.0xx build.

[Laszlo Ersek <lersek@redhat.com>]

On 03/21/17 16:56, Qin Long wrote:
> Update OpensslLib INF files to support OpenSSL-1.1.0xx source build.
> The file list was generated from the latest OpenSSL-1.1.0e release.
> 
> Main changes to support OpensslLib build in this patch include:
> 1. Use "openssl" instead of "openssl-x.x.xx" as main source directory,
>    Also update include path in CryptoPkg.dec
> 2. Enable warnings in GCC builds;
> 3. Update Visual Studio build options to silence current possible build
>    warnings.
> 4. Move the default opensslconf.h to Include/openssl, and add one dummy
>    dso_conf.h for native UEFI build.
> 
> The OpensslLib module build was validated as
>   build -t VSXXXX -a XX -p CryptoPkg/CryptoPkg.dsc
>         -m CryptoPkg/Library/OpensslLib/OpensslLib.inf
> 
> (NOTE: The extra build options for ARM/RVCT/XCODE were kept, which expect
>        further optimizations from community)
> 
> Cc: Ting Ye <ting.ye@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Gary Lin <glin@suse.com>
> Cc: Ronald Cron <ronald.cron@arm.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
> Signed-off-by: Qin Long <qin.long@intel.com>
> ---
>  CryptoPkg/.gitignore                              |   3 +-
>  CryptoPkg/CryptoPkg.dec                           |   8 +-
>  CryptoPkg/Include/OpenSslSupport.h                |   6 +
>  CryptoPkg/Include/internal/dso_conf.h             |   0
>  CryptoPkg/Include/openssl/opensslconf.h           | 314 ++++++++
>  CryptoPkg/Library/OpensslLib/OpensslLib.inf       | 866 +++++++++++-----------
>  CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 791 ++++++++++----------
>  7 files changed, 1146 insertions(+), 842 deletions(-)
>  create mode 100644 CryptoPkg/Include/internal/dso_conf.h
>  create mode 100644 CryptoPkg/Include/openssl/opensslconf.h

When I diff OpensslLibCrypto.inf and OpensslLib.inf and, I get:

> --- OpensslLibCrypto.inf	2017-03-22 13:00:16.986301008 +0100
> +++ OpensslLib.inf	2017-03-22 13:00:16.986301008 +0100
> @@ -14,9 +14,9 @@
>  
>  [Defines]
>    INF_VERSION                    = 0x00010005
> -  BASE_NAME                      = OpensslLibCrypto
> -  MODULE_UNI_FILE                = OpensslLibCrypto.uni
> -  FILE_GUID                      = E29FC209-8B64-4500-BD20-AF4EAE47EA0E
> +  BASE_NAME                      = OpensslLib
> +  MODULE_UNI_FILE                = OpensslLib.uni
> +  FILE_GUID                      = C873A7D0-9824-409f-9B42-2C158B992E69
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = OpensslLib

These differences are OK.

> @@ -476,6 +476,45 @@
>    $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3err.c
> +  $(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/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/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/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_ext.c
> +  $(OPENSSL_PATH)/ssl/t1_lib.c
> +  $(OPENSSL_PATH)/ssl/t1_reneg.c
> +  $(OPENSSL_PATH)/ssl/t1_trce.c
> +  $(OPENSSL_PATH)/ssl/tls_srp.c
>  # Autogenerated files list ends here
>  
>  [Packages]

Also OK.

> @@ -492,23 +531,25 @@
>    #
>    # 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
> -  # 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
> -  # C4389: 'operator' : signed/unsigned mismatch (xxxx)
> -  # C4702: unreachable code
> -  # C4706: assignment within conditional expression
> +  #   C4090: 'function' : different 'const' qualifiers
> +  #   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
> +  #   C4389: 'operator' : signed/unsigned mismatch (xxxx)
> +  #   C4702: unreachable code
> +  #   C4706: assignment within conditional expression

Different whitespace. These differences should not exist.

>    #
>    MSFT:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706
>    MSFT:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706
> +  MSFT:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4090 /wd4244 /wd4245 /wd4267 /wd4389 /wd4702 /wd4706

The IPF flags are inconsistent between the two INF files.

>  
> -  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:*_*_IPF_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) /w
> +  INTEL:*_*_X64_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w
> +  INTEL:*_*_IPF_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) /w

The whitespace is not in sync between the two INF files.

>  
>    GCC:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>    GCC:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -DNO_MSABI_VA_FUNCS
> +  GCC:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS)
>    GCC:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS)
>    GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)
>  

The IPF flags are inconsistent between the two INF files.

Thanks
Laszlo