X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FOpensslLib%2FOpensslLib.inf;h=ff81460d03290741af5de7bfd7dcc83aae060317;hp=03f6c4f699a046726d0baccfbedb828d402cb7e3;hb=8ff7187cfd998d2b6db43075a4a7908281b6da00;hpb=3b21958bf2a3eca22a0e3af4001df441a317f24a

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 03f6c4f699..ff81460d03 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  This module provides openSSL Library implementation.
 #
-#  Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -20,36 +20,8 @@
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = OpensslLib
-  DEFINE OPENSSL_PATH            = openssl-1.0.2d
-  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_POSIX_IO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_ASM
-  DEFINE OPENSSL_EXFLAGS         = -DOPENSSL_SMALL_FOOTPRINT -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_RIPEMD -DOPENSSL_NO_RC2 -DOPENSSL_NO_IDEA -DOPENSSL_NO_BF -DOPENSSL_NO_CAST -DOPENSSL_NO_WHIRLPOOL -DOPENSSL_NO_DSA -DOPENSSL_NO_EC -DOPENSSL_NO_ECDH -DOPENSSL_NO_ECDSA -DOPENSSL_NO_SRP -DOPENSSL_NO_ENGINE
-
-#
-# OPENSSL_FLAGS is set to define the following flags to be compatible with
-# EDK II build system and UEFI executiuon environment
-#
-#   OPENSSL_SYS_UEFI
-#   L_ENDIAN
-#   _CRT_SECURE_NO_DEPRECATE
-#   _CRT_NONSTDC_NO_DEPRECATE
-#   OPENSSL_NO_CAMELLIA
-#   OPENSSL_NO_SEED
-#   OPENSSL_NO_RC5
-#   OPENSSL_NO_MDC2
-#   OPENSSL_NO_SOCK
-#   OPENSSL_NO_CMS
-#   OPENSSL_NO_JPAKE
-#   OPENSSL_NO_CAPIENG
-#   OPENSSL_NO_ERR
-#   OPENSSL_NO_KRB5
-#   OPENSSL_NO_DYNAMIC_ENGINE
-#   GETPID_IS_MEANINGLESS
-#   OPENSSL_NO_STDIO
-#   OPENSSL_NO_POSIX_IO
-#   OPENSSL_NO_FP_API
-#   OPENSSL_NO_DGRAM
-#   OPENSSL_NO_ASM
-#
+  DEFINE OPENSSL_PATH            = openssl-1.0.2h
+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64
@@ -57,6 +29,7 @@
 
 [Sources]
   $(OPENSSL_PATH)/e_os.h
+# Autogenerated files list starts here
   $(OPENSSL_PATH)/crypto/cryptlib.c
   $(OPENSSL_PATH)/crypto/mem.c
   $(OPENSSL_PATH)/crypto/mem_clr.c
@@ -72,66 +45,24 @@
   $(OPENSSL_PATH)/crypto/o_fips.c
   $(OPENSSL_PATH)/crypto/o_init.c
   $(OPENSSL_PATH)/crypto/fips_ers.c
-
-  #
-  # OBJECTS
-  #
   $(OPENSSL_PATH)/crypto/objects/o_names.c
   $(OPENSSL_PATH)/crypto/objects/obj_dat.c
   $(OPENSSL_PATH)/crypto/objects/obj_lib.c
   $(OPENSSL_PATH)/crypto/objects/obj_err.c
   $(OPENSSL_PATH)/crypto/objects/obj_xref.c
-
-  #
-  # MD4
-  #
   $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
   $(OPENSSL_PATH)/crypto/md4/md4_one.c
-
-  #
-  # MD5
-  #
   $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
   $(OPENSSL_PATH)/crypto/md5/md5_one.c
-
-  #
-  # SHA
-  #
   $(OPENSSL_PATH)/crypto/sha/sha_dgst.c
   $(OPENSSL_PATH)/crypto/sha/sha1dgst.c
   $(OPENSSL_PATH)/crypto/sha/sha_one.c
   $(OPENSSL_PATH)/crypto/sha/sha1_one.c
   $(OPENSSL_PATH)/crypto/sha/sha256.c
   $(OPENSSL_PATH)/crypto/sha/sha512.c
-
-  #
-  # MDC2 - Disabled by OPENSSL_NO_MDC2
-  #
-  # $(OPENSSL_PATH)/crypto/mdc2/mdc2dgst.c
-  # $(OPENSSL_PATH)/crypto/mdc2/mdc2_one.c
-
-  #
-  # HMAC
-  #
   $(OPENSSL_PATH)/crypto/hmac/hmac.c
   $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
   $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
-
-  #
-  # RIPEMD - Disabled by OPENSSL_NO_RIPEMD
-  #
-  # $(OPENSSL_PATH)/crypto/ripemd/rmd_dgst.c
-  # $(OPENSSL_PATH)/crypto/ripemd/rmd_one.c
-
-  #
-  # WHIRLPOOL - Disabled by OPENSSL_NO_WHIRLPOOL
-  #
-  # $(OPENSSL_PATH)/crypto/whrlpool/wp_dgst.c
-  # $(OPENSSL_PATH)/crypto/whrlpool/wp_block.c
-
-  #
-  # DES
-  #
   $(OPENSSL_PATH)/crypto/des/cbc_cksm.c
   $(OPENSSL_PATH)/crypto/des/cbc_enc.c
   $(OPENSSL_PATH)/crypto/des/cfb64enc.c
@@ -158,10 +89,6 @@
   $(OPENSSL_PATH)/crypto/des/des_old.c
   $(OPENSSL_PATH)/crypto/des/des_old2.c
   $(OPENSSL_PATH)/crypto/des/read2pwd.c
-
-  #
-  # AES
-  #
   $(OPENSSL_PATH)/crypto/aes/aes_core.c
   $(OPENSSL_PATH)/crypto/aes/aes_misc.c
   $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
@@ -171,83 +98,9 @@
   $(OPENSSL_PATH)/crypto/aes/aes_ctr.c
   $(OPENSSL_PATH)/crypto/aes/aes_ige.c
   $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
-
-  #
-  # RC2 - Disabled by OPENSSL_NO_RC2
-  #
-  # $(OPENSSL_PATH)/crypto/rc2/rc2_ecb.c
-  # $(OPENSSL_PATH)/crypto/rc2/rc2_skey.c
-  # $(OPENSSL_PATH)/crypto/rc2/rc2_cbc.c
-  # $(OPENSSL_PATH)/crypto/rc2/rc2cfb64.c
-  # $(OPENSSL_PATH)/crypto/rc2/rc2ofb64.c
-
-  #
-  # RC4
-  #
   $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
   $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
   $(OPENSSL_PATH)/crypto/rc4/rc4_utl.c
-
-  #
-  # RC5 - Disabled by OPENSSL_NO_RC5
-  #
-  # $(OPENSSL_PATH)/crypto/rc5/rc5_skey.c
-  # $(OPENSSL_PATH)/crypto/rc5/rc5_ecb.c
-  # $(OPENSSL_PATH)/crypto/rc5/rc5_enc.c
-  # $(OPENSSL_PATH)/crypto/rc5/rc5cfb64.c
-  # $(OPENSSL_PATH)/crypto/rc5/rc5ofb64.c
-
-  #
-  # IDEA - Disabled by OPENSSL_NO_IDEA
-  #
-  # $(OPENSSL_PATH)/crypto/idea/i_cbc.c
-  # $(OPENSSL_PATH)/crypto/idea/i_cfb64.c
-  # $(OPENSSL_PATH)/crypto/idea/i_ofb64.c
-  # $(OPENSSL_PATH)/crypto/idea/i_ecb.c
-  # $(OPENSSL_PATH)/crypto/idea/i_skey.c
-
-  #
-  # BLOWFISH - Disabled by OPENSSL_NO_BF
-  #
-  # $(OPENSSL_PATH)/crypto/bf/bf_skey.c
-  # $(OPENSSL_PATH)/crypto/bf/bf_ecb.c
-  # $(OPENSSL_PATH)/crypto/bf/bf_enc.c
-  # $(OPENSSL_PATH)/crypto/bf/bf_cfb64.c
-  # $(OPENSSL_PATH)/crypto/bf/bf_ofb64.c
-
-  #
-  # CAST - Disabled by OPENSSL_NO_CAST
-  #
-  # $(OPENSSL_PATH)/crypto/cast/c_skey.c
-  # $(OPENSSL_PATH)/crypto/cast/c_ecb.c
-  # $(OPENSSL_PATH)/crypto/cast/c_enc.c
-  # $(OPENSSL_PATH)/crypto/cast/c_cfb64.c
-  # $(OPENSSL_PATH)/crypto/cast/c_ofb64.c
-
-  #
-  # CAMELLIA - Disabled by OPENSSL_NO_CAMELLIA
-  #
-  # $(OPENSSL_PATH)/crypto/camellia/camellia.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_misc.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_ecb.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_cbc.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_ofb.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_cfb.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_ctr.c
-  # $(OPENSSL_PATH)/crypto/camellia/cmll_utl.c
-
-  #
-  # SEED - Disabled by OPENSSL_NO_SEED
-  #
-  # $(OPENSSL_PATH)/crypto/seed/seed.c
-  # $(OPENSSL_PATH)/crypto/seed/seed_ecb.c
-  # $(OPENSSL_PATH)/crypto/seed/seed_cbc.c
-  # $(OPENSSL_PATH)/crypto/seed/seed_cfb.c
-  # $(OPENSSL_PATH)/crypto/seed/seed_ofb.c
-
-  #
-  # MODES
-  #
   $(OPENSSL_PATH)/crypto/modes/cbc128.c
   $(OPENSSL_PATH)/crypto/modes/ctr128.c
   $(OPENSSL_PATH)/crypto/modes/cts128.c
@@ -257,10 +110,6 @@
   $(OPENSSL_PATH)/crypto/modes/ccm128.c
   $(OPENSSL_PATH)/crypto/modes/xts128.c
   $(OPENSSL_PATH)/crypto/modes/wrap128.c
-
-  #
-  # BIGNUM
-  #
   $(OPENSSL_PATH)/crypto/bn/bn_add.c
   $(OPENSSL_PATH)/crypto/bn/bn_div.c
   $(OPENSSL_PATH)/crypto/bn/bn_exp.c
@@ -289,38 +138,6 @@
   $(OPENSSL_PATH)/crypto/bn/bn_depr.c
   $(OPENSSL_PATH)/crypto/bn/bn_const.c
   $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
-
-  #
-  # ELLIPTIC CURVE - Disabled by OPENSSL_NO_EC
-  #
-  # $(OPENSSL_PATH)/crypto/ec/ec_lib.c
-  # $(OPENSSL_PATH)/crypto/ec/ecp_smpl.c
-  # $(OPENSSL_PATH)/crypto/ec/ecp_mont.c
-  # $(OPENSSL_PATH)/crypto/ec/ecp_nist.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_cvt.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_mult.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_err.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_curve.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_check.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_print.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_asn1.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_key.c
-  # $(OPENSSL_PATH)/crypto/ec/ec2_smpl.c
-  # $(OPENSSL_PATH)/crypto/ec/ec2_mult.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_ameth.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_pmeth.c
-  # $(OPENSSL_PATH)/crypto/ec/eck_prn.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/ec2_oct.c
-  # $(OPENSSL_PATH)/crypto/ec/ec_oct.c
-
-  #
-  # RSA
-  #
   $(OPENSSL_PATH)/crypto/rsa/rsa_eay.c
   $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
   $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
@@ -341,36 +158,6 @@
   $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
   $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
   $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
-
-  #
-  # DSA - Disabled by OPENSSL_NO_DSA
-  #
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_gen.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_key.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_lib.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_asn1.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_vrf.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_sign.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_err.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_ossl.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_depr.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_ameth.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_pmeth.c
-  # $(OPENSSL_PATH)/crypto/dsa/dsa_prn.c
-
-  #
-  # ECDSA - Disabled by OPENSSL_NO_ECDSA
-  #
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_lib.c
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_asn1.c
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_ossl.c
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_sign.c
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_vrf.c
-  # $(OPENSSL_PATH)/crypto/ecdsa/ecs_err.c
-
-  #
-  # DIFFIE-HELLMAN
-  #
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c
   $(OPENSSL_PATH)/crypto/dh/dh_gen.c
   $(OPENSSL_PATH)/crypto/dh/dh_key.c
@@ -382,20 +169,7 @@
   $(OPENSSL_PATH)/crypto/dh/dh_pmeth.c
   $(OPENSSL_PATH)/crypto/dh/dh_prn.c
   $(OPENSSL_PATH)/crypto/dh/dh_rfc5114.c
-  # $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
-
-  #
-  # ECDH - Disabled by OPENSSL_NO_ECDH
-  #
-  # $(OPENSSL_PATH)/crypto/ecdh/ech_lib.c
-  # $(OPENSSL_PATH)/crypto/ecdh/ech_ossl.c
-  # $(OPENSSL_PATH)/crypto/ecdh/ech_key.c
-  # $(OPENSSL_PATH)/crypto/ecdh/ech_err.c
-  # $(OPENSSL_PATH)/crypto/ecdh/ech_kdf.c
-
-  #
-  # DSO
-  #
+  $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
   $(OPENSSL_PATH)/crypto/dso/dso_err.c
@@ -405,46 +179,9 @@
   $(OPENSSL_PATH)/crypto/dso/dso_win32.c
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c
   $(OPENSSL_PATH)/crypto/dso/dso_beos.c
-
-  #
-  # ENGINE - Disabled by OPENSSL_NO_ENGINE
-  #
-  # $(OPENSSL_PATH)/crypto/engine/eng_err.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_lib.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_list.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_init.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_ctrl.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_table.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_pkey.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_fat.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_all.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_rsa.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_dsa.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_ecdsa.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_dh.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_ecdh.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_rand.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_store.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_cipher.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_digest.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_pkmeth.c
-  # $(OPENSSL_PATH)/crypto/engine/tb_asnmth.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_openssl.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_cnf.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_dyn.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_cryptodev.c
-  # $(OPENSSL_PATH)/crypto/engine/eng_rdrand.c
-
-  #
-  # BUFFER
-  #
   $(OPENSSL_PATH)/crypto/buffer/buffer.c
   $(OPENSSL_PATH)/crypto/buffer/buf_str.c
   $(OPENSSL_PATH)/crypto/buffer/buf_err.c
-
-  #
-  # BIO
-  #
   $(OPENSSL_PATH)/crypto/bio/bio_lib.c
   $(OPENSSL_PATH)/crypto/bio/bio_cb.c
   $(OPENSSL_PATH)/crypto/bio/bio_err.c
@@ -456,10 +193,6 @@
   $(OPENSSL_PATH)/crypto/bio/bss_conn.c
   $(OPENSSL_PATH)/crypto/bio/bf_null.c
   $(OPENSSL_PATH)/crypto/bio/bf_buff.c
-  #
-  # Not Required by UEFI.
-  #
-  # $(OPENSSL_PATH)/crypto/bio/b_print.c
   $(OPENSSL_PATH)/crypto/bio/b_dump.c
   $(OPENSSL_PATH)/crypto/bio/b_sock.c
   $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
@@ -467,41 +200,21 @@
   $(OPENSSL_PATH)/crypto/bio/bss_log.c
   $(OPENSSL_PATH)/crypto/bio/bss_bio.c
   $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
-
-  #
-  # STACK
-  #
   $(OPENSSL_PATH)/crypto/stack/stack.c
-
-  #
-  # LHASH
-  #
   $(OPENSSL_PATH)/crypto/lhash/lhash.c
   $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
-
-  #
-  # RAND
-  #
   $(OPENSSL_PATH)/crypto/rand/md_rand.c
   $(OPENSSL_PATH)/crypto/rand/randfile.c
   $(OPENSSL_PATH)/crypto/rand/rand_lib.c
   $(OPENSSL_PATH)/crypto/rand/rand_err.c
-  # $(OPENSSL_PATH)/crypto/rand/rand_egd.c
-  # $(OPENSSL_PATH)/crypto/rand/rand_win.c
+  $(OPENSSL_PATH)/crypto/rand/rand_egd.c
+  $(OPENSSL_PATH)/crypto/rand/rand_win.c
   $(OPENSSL_PATH)/crypto/rand/rand_unix.c
-  # $(OPENSSL_PATH)/crypto/rand/rand_os2.c
-  # $(OPENSSL_PATH)/crypto/rand/rand_nw.c
-
-  #
-  # ERR
-  #
+  $(OPENSSL_PATH)/crypto/rand/rand_os2.c
+  $(OPENSSL_PATH)/crypto/rand/rand_nw.c
   $(OPENSSL_PATH)/crypto/err/err.c
   $(OPENSSL_PATH)/crypto/err/err_all.c
   $(OPENSSL_PATH)/crypto/err/err_prn.c
-
-  #
-  # EVP
-  #
   $(OPENSSL_PATH)/crypto/evp/encode.c
   $(OPENSSL_PATH)/crypto/evp/digest.c
   $(OPENSSL_PATH)/crypto/evp/evp_enc.c
@@ -562,10 +275,6 @@
   $(OPENSSL_PATH)/crypto/evp/e_aes_cbc_hmac_sha1.c
   $(OPENSSL_PATH)/crypto/evp/e_aes_cbc_hmac_sha256.c
   $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c
-
-  #
-  # ASN1
-  #
   $(OPENSSL_PATH)/crypto/asn1/a_object.c
   $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
   $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
@@ -643,10 +352,6 @@
   $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
   $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
   $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
-
-  #
-  # PEM
-  #
   $(OPENSSL_PATH)/crypto/pem/pem_sign.c
   $(OPENSSL_PATH)/crypto/pem/pem_seal.c
   $(OPENSSL_PATH)/crypto/pem/pem_info.c
@@ -659,10 +364,6 @@
   $(OPENSSL_PATH)/crypto/pem/pem_pk8.c
   $(OPENSSL_PATH)/crypto/pem/pem_pkey.c
   $(OPENSSL_PATH)/crypto/pem/pvkfmt.c
-
-  #
-  # X509
-  #
   $(OPENSSL_PATH)/crypto/x509/x509_def.c
   $(OPENSSL_PATH)/crypto/x509/x509_d2.c
   $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
@@ -684,16 +385,9 @@
   $(OPENSSL_PATH)/crypto/x509/x_all.c
   $(OPENSSL_PATH)/crypto/x509/x509_txt.c
   $(OPENSSL_PATH)/crypto/x509/x509_trs.c
-  #
-  #  Not Required by UEFI.
-  #
-  # $(OPENSSL_PATH)/crypto/x509/by_file.c
-  # $(OPENSSL_PATH)/crypto/x509/by_dir.c
+  $(OPENSSL_PATH)/crypto/x509/by_file.c
+  $(OPENSSL_PATH)/crypto/x509/by_dir.c
   $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
-
-  #
-  # X509v3
-  #
   $(OPENSSL_PATH)/crypto/x509v3/v3_bcons.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_bitst.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_conf.c
@@ -730,14 +424,7 @@
   $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
-  #
-  #  Not Required by UEFI.
-  #
-  # $(OPENSSL_PATH)/crypto/x509v3/v3_scts.c
-
-  #
-  # CONF
-  #
+  $(OPENSSL_PATH)/crypto/x509v3/v3_scts.c
   $(OPENSSL_PATH)/crypto/conf/conf_err.c
   $(OPENSSL_PATH)/crypto/conf/conf_lib.c
   $(OPENSSL_PATH)/crypto/conf/conf_api.c
@@ -745,15 +432,7 @@
   $(OPENSSL_PATH)/crypto/conf/conf_mod.c
   $(OPENSSL_PATH)/crypto/conf/conf_mall.c
   $(OPENSSL_PATH)/crypto/conf/conf_sap.c
-
-  #
-  # TXT_DB
-  #
   $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
-
-  #
-  # PKCS7
-  #
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
   $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
@@ -762,10 +441,6 @@
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
   $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
   $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
-
-  #
-  # PKCS12
-  #
   $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
   $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
   $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
@@ -781,18 +456,10 @@
   $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
   $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
   $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
-
-  #
-  # COMP
-  #
   $(OPENSSL_PATH)/crypto/comp/comp_lib.c
   $(OPENSSL_PATH)/crypto/comp/comp_err.c
   $(OPENSSL_PATH)/crypto/comp/c_rle.c
   $(OPENSSL_PATH)/crypto/comp/c_zlib.c
-
-  #
-  # OCSP - Disabled by OPENSSL_NO_OCSP
-  #
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
@@ -802,75 +469,13 @@
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
   $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
-
-  #
-  # UI
-  #
-  $(OPENSSL_PATH)/crypto/ui/ui_lib.c
-  #
-  #  Not Required by UEFI.
-  #
-  # $(OPENSSL_PATH)/crypto/ui/ui_err.c
-  # $(OPENSSL_PATH)/crypto/ui/ui_openssl.c
-  $(OPENSSL_PATH)/crypto/ui/ui_util.c
-  $(OPENSSL_PATH)/crypto/ui/ui_compat.c
-
-  #
-  # KRB5
-  #
   $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c
-
-  #
-  # CMS - Disabled by OPENSSL_NO_CMS
-  #
-  # $(OPENSSL_PATH)/crypto/cms/cms_lib.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_asn1.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_att.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_io.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_smime.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_err.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_sd.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_dd.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_cd.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_env.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_enc.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_ess.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_pwri.c
-  # $(OPENSSL_PATH)/crypto/cms/cms_kari.c
-
-  #
-  # PQUEUE
-  #
-  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
-
-  #
-  # TS
-  #
-  $(OPENSSL_PATH)/crypto/ts/ts_err.c
-  $(OPENSSL_PATH)/crypto/ts/ts_req_utils.c
-  $(OPENSSL_PATH)/crypto/ts/ts_req_print.c
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_utils.c
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_print.c
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_sign.c
-  $(OPENSSL_PATH)/crypto/ts/ts_rsp_verify.c
-  $(OPENSSL_PATH)/crypto/ts/ts_verify_ctx.c
-  $(OPENSSL_PATH)/crypto/ts/ts_lib.c
-  $(OPENSSL_PATH)/crypto/ts/ts_conf.c
-  $(OPENSSL_PATH)/crypto/ts/ts_asn1.c
-
-  #
-  # SRP - Disabled by OPENSSL_NO_SRP
-  #
-  # $(OPENSSL_PATH)/crypto/srp/srp_lib.c
-  # $(OPENSSL_PATH)/crypto/srp/srp_vfy.c
-
-  #
-  # CMAS
-  #
   $(OPENSSL_PATH)/crypto/cmac/cmac.c
   $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
   $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
 
+# Autogenerated files list ends here
+
 [Packages]
   MdePkg/MdePkg.dec
   CryptoPkg/CryptoPkg.dec
@@ -878,6 +483,9 @@
 [LibraryClasses]
   DebugLib
 
+[LibraryClasses.ARM]
+  ArmSoftFloatLib
+
 [BuildOptions]
   #
   # Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
@@ -890,20 +498,21 @@
   # C4305: truncation from type1 to type2 of smaller size
   # C4306: conversion from type1 to type2 of greater size
   # C4702: Potentially uninitialized local variable name used
+  # C4311: pointer truncation from 'type' to 'type'
   #
-  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /wd4244 /wd4701 /wd4702 /wd4706
-  MSFT:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
-  MSFT:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
+  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4701 /wd4702 /wd4706
+  MSFT:*_*_X64_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706 /wd4311
+  MSFT:*_*_IPF_CC_FLAGS     = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4133 /wd4244 /wd4245 /wd4267 /wd4701 /wd4305 /wd4306 /wd4702 /wd4706
 
-  INTEL:*_*_IA32_CC_FLAGS   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w
-  INTEL:*_*_X64_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w
-  INTEL:*_*_IPF_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /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
 
-  GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
-  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -UNO_BUILTIN_VA_FUNCS
-  GCC:*_*_IPF_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
-  GCC:*_*_ARM_CC_FLAGS      = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
-  GCC:*_*_AARCH64_CC_FLAGS  = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
+  GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -UNO_BUILTIN_VA_FUNCS
+  GCC:*_*_IPF_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+  GCC:*_*_ARM_CC_FLAGS      = $(OPENSSL_FLAGS) -w
+  GCC:*_*_AARCH64_CC_FLAGS  = $(OPENSSL_FLAGS) -w
 
   # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
   # 1295: Deprecated declaration <entity> - give arg types
@@ -917,6 +526,13 @@
   #  513: a value of type <type> cannot be assigned to an entity of type <type>
   #  188: enumerated type mixed with another type (i.e. passing an integer as an enum without a cast)
   # 1296: Extended constant initialiser used
-  RVCT:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188
-  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
-  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w
+  #  128: loop is not reachable - may be emitted inappropriately if code follows a conditional return
+  #       from the function that evaluates to true at compile time
+  #  546: transfer of control bypasses initialization - may be emitted inappropriately if the uninitialized
+  #       variable is never referenced after the jump
+  #    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.)
+  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
+  XCODE:*_*_IA32_CC_FLAGS   = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
+  XCODE:*_*_X64_CC_FLAGS    = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w