*** Upgrade CryptoPkg to use the latest OpenSSL 1.1.0xx/stable release ***

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

Posted by Qin Long 7 years, 7 months ago

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

diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore
index 05272c2865..731c275ae1 100644
--- a/CryptoPkg/.gitignore
+++ b/CryptoPkg/.gitignore
@@ -1,2 +1 @@
-Include/openssl
-Library/OpensslLib/openssl-*/
+Library/OpensslLib/openssl*/
diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
index 27c832707a..fdccbf06f7 100644
--- a/CryptoPkg/CryptoPkg.dec
+++ b/CryptoPkg/CryptoPkg.dec
@@ -9,10 +9,10 @@
 #  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
 #  http://opensource.org/licenses/bsd-license.php
-#  
+#
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#  
+#
 ##
 
 [Defines]
@@ -24,7 +24,8 @@
 
 [Includes]
   Include
-  Library/OpensslLib/openssl-1.0.2k/include
+  Library/OpensslLib/openssl/include
+  Library/OpensslLib/openssl/crypto/include
 
 [LibraryClasses]
   ##  @libraryclass  Provides basic library functions for cryptographic primitives.
@@ -41,4 +42,3 @@
 
 [UserExtensions.TianoCore."ExtraFiles"]
   CryptoPkgExtra.uni
-  
diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
index 600578e780..91567c78f8 100644
--- a/CryptoPkg/Include/OpenSslSupport.h
+++ b/CryptoPkg/Include/OpenSslSupport.h
@@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DebugLib.h>
 
+#define OPENSSLDIR ""
+
 #define MAX_STRING_SIZE  0x1000
 
 //
@@ -90,6 +92,7 @@ typedef VOID  *FILE;
 #define LOG_DEBUG    7                /* debug-level messages */
 #define LOG_PID      0x01             /* log the pid with each message */
 #define LOG_CONS     0x02             /* log on the console if errors in sending */
+#define CHAR_BIT     8                /* Number of bits in a char */
 
 //
 // Macros from EFI Application Toolkit required to build Open SSL
@@ -216,6 +219,9 @@ int            strncmp     (const char *, const char *, size_t);
 char           *strrchr    (const char *, int);
 unsigned long  strtoul     (const char *, char **, int);
 long           strtol      (const char *, char **, int);
+char           *strerror   (int);
+size_t         strspn      (const char *, const char *);
+size_t         strcspn     (const char *, const char *);
 int            printf      (const char *, ...);
 int            sscanf      (const char *, const char *, ...);
 int            open        (const char *, int, ...);
diff --git a/CryptoPkg/Include/internal/dso_conf.h b/CryptoPkg/Include/internal/dso_conf.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/CryptoPkg/Include/openssl/opensslconf.h b/CryptoPkg/Include/openssl/opensslconf.h
new file mode 100644
index 0000000000..762a6b2c8b
--- /dev/null
+++ b/CryptoPkg/Include/openssl/opensslconf.h
@@ -0,0 +1,314 @@
+/*
+ * WARNING: do not edit!
+ * Generated by Makefile from include/openssl/opensslconf.h.in
+ *
+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#ifdef OPENSSL_ALGORITHM_DEFINES
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
+#endif
+
+/*
+ * OpenSSL was configured with the following options:
+ */
+
+#ifndef OPENSSL_SYS_UEFI
+# define OPENSSL_SYS_UEFI 1
+#endif
+#define OPENSSL_MIN_API 0x10100000L
+#ifndef OPENSSL_NO_BF
+# define OPENSSL_NO_BF
+#endif
+#ifndef OPENSSL_NO_BLAKE2
+# define OPENSSL_NO_BLAKE2
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+# define OPENSSL_NO_CAMELLIA
+#endif
+#ifndef OPENSSL_NO_CAST
+# define OPENSSL_NO_CAST
+#endif
+#ifndef OPENSSL_NO_CHACHA
+# define OPENSSL_NO_CHACHA
+#endif
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+#ifndef OPENSSL_NO_CT
+# define OPENSSL_NO_CT
+#endif
+#ifndef OPENSSL_NO_DSA
+# define OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_EC
+# define OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
+#ifndef OPENSSL_NO_MD2
+# define OPENSSL_NO_MD2
+#endif
+#ifndef OPENSSL_NO_MDC2
+# define OPENSSL_NO_MDC2
+#endif
+#ifndef OPENSSL_NO_POLY1305
+# define OPENSSL_NO_POLY1305
+#endif
+#ifndef OPENSSL_NO_RC2
+# define OPENSSL_NO_RC2
+#endif
+#ifndef OPENSSL_NO_RC5
+# define OPENSSL_NO_RC5
+#endif
+#ifndef OPENSSL_NO_RMD160
+# define OPENSSL_NO_RMD160
+#endif
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
+#ifndef OPENSSL_NO_SRP
+# define OPENSSL_NO_SRP
+#endif
+#ifndef OPENSSL_NO_TS
+# define OPENSSL_NO_TS
+#endif
+#ifndef OPENSSL_NO_UI
+# define OPENSSL_NO_UI
+#endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+# define OPENSSL_NO_WHIRLPOOL
+#endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
+#ifndef OPENSSL_NO_APPS
+# define OPENSSL_NO_APPS
+#endif
+#ifndef OPENSSL_NO_ASAN
+# define OPENSSL_NO_ASAN
+#endif
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
+#ifndef OPENSSL_NO_ASYNC
+# define OPENSSL_NO_ASYNC
+#endif
+#ifndef OPENSSL_NO_AUTOALGINIT
+# define OPENSSL_NO_AUTOALGINIT
+#endif
+#ifndef OPENSSL_NO_AUTOERRINIT
+# define OPENSSL_NO_AUTOERRINIT
+#endif
+#ifndef OPENSSL_NO_CAPIENG
+# define OPENSSL_NO_CAPIENG
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+# define OPENSSL_NO_CRYPTO_MDEBUG
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+#endif
+#ifndef OPENSSL_NO_DEPRECATED
+# define OPENSSL_NO_DEPRECATED
+#endif
+#ifndef OPENSSL_NO_DGRAM
+# define OPENSSL_NO_DGRAM
+#endif
+#ifndef OPENSSL_NO_DTLS
+# define OPENSSL_NO_DTLS
+#endif
+#ifndef OPENSSL_NO_DTLS1
+# define OPENSSL_NO_DTLS1
+#endif
+#ifndef OPENSSL_NO_DTLS1_2
+# define OPENSSL_NO_DTLS1_2
+#endif
+#ifndef OPENSSL_NO_EC2M
+# define OPENSSL_NO_EC2M
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
+#ifndef OPENSSL_NO_ECDH
+# define OPENSSL_NO_ECDH
+#endif
+#ifndef OPENSSL_NO_ECDSA
+# define OPENSSL_NO_ECDSA
+#endif
+#ifndef OPENSSL_NO_EGD
+# define OPENSSL_NO_EGD
+#endif
+#ifndef OPENSSL_NO_ENGINE
+# define OPENSSL_NO_ENGINE
+#endif
+#ifndef OPENSSL_NO_ERR
+# define OPENSSL_NO_ERR
+#endif
+#ifndef OPENSSL_NO_EXTERNAL_TESTS
+# define OPENSSL_NO_EXTERNAL_TESTS
+#endif
+#ifndef OPENSSL_NO_FILENAMES
+# define OPENSSL_NO_FILENAMES
+#endif
+#ifndef OPENSSL_NO_FUZZ_AFL
+# define OPENSSL_NO_FUZZ_AFL
+#endif
+#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
+# define OPENSSL_NO_FUZZ_LIBFUZZER
+#endif
+#ifndef OPENSSL_NO_GOST
+# define OPENSSL_NO_GOST
+#endif
+#ifndef OPENSSL_NO_HEARTBEATS
+# define OPENSSL_NO_HEARTBEATS
+#endif
+#ifndef OPENSSL_NO_HW
+# define OPENSSL_NO_HW
+#endif
+#ifndef OPENSSL_NO_MSAN
+# define OPENSSL_NO_MSAN
+#endif
+#ifndef OPENSSL_NO_OCB
+# define OPENSSL_NO_OCB
+#endif
+#ifndef OPENSSL_NO_POSIX_IO
+# define OPENSSL_NO_POSIX_IO
+#endif
+#ifndef OPENSSL_NO_RFC3779
+# define OPENSSL_NO_RFC3779
+#endif
+#ifndef OPENSSL_NO_SCRYPT
+# define OPENSSL_NO_SCRYPT
+#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
+#ifndef OPENSSL_NO_SOCK
+# define OPENSSL_NO_SOCK
+#endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_SSL3
+# define OPENSSL_NO_SSL3
+#endif
+#ifndef OPENSSL_NO_SSL3_METHOD
+# define OPENSSL_NO_SSL3_METHOD
+#endif
+#ifndef OPENSSL_NO_STDIO
+# define OPENSSL_NO_STDIO
+#endif
+#ifndef OPENSSL_NO_TESTS
+# define OPENSSL_NO_TESTS
+#endif
+#ifndef OPENSSL_NO_TLS1_3
+# define OPENSSL_NO_TLS1_3
+#endif
+#ifndef OPENSSL_NO_UBSAN
+# define OPENSSL_NO_UBSAN
+#endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
+#endif
+#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
+# define OPENSSL_NO_WEAK_SSL_CIPHERS
+#endif
+#ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+#endif
+
+
+/*
+ * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
+ * don't like that.  This will hopefully silence them.
+ */
+#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
+
+/*
+ * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
+ * declarations of functions deprecated in or before <version>. Otherwise, they
+ * still won't see them if the library has been built to disable deprecated
+ * functions.
+ */
+#if defined(OPENSSL_NO_DEPRECATED)
+# define DECLARE_DEPRECATED(f)
+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
+#else
+# define DECLARE_DEPRECATED(f)   f;
+#endif
+
+#ifndef OPENSSL_FILE
+# ifdef OPENSSL_NO_FILENAMES
+#  define OPENSSL_FILE ""
+#  define OPENSSL_LINE 0
+# else
+#  define OPENSSL_FILE __FILE__
+#  define OPENSSL_LINE __LINE__
+# endif
+#endif
+
+#ifndef OPENSSL_MIN_API
+# define OPENSSL_MIN_API 0
+#endif
+
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+# undef OPENSSL_API_COMPAT
+# define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_1_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10000000L
+# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_0_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x00908000L
+# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_0_9_8(f)
+#endif
+
+
+
+/* Generate 80386 code? */
+#undef I386_ONLY
+
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD <unistd.h>
+
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
+/*
+ * The following are cipher-specific, but are part of the public API.
+ */
+#if !defined(OPENSSL_SYS_UEFI)
+# undef BN_LLONG
+/* Only one for the following should be defined */
+# undef SIXTY_FOUR_BIT_LONG
+# undef SIXTY_FOUR_BIT
+# define THIRTY_TWO_BIT
+#endif
+
+#define RC4_INT unsigned int
+
+#ifdef  __cplusplus
+}
+#endif
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index 3acc397ace..42f72f4f1f 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -1,5 +1,5 @@
 ## @file
-#  This module provides openSSL Library implementation.
+#  This module provides OpenSSL Library implementation.
 #
 #  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
@@ -20,8 +20,8 @@
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = OpensslLib
-  DEFINE OPENSSL_PATH            = openssl-1.0.2k
-  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+  DEFINE OPENSSL_PATH            = openssl
+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNO_SYSLOG
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64
@@ -30,48 +30,164 @@
 [Sources]
   $(OPENSSL_PATH)/e_os.h
 # Autogenerated files list starts here
+  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
+  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_core.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
+  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
+  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
+  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
+  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
+  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
+  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
+  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
+  $(OPENSSL_PATH)/crypto/asn1/a_int.c
+  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
+  $(OPENSSL_PATH)/crypto/asn1/a_object.c
+  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
+  $(OPENSSL_PATH)/crypto/asn1/a_print.c
+  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
+  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
+  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
+  $(OPENSSL_PATH)/crypto/asn1/a_time.c
+  $(OPENSSL_PATH)/crypto/asn1/a_type.c
+  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
+  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
+  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
+  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_mstbl.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
+  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
+  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
+  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
+  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
+  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
+  $(OPENSSL_PATH)/crypto/asn1/f_int.c
+  $(OPENSSL_PATH)/crypto/asn1/f_string.c
+  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
+  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
+  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_scrypt.c
+  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
+  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_scn.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
+  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
+  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
+  $(OPENSSL_PATH)/crypto/asn1/x_info.c
+  $(OPENSSL_PATH)/crypto/asn1/x_long.c
+  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
+  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
+  $(OPENSSL_PATH)/crypto/asn1/x_val.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_null.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_posix.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_win.c
+  $(OPENSSL_PATH)/crypto/async/async.c
+  $(OPENSSL_PATH)/crypto/async/async_err.c
+  $(OPENSSL_PATH)/crypto/async/async_wait.c
+  $(OPENSSL_PATH)/crypto/bio/b_addr.c
+  $(OPENSSL_PATH)/crypto/bio/b_dump.c
+  $(OPENSSL_PATH)/crypto/bio/b_sock.c
+  $(OPENSSL_PATH)/crypto/bio/b_sock2.c
+  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
+  $(OPENSSL_PATH)/crypto/bio/bf_lbuf.c
+  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
+  $(OPENSSL_PATH)/crypto/bio/bf_null.c
+  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
+  $(OPENSSL_PATH)/crypto/bio/bio_err.c
+  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
+  $(OPENSSL_PATH)/crypto/bio/bio_meth.c
+  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
+  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
+  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
+  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
+  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
+  $(OPENSSL_PATH)/crypto/bio/bss_file.c
+  $(OPENSSL_PATH)/crypto/bio/bss_log.c
+  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
+  $(OPENSSL_PATH)/crypto/bio/bss_null.c
+  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
+  $(OPENSSL_PATH)/crypto/bn/bn_add.c
+  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
+  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
+  $(OPENSSL_PATH)/crypto/bn/bn_const.c
+  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
+  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
+  $(OPENSSL_PATH)/crypto/bn/bn_dh.c
+  $(OPENSSL_PATH)/crypto/bn/bn_div.c
+  $(OPENSSL_PATH)/crypto/bn/bn_err.c
+  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
+  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
+  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
+  $(OPENSSL_PATH)/crypto/bn/bn_intern.c
+  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
+  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
+  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
+  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
+  $(OPENSSL_PATH)/crypto/bn/bn_print.c
+  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
+  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
+  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
+  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
+  $(OPENSSL_PATH)/crypto/bn/bn_srp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_word.c
+  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
+  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
+  $(OPENSSL_PATH)/crypto/buffer/buffer.c
+  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
+  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
+  $(OPENSSL_PATH)/crypto/cmac/cmac.c
+  $(OPENSSL_PATH)/crypto/comp/c_zlib.c
+  $(OPENSSL_PATH)/crypto/comp/comp_err.c
+  $(OPENSSL_PATH)/crypto/comp/comp_lib.c
+  $(OPENSSL_PATH)/crypto/conf/conf_api.c
+  $(OPENSSL_PATH)/crypto/conf/conf_def.c
+  $(OPENSSL_PATH)/crypto/conf/conf_err.c
+  $(OPENSSL_PATH)/crypto/conf/conf_lib.c
+  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
+  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
+  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
+  $(OPENSSL_PATH)/crypto/cpt_err.c
   $(OPENSSL_PATH)/crypto/cryptlib.c
-  $(OPENSSL_PATH)/crypto/mem.c
-  $(OPENSSL_PATH)/crypto/mem_clr.c
-  $(OPENSSL_PATH)/crypto/mem_dbg.c
   $(OPENSSL_PATH)/crypto/cversion.c
-  $(OPENSSL_PATH)/crypto/ex_data.c
-  $(OPENSSL_PATH)/crypto/cpt_err.c
-  $(OPENSSL_PATH)/crypto/ebcdic.c
-  $(OPENSSL_PATH)/crypto/uid.c
-  $(OPENSSL_PATH)/crypto/o_time.c
-  $(OPENSSL_PATH)/crypto/o_str.c
-  $(OPENSSL_PATH)/crypto/o_dir.c
-  $(OPENSSL_PATH)/crypto/o_fips.c
-  $(OPENSSL_PATH)/crypto/o_init.c
-  $(OPENSSL_PATH)/crypto/fips_ers.c
-  $(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
-  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
-  $(OPENSSL_PATH)/crypto/md4/md4_one.c
-  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
-  $(OPENSSL_PATH)/crypto/md5/md5_one.c
-  $(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
-  $(OPENSSL_PATH)/crypto/hmac/hmac.c
-  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
-  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
   $(OPENSSL_PATH)/crypto/des/cbc_cksm.c
   $(OPENSSL_PATH)/crypto/des/cbc_enc.c
+  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
   $(OPENSSL_PATH)/crypto/des/cfb64enc.c
   $(OPENSSL_PATH)/crypto/des/cfb_enc.c
+  $(OPENSSL_PATH)/crypto/des/des_enc.c
   $(OPENSSL_PATH)/crypto/des/ecb3_enc.c
   $(OPENSSL_PATH)/crypto/des/ecb_enc.c
-  $(OPENSSL_PATH)/crypto/des/enc_read.c
-  $(OPENSSL_PATH)/crypto/des/enc_writ.c
   $(OPENSSL_PATH)/crypto/des/fcrypt.c
+  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
+  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
   $(OPENSSL_PATH)/crypto/des/ofb64enc.c
   $(OPENSSL_PATH)/crypto/des/ofb_enc.c
   $(OPENSSL_PATH)/crypto/des/pcbc_enc.c
@@ -79,452 +195,326 @@
   $(OPENSSL_PATH)/crypto/des/rand_key.c
   $(OPENSSL_PATH)/crypto/des/rpc_enc.c
   $(OPENSSL_PATH)/crypto/des/set_key.c
-  $(OPENSSL_PATH)/crypto/des/des_enc.c
-  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
-  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
   $(OPENSSL_PATH)/crypto/des/str2key.c
-  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
-  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
-  $(OPENSSL_PATH)/crypto/des/ede_cbcm_enc.c
-  $(OPENSSL_PATH)/crypto/des/des_old.c
-  $(OPENSSL_PATH)/crypto/des/des_old2.c
-  $(OPENSSL_PATH)/crypto/des/read2pwd.c
-  $(OPENSSL_PATH)/crypto/aes/aes_core.c
-  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
-  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ctr.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
-  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_utl.c
-  $(OPENSSL_PATH)/crypto/modes/cbc128.c
-  $(OPENSSL_PATH)/crypto/modes/ctr128.c
-  $(OPENSSL_PATH)/crypto/modes/cts128.c
-  $(OPENSSL_PATH)/crypto/modes/cfb128.c
-  $(OPENSSL_PATH)/crypto/modes/ofb128.c
-  $(OPENSSL_PATH)/crypto/modes/gcm128.c
-  $(OPENSSL_PATH)/crypto/modes/ccm128.c
-  $(OPENSSL_PATH)/crypto/modes/xts128.c
-  $(OPENSSL_PATH)/crypto/modes/wrap128.c
-  $(OPENSSL_PATH)/crypto/bn/bn_add.c
-  $(OPENSSL_PATH)/crypto/bn/bn_div.c
-  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
-  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
-  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
-  $(OPENSSL_PATH)/crypto/bn/bn_print.c
-  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
-  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
-  $(OPENSSL_PATH)/crypto/bn/bn_word.c
-  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
-  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
-  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
-  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
-  $(OPENSSL_PATH)/crypto/bn/bn_err.c
-  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
-  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
-  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
-  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
-  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
-  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
-  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
-  $(OPENSSL_PATH)/crypto/bn/bn_const.c
-  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_eay.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
+  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
+  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c
+  $(OPENSSL_PATH)/crypto/dh/dh_check.c
+  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
+  $(OPENSSL_PATH)/crypto/dh/dh_err.c
   $(OPENSSL_PATH)/crypto/dh/dh_gen.c
+  $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
   $(OPENSSL_PATH)/crypto/dh/dh_key.c
   $(OPENSSL_PATH)/crypto/dh/dh_lib.c
-  $(OPENSSL_PATH)/crypto/dh/dh_check.c
-  $(OPENSSL_PATH)/crypto/dh/dh_err.c
-  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
-  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
+  $(OPENSSL_PATH)/crypto/dh/dh_meth.c
   $(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
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
   $(OPENSSL_PATH)/crypto/dso/dso_err.c
   $(OPENSSL_PATH)/crypto/dso/dso_lib.c
-  $(OPENSSL_PATH)/crypto/dso/dso_null.c
   $(OPENSSL_PATH)/crypto/dso/dso_openssl.c
-  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c
-  $(OPENSSL_PATH)/crypto/dso/dso_beos.c
-  $(OPENSSL_PATH)/crypto/buffer/buffer.c
-  $(OPENSSL_PATH)/crypto/buffer/buf_str.c
-  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
-  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
-  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
-  $(OPENSSL_PATH)/crypto/bio/bio_err.c
-  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
-  $(OPENSSL_PATH)/crypto/bio/bss_null.c
-  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
-  $(OPENSSL_PATH)/crypto/bio/bss_file.c
-  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
-  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
-  $(OPENSSL_PATH)/crypto/bio/bf_null.c
-  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
-  $(OPENSSL_PATH)/crypto/bio/b_dump.c
-  $(OPENSSL_PATH)/crypto/bio/b_sock.c
-  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
-  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
-  $(OPENSSL_PATH)/crypto/bio/bss_log.c
-  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
-  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
-  $(OPENSSL_PATH)/crypto/stack/stack.c
-  $(OPENSSL_PATH)/crypto/lhash/lhash.c
-  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
-  $(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_unix.c
-  $(OPENSSL_PATH)/crypto/rand/rand_os2.c
-  $(OPENSSL_PATH)/crypto/rand/rand_nw.c
+  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
+  $(OPENSSL_PATH)/crypto/ebcdic.c
   $(OPENSSL_PATH)/crypto/err/err.c
   $(OPENSSL_PATH)/crypto/err/err_all.c
   $(OPENSSL_PATH)/crypto/err/err_prn.c
-  $(OPENSSL_PATH)/crypto/evp/encode.c
+  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
+  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
+  $(OPENSSL_PATH)/crypto/evp/bio_md.c
+  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
+  $(OPENSSL_PATH)/crypto/evp/c_allc.c
+  $(OPENSSL_PATH)/crypto/evp/c_alld.c
+  $(OPENSSL_PATH)/crypto/evp/cmeth_lib.c
   $(OPENSSL_PATH)/crypto/evp/digest.c
-  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
-  $(OPENSSL_PATH)/crypto/evp/evp_key.c
-  $(OPENSSL_PATH)/crypto/evp/evp_acnf.c
-  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
-  $(OPENSSL_PATH)/crypto/evp/e_des.c
+  $(OPENSSL_PATH)/crypto/evp/e_aes.c
+  $(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_bf.c
-  $(OPENSSL_PATH)/crypto/evp/e_idea.c
-  $(OPENSSL_PATH)/crypto/evp/e_des3.c
   $(OPENSSL_PATH)/crypto/evp/e_camellia.c
+  $(OPENSSL_PATH)/crypto/evp/e_cast.c
+  $(OPENSSL_PATH)/crypto/evp/e_chacha20_poly1305.c
+  $(OPENSSL_PATH)/crypto/evp/e_des.c
+  $(OPENSSL_PATH)/crypto/evp/e_des3.c
+  $(OPENSSL_PATH)/crypto/evp/e_idea.c
+  $(OPENSSL_PATH)/crypto/evp/e_null.c
+  $(OPENSSL_PATH)/crypto/evp/e_old.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
   $(OPENSSL_PATH)/crypto/evp/e_rc4.c
-  $(OPENSSL_PATH)/crypto/evp/e_aes.c
-  $(OPENSSL_PATH)/crypto/evp/names.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
   $(OPENSSL_PATH)/crypto/evp/e_seed.c
   $(OPENSSL_PATH)/crypto/evp/e_xcbc_d.c
-  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
-  $(OPENSSL_PATH)/crypto/evp/e_cast.c
-  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
-  $(OPENSSL_PATH)/crypto/evp/m_null.c
+  $(OPENSSL_PATH)/crypto/evp/encode.c
+  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
+  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
+  $(OPENSSL_PATH)/crypto/evp/evp_err.c
+  $(OPENSSL_PATH)/crypto/evp/evp_key.c
+  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
+  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
+  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
   $(OPENSSL_PATH)/crypto/evp/m_md2.c
   $(OPENSSL_PATH)/crypto/evp/m_md4.c
   $(OPENSSL_PATH)/crypto/evp/m_md5.c
-  $(OPENSSL_PATH)/crypto/evp/m_sha.c
-  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
-  $(OPENSSL_PATH)/crypto/evp/m_wp.c
-  $(OPENSSL_PATH)/crypto/evp/m_dss.c
-  $(OPENSSL_PATH)/crypto/evp/m_dss1.c
+  $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c
   $(OPENSSL_PATH)/crypto/evp/m_mdc2.c
+  $(OPENSSL_PATH)/crypto/evp/m_null.c
   $(OPENSSL_PATH)/crypto/evp/m_ripemd.c
-  $(OPENSSL_PATH)/crypto/evp/m_ecdsa.c
+  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
+  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
+  $(OPENSSL_PATH)/crypto/evp/m_wp.c
+  $(OPENSSL_PATH)/crypto/evp/names.c
+  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
+  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
+  $(OPENSSL_PATH)/crypto/evp/p_dec.c
+  $(OPENSSL_PATH)/crypto/evp/p_enc.c
+  $(OPENSSL_PATH)/crypto/evp/p_lib.c
   $(OPENSSL_PATH)/crypto/evp/p_open.c
   $(OPENSSL_PATH)/crypto/evp/p_seal.c
   $(OPENSSL_PATH)/crypto/evp/p_sign.c
   $(OPENSSL_PATH)/crypto/evp/p_verify.c
-  $(OPENSSL_PATH)/crypto/evp/p_lib.c
-  $(OPENSSL_PATH)/crypto/evp/p_enc.c
-  $(OPENSSL_PATH)/crypto/evp/p_dec.c
-  $(OPENSSL_PATH)/crypto/evp/bio_md.c
-  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
-  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
-  $(OPENSSL_PATH)/crypto/evp/evp_err.c
-  $(OPENSSL_PATH)/crypto/evp/e_null.c
-  $(OPENSSL_PATH)/crypto/evp/c_all.c
-  $(OPENSSL_PATH)/crypto/evp/c_allc.c
-  $(OPENSSL_PATH)/crypto/evp/c_alld.c
-  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
-  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
-  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
-  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
-  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
-  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
-  $(OPENSSL_PATH)/crypto/evp/e_old.c
-  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
   $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
   $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
-  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
-  $(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
-  $(OPENSSL_PATH)/crypto/asn1/a_object.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
-  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
-  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
-  $(OPENSSL_PATH)/crypto/asn1/a_time.c
-  $(OPENSSL_PATH)/crypto/asn1/a_int.c
-  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
-  $(OPENSSL_PATH)/crypto/asn1/a_print.c
-  $(OPENSSL_PATH)/crypto/asn1/a_type.c
-  $(OPENSSL_PATH)/crypto/asn1/a_set.c
-  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
-  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
-  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
-  $(OPENSSL_PATH)/crypto/asn1/a_enum.c
-  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
-  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
-  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
-  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
-  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
-  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
-  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
-  $(OPENSSL_PATH)/crypto/asn1/x_val.c
-  $(OPENSSL_PATH)/crypto/asn1/x_pubkey.c
-  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
-  $(OPENSSL_PATH)/crypto/asn1/x_req.c
-  $(OPENSSL_PATH)/crypto/asn1/x_attrib.c
-  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
-  $(OPENSSL_PATH)/crypto/asn1/x_long.c
-  $(OPENSSL_PATH)/crypto/asn1/x_name.c
-  $(OPENSSL_PATH)/crypto/asn1/x_x509.c
-  $(OPENSSL_PATH)/crypto/asn1/x_x509a.c
-  $(OPENSSL_PATH)/crypto/asn1/x_crl.c
-  $(OPENSSL_PATH)/crypto/asn1/x_info.c
-  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
-  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
-  $(OPENSSL_PATH)/crypto/asn1/x_nx509.c
-  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
-  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
-  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
-  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
-  $(OPENSSL_PATH)/crypto/asn1/t_req.c
-  $(OPENSSL_PATH)/crypto/asn1/t_x509.c
-  $(OPENSSL_PATH)/crypto/asn1/t_x509a.c
-  $(OPENSSL_PATH)/crypto/asn1/t_crl.c
-  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
-  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
-  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
-  $(OPENSSL_PATH)/crypto/asn1/f_int.c
-  $(OPENSSL_PATH)/crypto/asn1/f_string.c
-  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/f_enum.c
-  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bool.c
-  $(OPENSSL_PATH)/crypto/asn1/x_exten.c
-  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
-  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bytes.c
-  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
-  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
-  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
-  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
-  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
-  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
-  $(OPENSSL_PATH)/crypto/pem/pem_seal.c
-  $(OPENSSL_PATH)/crypto/pem/pem_info.c
-  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
+  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
+  $(OPENSSL_PATH)/crypto/evp/scrypt.c
+  $(OPENSSL_PATH)/crypto/ex_data.c
+  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
+  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
+  $(OPENSSL_PATH)/crypto/hmac/hmac.c
+  $(OPENSSL_PATH)/crypto/init.c
+  $(OPENSSL_PATH)/crypto/kdf/hkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/kdf_err.c
+  $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c
+  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
+  $(OPENSSL_PATH)/crypto/lhash/lhash.c
+  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
+  $(OPENSSL_PATH)/crypto/md4/md4_one.c
+  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
+  $(OPENSSL_PATH)/crypto/md5/md5_one.c
+  $(OPENSSL_PATH)/crypto/mem.c
+  $(OPENSSL_PATH)/crypto/mem_clr.c
+  $(OPENSSL_PATH)/crypto/mem_dbg.c
+  $(OPENSSL_PATH)/crypto/mem_sec.c
+  $(OPENSSL_PATH)/crypto/modes/cbc128.c
+  $(OPENSSL_PATH)/crypto/modes/ccm128.c
+  $(OPENSSL_PATH)/crypto/modes/cfb128.c
+  $(OPENSSL_PATH)/crypto/modes/ctr128.c
+  $(OPENSSL_PATH)/crypto/modes/cts128.c
+  $(OPENSSL_PATH)/crypto/modes/gcm128.c
+  $(OPENSSL_PATH)/crypto/modes/ocb128.c
+  $(OPENSSL_PATH)/crypto/modes/ofb128.c
+  $(OPENSSL_PATH)/crypto/modes/wrap128.c
+  $(OPENSSL_PATH)/crypto/modes/xts128.c
+  $(OPENSSL_PATH)/crypto/o_dir.c
+  $(OPENSSL_PATH)/crypto/o_fips.c
+  $(OPENSSL_PATH)/crypto/o_fopen.c
+  $(OPENSSL_PATH)/crypto/o_init.c
+  $(OPENSSL_PATH)/crypto/o_str.c
+  $(OPENSSL_PATH)/crypto/o_time.c
+  $(OPENSSL_PATH)/crypto/objects/o_names.c
+  $(OPENSSL_PATH)/crypto/objects/obj_dat.c
+  $(OPENSSL_PATH)/crypto/objects/obj_err.c
+  $(OPENSSL_PATH)/crypto/objects/obj_lib.c
+  $(OPENSSL_PATH)/crypto/objects/obj_xref.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
+  $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c
   $(OPENSSL_PATH)/crypto/pem/pem_all.c
   $(OPENSSL_PATH)/crypto/pem/pem_err.c
-  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
-  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
+  $(OPENSSL_PATH)/crypto/pem/pem_info.c
+  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
   $(OPENSSL_PATH)/crypto/pem/pem_oth.c
   $(OPENSSL_PATH)/crypto/pem/pem_pk8.c
   $(OPENSSL_PATH)/crypto/pem/pem_pkey.c
+  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
+  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
+  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
   $(OPENSSL_PATH)/crypto/pem/pvkfmt.c
-  $(OPENSSL_PATH)/crypto/x509/x509_def.c
-  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
-  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
+  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
+  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
+  $(OPENSSL_PATH)/crypto/rand/md_rand.c
+  $(OPENSSL_PATH)/crypto/rand/rand_egd.c
+  $(OPENSSL_PATH)/crypto/rand/rand_err.c
+  $(OPENSSL_PATH)/crypto/rand/rand_lib.c
+  $(OPENSSL_PATH)/crypto/rand/rand_unix.c
+  $(OPENSSL_PATH)/crypto/rand/rand_vms.c
+  $(OPENSSL_PATH)/crypto/rand/rand_win.c
+  $(OPENSSL_PATH)/crypto/rand/randfile.c
+  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
+  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_meth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ossl.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c
+  $(OPENSSL_PATH)/crypto/sha/sha1_one.c
+  $(OPENSSL_PATH)/crypto/sha/sha1dgst.c
+  $(OPENSSL_PATH)/crypto/sha/sha256.c
+  $(OPENSSL_PATH)/crypto/sha/sha512.c
+  $(OPENSSL_PATH)/crypto/stack/stack.c
+  $(OPENSSL_PATH)/crypto/threads_none.c
+  $(OPENSSL_PATH)/crypto/threads_pthread.c
+  $(OPENSSL_PATH)/crypto/threads_win.c
+  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
+  $(OPENSSL_PATH)/crypto/uid.c
+  $(OPENSSL_PATH)/crypto/x509/by_dir.c
+  $(OPENSSL_PATH)/crypto/x509/by_file.c
+  $(OPENSSL_PATH)/crypto/x509/t_crl.c
+  $(OPENSSL_PATH)/crypto/x509/t_req.c
+  $(OPENSSL_PATH)/crypto/x509/t_x509.c
+  $(OPENSSL_PATH)/crypto/x509/x509_att.c
   $(OPENSSL_PATH)/crypto/x509/x509_cmp.c
+  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
+  $(OPENSSL_PATH)/crypto/x509/x509_def.c
+  $(OPENSSL_PATH)/crypto/x509/x509_err.c
+  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
+  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
   $(OPENSSL_PATH)/crypto/x509/x509_obj.c
+  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
   $(OPENSSL_PATH)/crypto/x509/x509_req.c
-  $(OPENSSL_PATH)/crypto/x509/x509spki.c
-  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
   $(OPENSSL_PATH)/crypto/x509/x509_set.c
+  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
+  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
+  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
+  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
+  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
   $(OPENSSL_PATH)/crypto/x509/x509cset.c
-  $(OPENSSL_PATH)/crypto/x509/x509rset.c
-  $(OPENSSL_PATH)/crypto/x509/x509_err.c
   $(OPENSSL_PATH)/crypto/x509/x509name.c
-  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
-  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
-  $(OPENSSL_PATH)/crypto/x509/x509_att.c
+  $(OPENSSL_PATH)/crypto/x509/x509rset.c
+  $(OPENSSL_PATH)/crypto/x509/x509spki.c
   $(OPENSSL_PATH)/crypto/x509/x509type.c
-  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
   $(OPENSSL_PATH)/crypto/x509/x_all.c
-  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
-  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
-  $(OPENSSL_PATH)/crypto/x509/by_file.c
-  $(OPENSSL_PATH)/crypto/x509/by_dir.c
-  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
+  $(OPENSSL_PATH)/crypto/x509/x_attrib.c
+  $(OPENSSL_PATH)/crypto/x509/x_crl.c
+  $(OPENSSL_PATH)/crypto/x509/x_exten.c
+  $(OPENSSL_PATH)/crypto/x509/x_name.c
+  $(OPENSSL_PATH)/crypto/x509/x_pubkey.c
+  $(OPENSSL_PATH)/crypto/x509/x_req.c
+  $(OPENSSL_PATH)/crypto/x509/x_x509.c
+  $(OPENSSL_PATH)/crypto/x509/x_x509a.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_bcons.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_bitst.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_conf.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_extku.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_ia5.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_lib.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_prn.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_skey.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_sxnet.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_ocsp.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
-  $(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
-  $(OPENSSL_PATH)/crypto/conf/conf_def.c
-  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
-  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
-  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
-  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
-  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
-  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
-  $(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
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
-  $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c
-  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
-  $(OPENSSL_PATH)/crypto/cmac/cmac.c
-  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
-  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
-  $(OPENSSL_PATH)/ssl/s2_meth.c
-  $(OPENSSL_PATH)/ssl/s2_srvr.c
-  $(OPENSSL_PATH)/ssl/s2_clnt.c
-  $(OPENSSL_PATH)/ssl/s2_lib.c
-  $(OPENSSL_PATH)/ssl/s2_enc.c
-  $(OPENSSL_PATH)/ssl/s2_pkt.c
-  $(OPENSSL_PATH)/ssl/s3_meth.c
-  $(OPENSSL_PATH)/ssl/s3_srvr.c
-  $(OPENSSL_PATH)/ssl/s3_clnt.c
-  $(OPENSSL_PATH)/ssl/s3_lib.c
-  $(OPENSSL_PATH)/ssl/s3_enc.c
-  $(OPENSSL_PATH)/ssl/s3_pkt.c
-  $(OPENSSL_PATH)/ssl/s3_both.c
-  $(OPENSSL_PATH)/ssl/s3_cbc.c
-  $(OPENSSL_PATH)/ssl/s23_meth.c
-  $(OPENSSL_PATH)/ssl/s23_srvr.c
-  $(OPENSSL_PATH)/ssl/s23_clnt.c
-  $(OPENSSL_PATH)/ssl/s23_lib.c
-  $(OPENSSL_PATH)/ssl/s23_pkt.c
-  $(OPENSSL_PATH)/ssl/t1_meth.c
-  $(OPENSSL_PATH)/ssl/t1_srvr.c
-  $(OPENSSL_PATH)/ssl/t1_clnt.c
-  $(OPENSSL_PATH)/ssl/t1_lib.c
-  $(OPENSSL_PATH)/ssl/t1_enc.c
-  $(OPENSSL_PATH)/ssl/t1_ext.c
-  $(OPENSSL_PATH)/ssl/d1_meth.c
-  $(OPENSSL_PATH)/ssl/d1_srvr.c
-  $(OPENSSL_PATH)/ssl/d1_clnt.c
+  $(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_pkt.c
-  $(OPENSSL_PATH)/ssl/d1_both.c
+  $(OPENSSL_PATH)/ssl/d1_msg.c
   $(OPENSSL_PATH)/ssl/d1_srtp.c
-  $(OPENSSL_PATH)/ssl/ssl_lib.c
-  $(OPENSSL_PATH)/ssl/ssl_err2.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_sess.c
   $(OPENSSL_PATH)/ssl/ssl_ciph.c
-  $(OPENSSL_PATH)/ssl/ssl_stat.c
-  $(OPENSSL_PATH)/ssl/ssl_rsa.c
-  $(OPENSSL_PATH)/ssl/ssl_asn1.c
-  $(OPENSSL_PATH)/ssl/ssl_txt.c
-  $(OPENSSL_PATH)/ssl/ssl_algs.c
   $(OPENSSL_PATH)/ssl/ssl_conf.c
-  $(OPENSSL_PATH)/ssl/bio_ssl.c
   $(OPENSSL_PATH)/ssl/ssl_err.c
-  $(OPENSSL_PATH)/ssl/kssl.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/tls_srp.c
   $(OPENSSL_PATH)/ssl/t1_trce.c
-  $(OPENSSL_PATH)/ssl/ssl_utst.c
-
+  $(OPENSSL_PATH)/ssl/tls_srp.c
 # Autogenerated files list ends here
 
 [Packages]
@@ -539,31 +529,29 @@
 
 [BuildOptions]
   #
-  # Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
-  # C4244: conversion from type1 to type2, possible loss of data
-  # C4702: unreachable code
-  # C4706: assignment within conditional expression
-  # C4133: incompatible types - from type1 to type2
-  # C4245: conversion from type1 to type2, signed/unsigned mismatch
-  # C4267: conversion from size_t to type, possible loss of data
-  # 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'
+  # 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
   #
-  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4245 /wd4267 /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
+  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
 
-  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
 
-  GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
-  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_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
+  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)
 
   # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
   # 1295: Deprecated declaration <entity> - give arg types
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index b788e0c013..e042293263 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -1,5 +1,5 @@
 ## @file
-#  This module provides openSSL Library implementation.
+#  This module provides OpenSSL Library implementation.
 #
 #  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
@@ -20,8 +20,8 @@
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = OpensslLib
-  DEFINE OPENSSL_PATH            = openssl-1.0.2k
-  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+  DEFINE OPENSSL_PATH            = openssl
+  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNO_SYSLOG
 
 #
 #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64
@@ -30,48 +30,164 @@
 [Sources]
   $(OPENSSL_PATH)/e_os.h
 # Autogenerated files list starts here
+  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
+  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_core.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
+  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
+  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
+  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
+  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
+  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
+  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
+  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
+  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
+  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
+  $(OPENSSL_PATH)/crypto/asn1/a_int.c
+  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
+  $(OPENSSL_PATH)/crypto/asn1/a_object.c
+  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
+  $(OPENSSL_PATH)/crypto/asn1/a_print.c
+  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
+  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
+  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
+  $(OPENSSL_PATH)/crypto/asn1/a_time.c
+  $(OPENSSL_PATH)/crypto/asn1/a_type.c
+  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
+  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
+  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
+  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
+  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_mstbl.c
+  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
+  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
+  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
+  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
+  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
+  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
+  $(OPENSSL_PATH)/crypto/asn1/f_int.c
+  $(OPENSSL_PATH)/crypto/asn1/f_string.c
+  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
+  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
+  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
+  $(OPENSSL_PATH)/crypto/asn1/p5_scrypt.c
+  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
+  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_scn.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
+  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
+  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
+  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
+  $(OPENSSL_PATH)/crypto/asn1/x_info.c
+  $(OPENSSL_PATH)/crypto/asn1/x_long.c
+  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
+  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
+  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
+  $(OPENSSL_PATH)/crypto/asn1/x_val.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_null.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_posix.c
+  $(OPENSSL_PATH)/crypto/async/arch/async_win.c
+  $(OPENSSL_PATH)/crypto/async/async.c
+  $(OPENSSL_PATH)/crypto/async/async_err.c
+  $(OPENSSL_PATH)/crypto/async/async_wait.c
+  $(OPENSSL_PATH)/crypto/bio/b_addr.c
+  $(OPENSSL_PATH)/crypto/bio/b_dump.c
+  $(OPENSSL_PATH)/crypto/bio/b_sock.c
+  $(OPENSSL_PATH)/crypto/bio/b_sock2.c
+  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
+  $(OPENSSL_PATH)/crypto/bio/bf_lbuf.c
+  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
+  $(OPENSSL_PATH)/crypto/bio/bf_null.c
+  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
+  $(OPENSSL_PATH)/crypto/bio/bio_err.c
+  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
+  $(OPENSSL_PATH)/crypto/bio/bio_meth.c
+  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
+  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
+  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
+  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
+  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
+  $(OPENSSL_PATH)/crypto/bio/bss_file.c
+  $(OPENSSL_PATH)/crypto/bio/bss_log.c
+  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
+  $(OPENSSL_PATH)/crypto/bio/bss_null.c
+  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
+  $(OPENSSL_PATH)/crypto/bn/bn_add.c
+  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
+  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
+  $(OPENSSL_PATH)/crypto/bn/bn_const.c
+  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
+  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
+  $(OPENSSL_PATH)/crypto/bn/bn_dh.c
+  $(OPENSSL_PATH)/crypto/bn/bn_div.c
+  $(OPENSSL_PATH)/crypto/bn/bn_err.c
+  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
+  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
+  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
+  $(OPENSSL_PATH)/crypto/bn/bn_intern.c
+  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
+  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
+  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
+  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
+  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
+  $(OPENSSL_PATH)/crypto/bn/bn_print.c
+  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
+  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
+  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
+  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
+  $(OPENSSL_PATH)/crypto/bn/bn_srp.c
+  $(OPENSSL_PATH)/crypto/bn/bn_word.c
+  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
+  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
+  $(OPENSSL_PATH)/crypto/buffer/buffer.c
+  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
+  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
+  $(OPENSSL_PATH)/crypto/cmac/cmac.c
+  $(OPENSSL_PATH)/crypto/comp/c_zlib.c
+  $(OPENSSL_PATH)/crypto/comp/comp_err.c
+  $(OPENSSL_PATH)/crypto/comp/comp_lib.c
+  $(OPENSSL_PATH)/crypto/conf/conf_api.c
+  $(OPENSSL_PATH)/crypto/conf/conf_def.c
+  $(OPENSSL_PATH)/crypto/conf/conf_err.c
+  $(OPENSSL_PATH)/crypto/conf/conf_lib.c
+  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
+  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
+  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
+  $(OPENSSL_PATH)/crypto/cpt_err.c
   $(OPENSSL_PATH)/crypto/cryptlib.c
-  $(OPENSSL_PATH)/crypto/mem.c
-  $(OPENSSL_PATH)/crypto/mem_clr.c
-  $(OPENSSL_PATH)/crypto/mem_dbg.c
   $(OPENSSL_PATH)/crypto/cversion.c
-  $(OPENSSL_PATH)/crypto/ex_data.c
-  $(OPENSSL_PATH)/crypto/cpt_err.c
-  $(OPENSSL_PATH)/crypto/ebcdic.c
-  $(OPENSSL_PATH)/crypto/uid.c
-  $(OPENSSL_PATH)/crypto/o_time.c
-  $(OPENSSL_PATH)/crypto/o_str.c
-  $(OPENSSL_PATH)/crypto/o_dir.c
-  $(OPENSSL_PATH)/crypto/o_fips.c
-  $(OPENSSL_PATH)/crypto/o_init.c
-  $(OPENSSL_PATH)/crypto/fips_ers.c
-  $(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
-  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
-  $(OPENSSL_PATH)/crypto/md4/md4_one.c
-  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
-  $(OPENSSL_PATH)/crypto/md5/md5_one.c
-  $(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
-  $(OPENSSL_PATH)/crypto/hmac/hmac.c
-  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
-  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
   $(OPENSSL_PATH)/crypto/des/cbc_cksm.c
   $(OPENSSL_PATH)/crypto/des/cbc_enc.c
+  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
   $(OPENSSL_PATH)/crypto/des/cfb64enc.c
   $(OPENSSL_PATH)/crypto/des/cfb_enc.c
+  $(OPENSSL_PATH)/crypto/des/des_enc.c
   $(OPENSSL_PATH)/crypto/des/ecb3_enc.c
   $(OPENSSL_PATH)/crypto/des/ecb_enc.c
-  $(OPENSSL_PATH)/crypto/des/enc_read.c
-  $(OPENSSL_PATH)/crypto/des/enc_writ.c
   $(OPENSSL_PATH)/crypto/des/fcrypt.c
+  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
+  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
   $(OPENSSL_PATH)/crypto/des/ofb64enc.c
   $(OPENSSL_PATH)/crypto/des/ofb_enc.c
   $(OPENSSL_PATH)/crypto/des/pcbc_enc.c
@@ -79,402 +195,287 @@
   $(OPENSSL_PATH)/crypto/des/rand_key.c
   $(OPENSSL_PATH)/crypto/des/rpc_enc.c
   $(OPENSSL_PATH)/crypto/des/set_key.c
-  $(OPENSSL_PATH)/crypto/des/des_enc.c
-  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
-  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
   $(OPENSSL_PATH)/crypto/des/str2key.c
-  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
-  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
-  $(OPENSSL_PATH)/crypto/des/ede_cbcm_enc.c
-  $(OPENSSL_PATH)/crypto/des/des_old.c
-  $(OPENSSL_PATH)/crypto/des/des_old2.c
-  $(OPENSSL_PATH)/crypto/des/read2pwd.c
-  $(OPENSSL_PATH)/crypto/aes/aes_core.c
-  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
-  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ctr.c
-  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
-  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
-  $(OPENSSL_PATH)/crypto/rc4/rc4_utl.c
-  $(OPENSSL_PATH)/crypto/modes/cbc128.c
-  $(OPENSSL_PATH)/crypto/modes/ctr128.c
-  $(OPENSSL_PATH)/crypto/modes/cts128.c
-  $(OPENSSL_PATH)/crypto/modes/cfb128.c
-  $(OPENSSL_PATH)/crypto/modes/ofb128.c
-  $(OPENSSL_PATH)/crypto/modes/gcm128.c
-  $(OPENSSL_PATH)/crypto/modes/ccm128.c
-  $(OPENSSL_PATH)/crypto/modes/xts128.c
-  $(OPENSSL_PATH)/crypto/modes/wrap128.c
-  $(OPENSSL_PATH)/crypto/bn/bn_add.c
-  $(OPENSSL_PATH)/crypto/bn/bn_div.c
-  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
-  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
-  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
-  $(OPENSSL_PATH)/crypto/bn/bn_print.c
-  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
-  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
-  $(OPENSSL_PATH)/crypto/bn/bn_word.c
-  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
-  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
-  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
-  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
-  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
-  $(OPENSSL_PATH)/crypto/bn/bn_err.c
-  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
-  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
-  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
-  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
-  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
-  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
-  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
-  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
-  $(OPENSSL_PATH)/crypto/bn/bn_const.c
-  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_eay.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
-  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
+  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
+  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
   $(OPENSSL_PATH)/crypto/dh/dh_asn1.c
+  $(OPENSSL_PATH)/crypto/dh/dh_check.c
+  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
+  $(OPENSSL_PATH)/crypto/dh/dh_err.c
   $(OPENSSL_PATH)/crypto/dh/dh_gen.c
+  $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
   $(OPENSSL_PATH)/crypto/dh/dh_key.c
   $(OPENSSL_PATH)/crypto/dh/dh_lib.c
-  $(OPENSSL_PATH)/crypto/dh/dh_check.c
-  $(OPENSSL_PATH)/crypto/dh/dh_err.c
-  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
-  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
+  $(OPENSSL_PATH)/crypto/dh/dh_meth.c
   $(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
   $(OPENSSL_PATH)/crypto/dso/dso_dl.c
   $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
   $(OPENSSL_PATH)/crypto/dso/dso_err.c
   $(OPENSSL_PATH)/crypto/dso/dso_lib.c
-  $(OPENSSL_PATH)/crypto/dso/dso_null.c
   $(OPENSSL_PATH)/crypto/dso/dso_openssl.c
-  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
   $(OPENSSL_PATH)/crypto/dso/dso_vms.c
-  $(OPENSSL_PATH)/crypto/dso/dso_beos.c
-  $(OPENSSL_PATH)/crypto/buffer/buffer.c
-  $(OPENSSL_PATH)/crypto/buffer/buf_str.c
-  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
-  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
-  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
-  $(OPENSSL_PATH)/crypto/bio/bio_err.c
-  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
-  $(OPENSSL_PATH)/crypto/bio/bss_null.c
-  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
-  $(OPENSSL_PATH)/crypto/bio/bss_file.c
-  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
-  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
-  $(OPENSSL_PATH)/crypto/bio/bf_null.c
-  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
-  $(OPENSSL_PATH)/crypto/bio/b_dump.c
-  $(OPENSSL_PATH)/crypto/bio/b_sock.c
-  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
-  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
-  $(OPENSSL_PATH)/crypto/bio/bss_log.c
-  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
-  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
-  $(OPENSSL_PATH)/crypto/stack/stack.c
-  $(OPENSSL_PATH)/crypto/lhash/lhash.c
-  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
-  $(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_unix.c
-  $(OPENSSL_PATH)/crypto/rand/rand_os2.c
-  $(OPENSSL_PATH)/crypto/rand/rand_nw.c
+  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
+  $(OPENSSL_PATH)/crypto/ebcdic.c
   $(OPENSSL_PATH)/crypto/err/err.c
   $(OPENSSL_PATH)/crypto/err/err_all.c
   $(OPENSSL_PATH)/crypto/err/err_prn.c
-  $(OPENSSL_PATH)/crypto/evp/encode.c
+  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
+  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
+  $(OPENSSL_PATH)/crypto/evp/bio_md.c
+  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
+  $(OPENSSL_PATH)/crypto/evp/c_allc.c
+  $(OPENSSL_PATH)/crypto/evp/c_alld.c
+  $(OPENSSL_PATH)/crypto/evp/cmeth_lib.c
   $(OPENSSL_PATH)/crypto/evp/digest.c
-  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
-  $(OPENSSL_PATH)/crypto/evp/evp_key.c
-  $(OPENSSL_PATH)/crypto/evp/evp_acnf.c
-  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
-  $(OPENSSL_PATH)/crypto/evp/e_des.c
+  $(OPENSSL_PATH)/crypto/evp/e_aes.c
+  $(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_bf.c
-  $(OPENSSL_PATH)/crypto/evp/e_idea.c
-  $(OPENSSL_PATH)/crypto/evp/e_des3.c
   $(OPENSSL_PATH)/crypto/evp/e_camellia.c
+  $(OPENSSL_PATH)/crypto/evp/e_cast.c
+  $(OPENSSL_PATH)/crypto/evp/e_chacha20_poly1305.c
+  $(OPENSSL_PATH)/crypto/evp/e_des.c
+  $(OPENSSL_PATH)/crypto/evp/e_des3.c
+  $(OPENSSL_PATH)/crypto/evp/e_idea.c
+  $(OPENSSL_PATH)/crypto/evp/e_null.c
+  $(OPENSSL_PATH)/crypto/evp/e_old.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
   $(OPENSSL_PATH)/crypto/evp/e_rc4.c
-  $(OPENSSL_PATH)/crypto/evp/e_aes.c
-  $(OPENSSL_PATH)/crypto/evp/names.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c
+  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
   $(OPENSSL_PATH)/crypto/evp/e_seed.c
   $(OPENSSL_PATH)/crypto/evp/e_xcbc_d.c
-  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
-  $(OPENSSL_PATH)/crypto/evp/e_cast.c
-  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
-  $(OPENSSL_PATH)/crypto/evp/m_null.c
+  $(OPENSSL_PATH)/crypto/evp/encode.c
+  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
+  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
+  $(OPENSSL_PATH)/crypto/evp/evp_err.c
+  $(OPENSSL_PATH)/crypto/evp/evp_key.c
+  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
+  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
+  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
   $(OPENSSL_PATH)/crypto/evp/m_md2.c
   $(OPENSSL_PATH)/crypto/evp/m_md4.c
   $(OPENSSL_PATH)/crypto/evp/m_md5.c
-  $(OPENSSL_PATH)/crypto/evp/m_sha.c
-  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
-  $(OPENSSL_PATH)/crypto/evp/m_wp.c
-  $(OPENSSL_PATH)/crypto/evp/m_dss.c
-  $(OPENSSL_PATH)/crypto/evp/m_dss1.c
+  $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c
   $(OPENSSL_PATH)/crypto/evp/m_mdc2.c
+  $(OPENSSL_PATH)/crypto/evp/m_null.c
   $(OPENSSL_PATH)/crypto/evp/m_ripemd.c
-  $(OPENSSL_PATH)/crypto/evp/m_ecdsa.c
-  $(OPENSSL_PATH)/crypto/evp/p_open.c
-  $(OPENSSL_PATH)/crypto/evp/p_seal.c
-  $(OPENSSL_PATH)/crypto/evp/p_sign.c
-  $(OPENSSL_PATH)/crypto/evp/p_verify.c
-  $(OPENSSL_PATH)/crypto/evp/p_lib.c
-  $(OPENSSL_PATH)/crypto/evp/p_enc.c
-  $(OPENSSL_PATH)/crypto/evp/p_dec.c
-  $(OPENSSL_PATH)/crypto/evp/bio_md.c
-  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
-  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
-  $(OPENSSL_PATH)/crypto/evp/evp_err.c
-  $(OPENSSL_PATH)/crypto/evp/e_null.c
-  $(OPENSSL_PATH)/crypto/evp/c_all.c
-  $(OPENSSL_PATH)/crypto/evp/c_allc.c
-  $(OPENSSL_PATH)/crypto/evp/c_alld.c
-  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
-  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
-  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
-  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
-  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
-  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
-  $(OPENSSL_PATH)/crypto/evp/e_old.c
-  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
-  $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
-  $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
-  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
-  $(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
-  $(OPENSSL_PATH)/crypto/asn1/a_object.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
-  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
-  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
-  $(OPENSSL_PATH)/crypto/asn1/a_time.c
-  $(OPENSSL_PATH)/crypto/asn1/a_int.c
-  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
-  $(OPENSSL_PATH)/crypto/asn1/a_print.c
-  $(OPENSSL_PATH)/crypto/asn1/a_type.c
-  $(OPENSSL_PATH)/crypto/asn1/a_set.c
-  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
-  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
-  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
-  $(OPENSSL_PATH)/crypto/asn1/a_enum.c
-  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
-  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
-  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
-  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
-  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
-  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
-  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
-  $(OPENSSL_PATH)/crypto/asn1/x_val.c
-  $(OPENSSL_PATH)/crypto/asn1/x_pubkey.c
-  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
-  $(OPENSSL_PATH)/crypto/asn1/x_req.c
-  $(OPENSSL_PATH)/crypto/asn1/x_attrib.c
-  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
-  $(OPENSSL_PATH)/crypto/asn1/x_long.c
-  $(OPENSSL_PATH)/crypto/asn1/x_name.c
-  $(OPENSSL_PATH)/crypto/asn1/x_x509.c
-  $(OPENSSL_PATH)/crypto/asn1/x_x509a.c
-  $(OPENSSL_PATH)/crypto/asn1/x_crl.c
-  $(OPENSSL_PATH)/crypto/asn1/x_info.c
-  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
-  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
-  $(OPENSSL_PATH)/crypto/asn1/x_nx509.c
-  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
-  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
-  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
-  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
-  $(OPENSSL_PATH)/crypto/asn1/t_req.c
-  $(OPENSSL_PATH)/crypto/asn1/t_x509.c
-  $(OPENSSL_PATH)/crypto/asn1/t_x509a.c
-  $(OPENSSL_PATH)/crypto/asn1/t_crl.c
-  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
-  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
-  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
-  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
-  $(OPENSSL_PATH)/crypto/asn1/f_int.c
-  $(OPENSSL_PATH)/crypto/asn1/f_string.c
-  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/f_enum.c
-  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bool.c
-  $(OPENSSL_PATH)/crypto/asn1/x_exten.c
-  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
-  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
-  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
-  $(OPENSSL_PATH)/crypto/asn1/a_bytes.c
-  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
-  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
-  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
-  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
-  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
-  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
-  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
-  $(OPENSSL_PATH)/crypto/pem/pem_seal.c
-  $(OPENSSL_PATH)/crypto/pem/pem_info.c
-  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
+  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
+  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
+  $(OPENSSL_PATH)/crypto/evp/m_wp.c
+  $(OPENSSL_PATH)/crypto/evp/names.c
+  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
+  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
+  $(OPENSSL_PATH)/crypto/evp/p_dec.c
+  $(OPENSSL_PATH)/crypto/evp/p_enc.c
+  $(OPENSSL_PATH)/crypto/evp/p_lib.c
+  $(OPENSSL_PATH)/crypto/evp/p_open.c
+  $(OPENSSL_PATH)/crypto/evp/p_seal.c
+  $(OPENSSL_PATH)/crypto/evp/p_sign.c
+  $(OPENSSL_PATH)/crypto/evp/p_verify.c
+  $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
+  $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
+  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
+  $(OPENSSL_PATH)/crypto/evp/scrypt.c
+  $(OPENSSL_PATH)/crypto/ex_data.c
+  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
+  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
+  $(OPENSSL_PATH)/crypto/hmac/hmac.c
+  $(OPENSSL_PATH)/crypto/init.c
+  $(OPENSSL_PATH)/crypto/kdf/hkdf.c
+  $(OPENSSL_PATH)/crypto/kdf/kdf_err.c
+  $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c
+  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
+  $(OPENSSL_PATH)/crypto/lhash/lhash.c
+  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
+  $(OPENSSL_PATH)/crypto/md4/md4_one.c
+  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
+  $(OPENSSL_PATH)/crypto/md5/md5_one.c
+  $(OPENSSL_PATH)/crypto/mem.c
+  $(OPENSSL_PATH)/crypto/mem_clr.c
+  $(OPENSSL_PATH)/crypto/mem_dbg.c
+  $(OPENSSL_PATH)/crypto/mem_sec.c
+  $(OPENSSL_PATH)/crypto/modes/cbc128.c
+  $(OPENSSL_PATH)/crypto/modes/ccm128.c
+  $(OPENSSL_PATH)/crypto/modes/cfb128.c
+  $(OPENSSL_PATH)/crypto/modes/ctr128.c
+  $(OPENSSL_PATH)/crypto/modes/cts128.c
+  $(OPENSSL_PATH)/crypto/modes/gcm128.c
+  $(OPENSSL_PATH)/crypto/modes/ocb128.c
+  $(OPENSSL_PATH)/crypto/modes/ofb128.c
+  $(OPENSSL_PATH)/crypto/modes/wrap128.c
+  $(OPENSSL_PATH)/crypto/modes/xts128.c
+  $(OPENSSL_PATH)/crypto/o_dir.c
+  $(OPENSSL_PATH)/crypto/o_fips.c
+  $(OPENSSL_PATH)/crypto/o_fopen.c
+  $(OPENSSL_PATH)/crypto/o_init.c
+  $(OPENSSL_PATH)/crypto/o_str.c
+  $(OPENSSL_PATH)/crypto/o_time.c
+  $(OPENSSL_PATH)/crypto/objects/o_names.c
+  $(OPENSSL_PATH)/crypto/objects/obj_dat.c
+  $(OPENSSL_PATH)/crypto/objects/obj_err.c
+  $(OPENSSL_PATH)/crypto/objects/obj_lib.c
+  $(OPENSSL_PATH)/crypto/objects/obj_xref.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
+  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
+  $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c
   $(OPENSSL_PATH)/crypto/pem/pem_all.c
   $(OPENSSL_PATH)/crypto/pem/pem_err.c
-  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
-  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
+  $(OPENSSL_PATH)/crypto/pem/pem_info.c
+  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
   $(OPENSSL_PATH)/crypto/pem/pem_oth.c
   $(OPENSSL_PATH)/crypto/pem/pem_pk8.c
   $(OPENSSL_PATH)/crypto/pem/pem_pkey.c
+  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
+  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
+  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
   $(OPENSSL_PATH)/crypto/pem/pvkfmt.c
-  $(OPENSSL_PATH)/crypto/x509/x509_def.c
-  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
-  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c
+  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
+  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
+  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
+  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
+  $(OPENSSL_PATH)/crypto/rand/md_rand.c
+  $(OPENSSL_PATH)/crypto/rand/rand_egd.c
+  $(OPENSSL_PATH)/crypto/rand/rand_err.c
+  $(OPENSSL_PATH)/crypto/rand/rand_lib.c
+  $(OPENSSL_PATH)/crypto/rand/rand_unix.c
+  $(OPENSSL_PATH)/crypto/rand/rand_vms.c
+  $(OPENSSL_PATH)/crypto/rand/rand_win.c
+  $(OPENSSL_PATH)/crypto/rand/randfile.c
+  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
+  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_meth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ossl.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
+  $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c
+  $(OPENSSL_PATH)/crypto/sha/sha1_one.c
+  $(OPENSSL_PATH)/crypto/sha/sha1dgst.c
+  $(OPENSSL_PATH)/crypto/sha/sha256.c
+  $(OPENSSL_PATH)/crypto/sha/sha512.c
+  $(OPENSSL_PATH)/crypto/stack/stack.c
+  $(OPENSSL_PATH)/crypto/threads_none.c
+  $(OPENSSL_PATH)/crypto/threads_pthread.c
+  $(OPENSSL_PATH)/crypto/threads_win.c
+  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
+  $(OPENSSL_PATH)/crypto/uid.c
+  $(OPENSSL_PATH)/crypto/x509/by_dir.c
+  $(OPENSSL_PATH)/crypto/x509/by_file.c
+  $(OPENSSL_PATH)/crypto/x509/t_crl.c
+  $(OPENSSL_PATH)/crypto/x509/t_req.c
+  $(OPENSSL_PATH)/crypto/x509/t_x509.c
+  $(OPENSSL_PATH)/crypto/x509/x509_att.c
   $(OPENSSL_PATH)/crypto/x509/x509_cmp.c
+  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
+  $(OPENSSL_PATH)/crypto/x509/x509_def.c
+  $(OPENSSL_PATH)/crypto/x509/x509_err.c
+  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
+  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
   $(OPENSSL_PATH)/crypto/x509/x509_obj.c
+  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
   $(OPENSSL_PATH)/crypto/x509/x509_req.c
-  $(OPENSSL_PATH)/crypto/x509/x509spki.c
-  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
   $(OPENSSL_PATH)/crypto/x509/x509_set.c
+  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
+  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
+  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
+  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
+  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
   $(OPENSSL_PATH)/crypto/x509/x509cset.c
-  $(OPENSSL_PATH)/crypto/x509/x509rset.c
-  $(OPENSSL_PATH)/crypto/x509/x509_err.c
   $(OPENSSL_PATH)/crypto/x509/x509name.c
-  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
-  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
-  $(OPENSSL_PATH)/crypto/x509/x509_att.c
+  $(OPENSSL_PATH)/crypto/x509/x509rset.c
+  $(OPENSSL_PATH)/crypto/x509/x509spki.c
   $(OPENSSL_PATH)/crypto/x509/x509type.c
-  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
   $(OPENSSL_PATH)/crypto/x509/x_all.c
-  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
-  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
-  $(OPENSSL_PATH)/crypto/x509/by_file.c
-  $(OPENSSL_PATH)/crypto/x509/by_dir.c
-  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
+  $(OPENSSL_PATH)/crypto/x509/x_attrib.c
+  $(OPENSSL_PATH)/crypto/x509/x_crl.c
+  $(OPENSSL_PATH)/crypto/x509/x_exten.c
+  $(OPENSSL_PATH)/crypto/x509/x_name.c
+  $(OPENSSL_PATH)/crypto/x509/x_pubkey.c
+  $(OPENSSL_PATH)/crypto/x509/x_req.c
+  $(OPENSSL_PATH)/crypto/x509/x_x509.c
+  $(OPENSSL_PATH)/crypto/x509/x_x509a.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
+  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_bcons.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_bitst.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_conf.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_extku.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_ia5.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_lib.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_prn.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_skey.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
   $(OPENSSL_PATH)/crypto/x509v3/v3_sxnet.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_ocsp.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
-  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
-  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
-  $(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
-  $(OPENSSL_PATH)/crypto/conf/conf_def.c
-  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
-  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
-  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
-  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
-  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
-  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
-  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
-  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
-  $(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
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
-  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
-  $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c
-  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
-  $(OPENSSL_PATH)/crypto/cmac/cmac.c
-  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
-  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
-
+  $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
+  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
 # Autogenerated files list ends here
 
 [Packages]
@@ -489,31 +490,27 @@
 
 [BuildOptions]
   #
-  # Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
+  # 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
-  # C4702: unreachable code
-  # C4706: assignment within conditional expression
-  # C4133: incompatible types - from type1 to type2
   # C4245: conversion from type1 to type2, signed/unsigned mismatch
   # C4267: conversion from size_t to type, possible loss of data
-  # 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'
+  # C4389: 'operator' : signed/unsigned mismatch (xxxx)
+  # C4702: unreachable code
+  # C4706: assignment within conditional expression
   #
-  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4245 /wd4267 /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
+  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
 
   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) -w
-  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_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
+  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:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS)
+  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)
 
   # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
   # 1295: Deprecated declaration <entity> - give arg types
-- 
2.11.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

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

Posted by Laszlo Ersek 7 years, 7 months ago

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 +-

Can you split the gitignore change to a separate patch please?

Thanks
Laszlo

>  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
> 
> diff --git a/CryptoPkg/.gitignore b/CryptoPkg/.gitignore
> index 05272c2865..731c275ae1 100644
> --- a/CryptoPkg/.gitignore
> +++ b/CryptoPkg/.gitignore
> @@ -1,2 +1 @@
> -Include/openssl
> -Library/OpensslLib/openssl-*/
> +Library/OpensslLib/openssl*/
> diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
> index 27c832707a..fdccbf06f7 100644
> --- a/CryptoPkg/CryptoPkg.dec
> +++ b/CryptoPkg/CryptoPkg.dec
> @@ -9,10 +9,10 @@
>  #  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
>  #  http://opensource.org/licenses/bsd-license.php
> -#  
> +#
>  #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
>  #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> -#  
> +#
>  ##
>  
>  [Defines]
> @@ -24,7 +24,8 @@
>  
>  [Includes]
>    Include
> -  Library/OpensslLib/openssl-1.0.2k/include
> +  Library/OpensslLib/openssl/include
> +  Library/OpensslLib/openssl/crypto/include
>  
>  [LibraryClasses]
>    ##  @libraryclass  Provides basic library functions for cryptographic primitives.
> @@ -41,4 +42,3 @@
>  
>  [UserExtensions.TianoCore."ExtraFiles"]
>    CryptoPkgExtra.uni
> -  
> diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h
> index 600578e780..91567c78f8 100644
> --- a/CryptoPkg/Include/OpenSslSupport.h
> +++ b/CryptoPkg/Include/OpenSslSupport.h
> @@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/DebugLib.h>
>  
> +#define OPENSSLDIR ""
> +
>  #define MAX_STRING_SIZE  0x1000
>  
>  //
> @@ -90,6 +92,7 @@ typedef VOID  *FILE;
>  #define LOG_DEBUG    7                /* debug-level messages */
>  #define LOG_PID      0x01             /* log the pid with each message */
>  #define LOG_CONS     0x02             /* log on the console if errors in sending */
> +#define CHAR_BIT     8                /* Number of bits in a char */
>  
>  //
>  // Macros from EFI Application Toolkit required to build Open SSL
> @@ -216,6 +219,9 @@ int            strncmp     (const char *, const char *, size_t);
>  char           *strrchr    (const char *, int);
>  unsigned long  strtoul     (const char *, char **, int);
>  long           strtol      (const char *, char **, int);
> +char           *strerror   (int);
> +size_t         strspn      (const char *, const char *);
> +size_t         strcspn     (const char *, const char *);
>  int            printf      (const char *, ...);
>  int            sscanf      (const char *, const char *, ...);
>  int            open        (const char *, int, ...);
> diff --git a/CryptoPkg/Include/internal/dso_conf.h b/CryptoPkg/Include/internal/dso_conf.h
> new file mode 100644
> index 0000000000..e69de29bb2
> diff --git a/CryptoPkg/Include/openssl/opensslconf.h b/CryptoPkg/Include/openssl/opensslconf.h
> new file mode 100644
> index 0000000000..762a6b2c8b
> --- /dev/null
> +++ b/CryptoPkg/Include/openssl/opensslconf.h
> @@ -0,0 +1,314 @@
> +/*
> + * WARNING: do not edit!
> + * Generated by Makefile from include/openssl/opensslconf.h.in
> + *
> + * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
> + *
> + * Licensed under the OpenSSL license (the "License").  You may not use
> + * this file except in compliance with the License.  You can obtain a copy
> + * in the file LICENSE in the source distribution or at
> + * https://www.openssl.org/source/license.html
> + */
> +
> +#ifdef  __cplusplus
> +extern "C" {
> +#endif
> +
> +#ifdef OPENSSL_ALGORITHM_DEFINES
> +# error OPENSSL_ALGORITHM_DEFINES no longer supported
> +#endif
> +
> +/*
> + * OpenSSL was configured with the following options:
> + */
> +
> +#ifndef OPENSSL_SYS_UEFI
> +# define OPENSSL_SYS_UEFI 1
> +#endif
> +#define OPENSSL_MIN_API 0x10100000L
> +#ifndef OPENSSL_NO_BF
> +# define OPENSSL_NO_BF
> +#endif
> +#ifndef OPENSSL_NO_BLAKE2
> +# define OPENSSL_NO_BLAKE2
> +#endif
> +#ifndef OPENSSL_NO_CAMELLIA
> +# define OPENSSL_NO_CAMELLIA
> +#endif
> +#ifndef OPENSSL_NO_CAST
> +# define OPENSSL_NO_CAST
> +#endif
> +#ifndef OPENSSL_NO_CHACHA
> +# define OPENSSL_NO_CHACHA
> +#endif
> +#ifndef OPENSSL_NO_CMS
> +# define OPENSSL_NO_CMS
> +#endif
> +#ifndef OPENSSL_NO_CT
> +# define OPENSSL_NO_CT
> +#endif
> +#ifndef OPENSSL_NO_DSA
> +# define OPENSSL_NO_DSA
> +#endif
> +#ifndef OPENSSL_NO_EC
> +# define OPENSSL_NO_EC
> +#endif
> +#ifndef OPENSSL_NO_IDEA
> +# define OPENSSL_NO_IDEA
> +#endif
> +#ifndef OPENSSL_NO_MD2
> +# define OPENSSL_NO_MD2
> +#endif
> +#ifndef OPENSSL_NO_MDC2
> +# define OPENSSL_NO_MDC2
> +#endif
> +#ifndef OPENSSL_NO_POLY1305
> +# define OPENSSL_NO_POLY1305
> +#endif
> +#ifndef OPENSSL_NO_RC2
> +# define OPENSSL_NO_RC2
> +#endif
> +#ifndef OPENSSL_NO_RC5
> +# define OPENSSL_NO_RC5
> +#endif
> +#ifndef OPENSSL_NO_RMD160
> +# define OPENSSL_NO_RMD160
> +#endif
> +#ifndef OPENSSL_NO_SEED
> +# define OPENSSL_NO_SEED
> +#endif
> +#ifndef OPENSSL_NO_SRP
> +# define OPENSSL_NO_SRP
> +#endif
> +#ifndef OPENSSL_NO_TS
> +# define OPENSSL_NO_TS
> +#endif
> +#ifndef OPENSSL_NO_UI
> +# define OPENSSL_NO_UI
> +#endif
> +#ifndef OPENSSL_NO_WHIRLPOOL
> +# define OPENSSL_NO_WHIRLPOOL
> +#endif
> +#ifndef OPENSSL_NO_AFALGENG
> +# define OPENSSL_NO_AFALGENG
> +#endif
> +#ifndef OPENSSL_NO_APPS
> +# define OPENSSL_NO_APPS
> +#endif
> +#ifndef OPENSSL_NO_ASAN
> +# define OPENSSL_NO_ASAN
> +#endif
> +#ifndef OPENSSL_NO_ASM
> +# define OPENSSL_NO_ASM
> +#endif
> +#ifndef OPENSSL_NO_ASYNC
> +# define OPENSSL_NO_ASYNC
> +#endif
> +#ifndef OPENSSL_NO_AUTOALGINIT
> +# define OPENSSL_NO_AUTOALGINIT
> +#endif
> +#ifndef OPENSSL_NO_AUTOERRINIT
> +# define OPENSSL_NO_AUTOERRINIT
> +#endif
> +#ifndef OPENSSL_NO_CAPIENG
> +# define OPENSSL_NO_CAPIENG
> +#endif
> +#ifndef OPENSSL_NO_CRYPTO_MDEBUG
> +# define OPENSSL_NO_CRYPTO_MDEBUG
> +#endif
> +#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
> +# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
> +#endif
> +#ifndef OPENSSL_NO_DEPRECATED
> +# define OPENSSL_NO_DEPRECATED
> +#endif
> +#ifndef OPENSSL_NO_DGRAM
> +# define OPENSSL_NO_DGRAM
> +#endif
> +#ifndef OPENSSL_NO_DTLS
> +# define OPENSSL_NO_DTLS
> +#endif
> +#ifndef OPENSSL_NO_DTLS1
> +# define OPENSSL_NO_DTLS1
> +#endif
> +#ifndef OPENSSL_NO_DTLS1_2
> +# define OPENSSL_NO_DTLS1_2
> +#endif
> +#ifndef OPENSSL_NO_EC2M
> +# define OPENSSL_NO_EC2M
> +#endif
> +#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
> +# define OPENSSL_NO_EC_NISTP_64_GCC_128
> +#endif
> +#ifndef OPENSSL_NO_ECDH
> +# define OPENSSL_NO_ECDH
> +#endif
> +#ifndef OPENSSL_NO_ECDSA
> +# define OPENSSL_NO_ECDSA
> +#endif
> +#ifndef OPENSSL_NO_EGD
> +# define OPENSSL_NO_EGD
> +#endif
> +#ifndef OPENSSL_NO_ENGINE
> +# define OPENSSL_NO_ENGINE
> +#endif
> +#ifndef OPENSSL_NO_ERR
> +# define OPENSSL_NO_ERR
> +#endif
> +#ifndef OPENSSL_NO_EXTERNAL_TESTS
> +# define OPENSSL_NO_EXTERNAL_TESTS
> +#endif
> +#ifndef OPENSSL_NO_FILENAMES
> +# define OPENSSL_NO_FILENAMES
> +#endif
> +#ifndef OPENSSL_NO_FUZZ_AFL
> +# define OPENSSL_NO_FUZZ_AFL
> +#endif
> +#ifndef OPENSSL_NO_FUZZ_LIBFUZZER
> +# define OPENSSL_NO_FUZZ_LIBFUZZER
> +#endif
> +#ifndef OPENSSL_NO_GOST
> +# define OPENSSL_NO_GOST
> +#endif
> +#ifndef OPENSSL_NO_HEARTBEATS
> +# define OPENSSL_NO_HEARTBEATS
> +#endif
> +#ifndef OPENSSL_NO_HW
> +# define OPENSSL_NO_HW
> +#endif
> +#ifndef OPENSSL_NO_MSAN
> +# define OPENSSL_NO_MSAN
> +#endif
> +#ifndef OPENSSL_NO_OCB
> +# define OPENSSL_NO_OCB
> +#endif
> +#ifndef OPENSSL_NO_POSIX_IO
> +# define OPENSSL_NO_POSIX_IO
> +#endif
> +#ifndef OPENSSL_NO_RFC3779
> +# define OPENSSL_NO_RFC3779
> +#endif
> +#ifndef OPENSSL_NO_SCRYPT
> +# define OPENSSL_NO_SCRYPT
> +#endif
> +#ifndef OPENSSL_NO_SCTP
> +# define OPENSSL_NO_SCTP
> +#endif
> +#ifndef OPENSSL_NO_SOCK
> +# define OPENSSL_NO_SOCK
> +#endif
> +#ifndef OPENSSL_NO_SSL_TRACE
> +# define OPENSSL_NO_SSL_TRACE
> +#endif
> +#ifndef OPENSSL_NO_SSL3
> +# define OPENSSL_NO_SSL3
> +#endif
> +#ifndef OPENSSL_NO_SSL3_METHOD
> +# define OPENSSL_NO_SSL3_METHOD
> +#endif
> +#ifndef OPENSSL_NO_STDIO
> +# define OPENSSL_NO_STDIO
> +#endif
> +#ifndef OPENSSL_NO_TESTS
> +# define OPENSSL_NO_TESTS
> +#endif
> +#ifndef OPENSSL_NO_TLS1_3
> +# define OPENSSL_NO_TLS1_3
> +#endif
> +#ifndef OPENSSL_NO_UBSAN
> +# define OPENSSL_NO_UBSAN
> +#endif
> +#ifndef OPENSSL_NO_UNIT_TEST
> +# define OPENSSL_NO_UNIT_TEST
> +#endif
> +#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
> +# define OPENSSL_NO_WEAK_SSL_CIPHERS
> +#endif
> +#ifndef OPENSSL_NO_AFALGENG
> +# define OPENSSL_NO_AFALGENG
> +#endif
> +
> +
> +/*
> + * Sometimes OPENSSSL_NO_xxx ends up with an empty file and some compilers
> + * don't like that.  This will hopefully silence them.
> + */
> +#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
> +
> +/*
> + * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
> + * declarations of functions deprecated in or before <version>. Otherwise, they
> + * still won't see them if the library has been built to disable deprecated
> + * functions.
> + */
> +#if defined(OPENSSL_NO_DEPRECATED)
> +# define DECLARE_DEPRECATED(f)
> +#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
> +# define DECLARE_DEPRECATED(f)    f __attribute__ ((deprecated));
> +#else
> +# define DECLARE_DEPRECATED(f)   f;
> +#endif
> +
> +#ifndef OPENSSL_FILE
> +# ifdef OPENSSL_NO_FILENAMES
> +#  define OPENSSL_FILE ""
> +#  define OPENSSL_LINE 0
> +# else
> +#  define OPENSSL_FILE __FILE__
> +#  define OPENSSL_LINE __LINE__
> +# endif
> +#endif
> +
> +#ifndef OPENSSL_MIN_API
> +# define OPENSSL_MIN_API 0
> +#endif
> +
> +#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
> +# undef OPENSSL_API_COMPAT
> +# define OPENSSL_API_COMPAT OPENSSL_MIN_API
> +#endif
> +
> +#if OPENSSL_API_COMPAT < 0x10100000L
> +# define DEPRECATEDIN_1_1_0(f)   DECLARE_DEPRECATED(f)
> +#else
> +# define DEPRECATEDIN_1_1_0(f)
> +#endif
> +
> +#if OPENSSL_API_COMPAT < 0x10000000L
> +# define DEPRECATEDIN_1_0_0(f)   DECLARE_DEPRECATED(f)
> +#else
> +# define DEPRECATEDIN_1_0_0(f)
> +#endif
> +
> +#if OPENSSL_API_COMPAT < 0x00908000L
> +# define DEPRECATEDIN_0_9_8(f)   DECLARE_DEPRECATED(f)
> +#else
> +# define DEPRECATEDIN_0_9_8(f)
> +#endif
> +
> +
> +
> +/* Generate 80386 code? */
> +#undef I386_ONLY
> +
> +#undef OPENSSL_UNISTD
> +#define OPENSSL_UNISTD <unistd.h>
> +
> +#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
> +
> +/*
> + * The following are cipher-specific, but are part of the public API.
> + */
> +#if !defined(OPENSSL_SYS_UEFI)
> +# undef BN_LLONG
> +/* Only one for the following should be defined */
> +# undef SIXTY_FOUR_BIT_LONG
> +# undef SIXTY_FOUR_BIT
> +# define THIRTY_TWO_BIT
> +#endif
> +
> +#define RC4_INT unsigned int
> +
> +#ifdef  __cplusplus
> +}
> +#endif
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> index 3acc397ace..42f72f4f1f 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
> @@ -1,5 +1,5 @@
>  ## @file
> -#  This module provides openSSL Library implementation.
> +#  This module provides OpenSSL Library implementation.
>  #
>  #  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  This program and the accompanying materials
> @@ -20,8 +20,8 @@
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = OpensslLib
> -  DEFINE OPENSSL_PATH            = openssl-1.0.2k
> -  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
> +  DEFINE OPENSSL_PATH            = openssl
> +  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNO_SYSLOG
>  
>  #
>  #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64
> @@ -30,48 +30,164 @@
>  [Sources]
>    $(OPENSSL_PATH)/e_os.h
>  # Autogenerated files list starts here
> +  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_core.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_int.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_object.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_print.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_time.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_type.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
> +  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_mstbl.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
> +  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
> +  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
> +  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
> +  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
> +  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
> +  $(OPENSSL_PATH)/crypto/asn1/f_int.c
> +  $(OPENSSL_PATH)/crypto/asn1/f_string.c
> +  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
> +  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
> +  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_scrypt.c
> +  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_scn.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_info.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_long.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_val.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_null.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_posix.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_win.c
> +  $(OPENSSL_PATH)/crypto/async/async.c
> +  $(OPENSSL_PATH)/crypto/async/async_err.c
> +  $(OPENSSL_PATH)/crypto/async/async_wait.c
> +  $(OPENSSL_PATH)/crypto/bio/b_addr.c
> +  $(OPENSSL_PATH)/crypto/bio/b_dump.c
> +  $(OPENSSL_PATH)/crypto/bio/b_sock.c
> +  $(OPENSSL_PATH)/crypto/bio/b_sock2.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_lbuf.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_null.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_err.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_meth.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_file.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_log.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_null.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_add.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_const.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_dh.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_div.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_err.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_intern.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_print.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_srp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_word.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
> +  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
> +  $(OPENSSL_PATH)/crypto/buffer/buffer.c
> +  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
> +  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
> +  $(OPENSSL_PATH)/crypto/cmac/cmac.c
> +  $(OPENSSL_PATH)/crypto/comp/c_zlib.c
> +  $(OPENSSL_PATH)/crypto/comp/comp_err.c
> +  $(OPENSSL_PATH)/crypto/comp/comp_lib.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_api.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_def.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_err.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_lib.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
> +  $(OPENSSL_PATH)/crypto/cpt_err.c
>    $(OPENSSL_PATH)/crypto/cryptlib.c
> -  $(OPENSSL_PATH)/crypto/mem.c
> -  $(OPENSSL_PATH)/crypto/mem_clr.c
> -  $(OPENSSL_PATH)/crypto/mem_dbg.c
>    $(OPENSSL_PATH)/crypto/cversion.c
> -  $(OPENSSL_PATH)/crypto/ex_data.c
> -  $(OPENSSL_PATH)/crypto/cpt_err.c
> -  $(OPENSSL_PATH)/crypto/ebcdic.c
> -  $(OPENSSL_PATH)/crypto/uid.c
> -  $(OPENSSL_PATH)/crypto/o_time.c
> -  $(OPENSSL_PATH)/crypto/o_str.c
> -  $(OPENSSL_PATH)/crypto/o_dir.c
> -  $(OPENSSL_PATH)/crypto/o_fips.c
> -  $(OPENSSL_PATH)/crypto/o_init.c
> -  $(OPENSSL_PATH)/crypto/fips_ers.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
> -  $(OPENSSL_PATH)/crypto/md4/md4_one.c
> -  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
> -  $(OPENSSL_PATH)/crypto/md5/md5_one.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/hmac/hmac.c
> -  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
> -  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
>    $(OPENSSL_PATH)/crypto/des/cbc_cksm.c
>    $(OPENSSL_PATH)/crypto/des/cbc_enc.c
> +  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
>    $(OPENSSL_PATH)/crypto/des/cfb64enc.c
>    $(OPENSSL_PATH)/crypto/des/cfb_enc.c
> +  $(OPENSSL_PATH)/crypto/des/des_enc.c
>    $(OPENSSL_PATH)/crypto/des/ecb3_enc.c
>    $(OPENSSL_PATH)/crypto/des/ecb_enc.c
> -  $(OPENSSL_PATH)/crypto/des/enc_read.c
> -  $(OPENSSL_PATH)/crypto/des/enc_writ.c
>    $(OPENSSL_PATH)/crypto/des/fcrypt.c
> +  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
> +  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
>    $(OPENSSL_PATH)/crypto/des/ofb64enc.c
>    $(OPENSSL_PATH)/crypto/des/ofb_enc.c
>    $(OPENSSL_PATH)/crypto/des/pcbc_enc.c
> @@ -79,452 +195,326 @@
>    $(OPENSSL_PATH)/crypto/des/rand_key.c
>    $(OPENSSL_PATH)/crypto/des/rpc_enc.c
>    $(OPENSSL_PATH)/crypto/des/set_key.c
> -  $(OPENSSL_PATH)/crypto/des/des_enc.c
> -  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
> -  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
>    $(OPENSSL_PATH)/crypto/des/str2key.c
> -  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
> -  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
> -  $(OPENSSL_PATH)/crypto/des/ede_cbcm_enc.c
> -  $(OPENSSL_PATH)/crypto/des/des_old.c
> -  $(OPENSSL_PATH)/crypto/des/des_old2.c
> -  $(OPENSSL_PATH)/crypto/des/read2pwd.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_core.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ctr.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_utl.c
> -  $(OPENSSL_PATH)/crypto/modes/cbc128.c
> -  $(OPENSSL_PATH)/crypto/modes/ctr128.c
> -  $(OPENSSL_PATH)/crypto/modes/cts128.c
> -  $(OPENSSL_PATH)/crypto/modes/cfb128.c
> -  $(OPENSSL_PATH)/crypto/modes/ofb128.c
> -  $(OPENSSL_PATH)/crypto/modes/gcm128.c
> -  $(OPENSSL_PATH)/crypto/modes/ccm128.c
> -  $(OPENSSL_PATH)/crypto/modes/xts128.c
> -  $(OPENSSL_PATH)/crypto/modes/wrap128.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_add.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_div.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_print.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_word.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_err.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_const.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_eay.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
> +  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
>    $(OPENSSL_PATH)/crypto/dh/dh_asn1.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_check.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_err.c
>    $(OPENSSL_PATH)/crypto/dh/dh_gen.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
>    $(OPENSSL_PATH)/crypto/dh/dh_key.c
>    $(OPENSSL_PATH)/crypto/dh/dh_lib.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_check.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_err.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_meth.c
>    $(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
>    $(OPENSSL_PATH)/crypto/dso/dso_dl.c
>    $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
>    $(OPENSSL_PATH)/crypto/dso/dso_err.c
>    $(OPENSSL_PATH)/crypto/dso/dso_lib.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_null.c
>    $(OPENSSL_PATH)/crypto/dso/dso_openssl.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
>    $(OPENSSL_PATH)/crypto/dso/dso_vms.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_beos.c
> -  $(OPENSSL_PATH)/crypto/buffer/buffer.c
> -  $(OPENSSL_PATH)/crypto/buffer/buf_str.c
> -  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_err.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_null.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_file.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_null.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
> -  $(OPENSSL_PATH)/crypto/bio/b_dump.c
> -  $(OPENSSL_PATH)/crypto/bio/b_sock.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_log.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
> -  $(OPENSSL_PATH)/crypto/stack/stack.c
> -  $(OPENSSL_PATH)/crypto/lhash/lhash.c
> -  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
> -  $(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_unix.c
> -  $(OPENSSL_PATH)/crypto/rand/rand_os2.c
> -  $(OPENSSL_PATH)/crypto/rand/rand_nw.c
> +  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
> +  $(OPENSSL_PATH)/crypto/ebcdic.c
>    $(OPENSSL_PATH)/crypto/err/err.c
>    $(OPENSSL_PATH)/crypto/err/err_all.c
>    $(OPENSSL_PATH)/crypto/err/err_prn.c
> -  $(OPENSSL_PATH)/crypto/evp/encode.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_md.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
> +  $(OPENSSL_PATH)/crypto/evp/c_allc.c
> +  $(OPENSSL_PATH)/crypto/evp/c_alld.c
> +  $(OPENSSL_PATH)/crypto/evp/cmeth_lib.c
>    $(OPENSSL_PATH)/crypto/evp/digest.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_key.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_acnf.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
> -  $(OPENSSL_PATH)/crypto/evp/e_des.c
> +  $(OPENSSL_PATH)/crypto/evp/e_aes.c
> +  $(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_bf.c
> -  $(OPENSSL_PATH)/crypto/evp/e_idea.c
> -  $(OPENSSL_PATH)/crypto/evp/e_des3.c
>    $(OPENSSL_PATH)/crypto/evp/e_camellia.c
> +  $(OPENSSL_PATH)/crypto/evp/e_cast.c
> +  $(OPENSSL_PATH)/crypto/evp/e_chacha20_poly1305.c
> +  $(OPENSSL_PATH)/crypto/evp/e_des.c
> +  $(OPENSSL_PATH)/crypto/evp/e_des3.c
> +  $(OPENSSL_PATH)/crypto/evp/e_idea.c
> +  $(OPENSSL_PATH)/crypto/evp/e_null.c
> +  $(OPENSSL_PATH)/crypto/evp/e_old.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
>    $(OPENSSL_PATH)/crypto/evp/e_rc4.c
> -  $(OPENSSL_PATH)/crypto/evp/e_aes.c
> -  $(OPENSSL_PATH)/crypto/evp/names.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
>    $(OPENSSL_PATH)/crypto/evp/e_seed.c
>    $(OPENSSL_PATH)/crypto/evp/e_xcbc_d.c
> -  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
> -  $(OPENSSL_PATH)/crypto/evp/e_cast.c
> -  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
> -  $(OPENSSL_PATH)/crypto/evp/m_null.c
> +  $(OPENSSL_PATH)/crypto/evp/encode.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_err.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_key.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
>    $(OPENSSL_PATH)/crypto/evp/m_md2.c
>    $(OPENSSL_PATH)/crypto/evp/m_md4.c
>    $(OPENSSL_PATH)/crypto/evp/m_md5.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sha.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
> -  $(OPENSSL_PATH)/crypto/evp/m_wp.c
> -  $(OPENSSL_PATH)/crypto/evp/m_dss.c
> -  $(OPENSSL_PATH)/crypto/evp/m_dss1.c
> +  $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c
>    $(OPENSSL_PATH)/crypto/evp/m_mdc2.c
> +  $(OPENSSL_PATH)/crypto/evp/m_null.c
>    $(OPENSSL_PATH)/crypto/evp/m_ripemd.c
> -  $(OPENSSL_PATH)/crypto/evp/m_ecdsa.c
> +  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
> +  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
> +  $(OPENSSL_PATH)/crypto/evp/m_wp.c
> +  $(OPENSSL_PATH)/crypto/evp/names.c
> +  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
> +  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
> +  $(OPENSSL_PATH)/crypto/evp/p_dec.c
> +  $(OPENSSL_PATH)/crypto/evp/p_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/p_lib.c
>    $(OPENSSL_PATH)/crypto/evp/p_open.c
>    $(OPENSSL_PATH)/crypto/evp/p_seal.c
>    $(OPENSSL_PATH)/crypto/evp/p_sign.c
>    $(OPENSSL_PATH)/crypto/evp/p_verify.c
> -  $(OPENSSL_PATH)/crypto/evp/p_lib.c
> -  $(OPENSSL_PATH)/crypto/evp/p_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/p_dec.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_md.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_err.c
> -  $(OPENSSL_PATH)/crypto/evp/e_null.c
> -  $(OPENSSL_PATH)/crypto/evp/c_all.c
> -  $(OPENSSL_PATH)/crypto/evp/c_allc.c
> -  $(OPENSSL_PATH)/crypto/evp/c_alld.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
> -  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
> -  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
> -  $(OPENSSL_PATH)/crypto/evp/e_old.c
> -  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
>    $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
>    $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/asn1/a_object.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_time.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_int.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_print.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_type.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_set.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_enum.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_val.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_pubkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_req.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_attrib.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_long.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_name.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_x509.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_x509a.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_crl.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_info.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
> -  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_nx509.c
> -  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
> -  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
> -  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
> -  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_req.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_x509.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_x509a.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_crl.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
> -  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_int.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_string.c
> -  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_enum.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bool.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_exten.c
> -  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
> -  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bytes.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
> -  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
> -  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
> -  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
> -  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_seal.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_info.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/scrypt.c
> +  $(OPENSSL_PATH)/crypto/ex_data.c
> +  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
> +  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
> +  $(OPENSSL_PATH)/crypto/hmac/hmac.c
> +  $(OPENSSL_PATH)/crypto/init.c
> +  $(OPENSSL_PATH)/crypto/kdf/hkdf.c
> +  $(OPENSSL_PATH)/crypto/kdf/kdf_err.c
> +  $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c
> +  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
> +  $(OPENSSL_PATH)/crypto/lhash/lhash.c
> +  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
> +  $(OPENSSL_PATH)/crypto/md4/md4_one.c
> +  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
> +  $(OPENSSL_PATH)/crypto/md5/md5_one.c
> +  $(OPENSSL_PATH)/crypto/mem.c
> +  $(OPENSSL_PATH)/crypto/mem_clr.c
> +  $(OPENSSL_PATH)/crypto/mem_dbg.c
> +  $(OPENSSL_PATH)/crypto/mem_sec.c
> +  $(OPENSSL_PATH)/crypto/modes/cbc128.c
> +  $(OPENSSL_PATH)/crypto/modes/ccm128.c
> +  $(OPENSSL_PATH)/crypto/modes/cfb128.c
> +  $(OPENSSL_PATH)/crypto/modes/ctr128.c
> +  $(OPENSSL_PATH)/crypto/modes/cts128.c
> +  $(OPENSSL_PATH)/crypto/modes/gcm128.c
> +  $(OPENSSL_PATH)/crypto/modes/ocb128.c
> +  $(OPENSSL_PATH)/crypto/modes/ofb128.c
> +  $(OPENSSL_PATH)/crypto/modes/wrap128.c
> +  $(OPENSSL_PATH)/crypto/modes/xts128.c
> +  $(OPENSSL_PATH)/crypto/o_dir.c
> +  $(OPENSSL_PATH)/crypto/o_fips.c
> +  $(OPENSSL_PATH)/crypto/o_fopen.c
> +  $(OPENSSL_PATH)/crypto/o_init.c
> +  $(OPENSSL_PATH)/crypto/o_str.c
> +  $(OPENSSL_PATH)/crypto/o_time.c
> +  $(OPENSSL_PATH)/crypto/objects/o_names.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_dat.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_err.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_lib.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_xref.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
> +  $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c
>    $(OPENSSL_PATH)/crypto/pem/pem_all.c
>    $(OPENSSL_PATH)/crypto/pem/pem_err.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_info.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
>    $(OPENSSL_PATH)/crypto/pem/pem_oth.c
>    $(OPENSSL_PATH)/crypto/pem/pem_pk8.c
>    $(OPENSSL_PATH)/crypto/pem/pem_pkey.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
>    $(OPENSSL_PATH)/crypto/pem/pvkfmt.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_def.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
> +  $(OPENSSL_PATH)/crypto/rand/md_rand.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_egd.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_err.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_lib.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_unix.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_vms.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_win.c
> +  $(OPENSSL_PATH)/crypto/rand/randfile.c
> +  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
> +  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_meth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ossl.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c
> +  $(OPENSSL_PATH)/crypto/sha/sha1_one.c
> +  $(OPENSSL_PATH)/crypto/sha/sha1dgst.c
> +  $(OPENSSL_PATH)/crypto/sha/sha256.c
> +  $(OPENSSL_PATH)/crypto/sha/sha512.c
> +  $(OPENSSL_PATH)/crypto/stack/stack.c
> +  $(OPENSSL_PATH)/crypto/threads_none.c
> +  $(OPENSSL_PATH)/crypto/threads_pthread.c
> +  $(OPENSSL_PATH)/crypto/threads_win.c
> +  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
> +  $(OPENSSL_PATH)/crypto/uid.c
> +  $(OPENSSL_PATH)/crypto/x509/by_dir.c
> +  $(OPENSSL_PATH)/crypto/x509/by_file.c
> +  $(OPENSSL_PATH)/crypto/x509/t_crl.c
> +  $(OPENSSL_PATH)/crypto/x509/t_req.c
> +  $(OPENSSL_PATH)/crypto/x509/t_x509.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_att.c
>    $(OPENSSL_PATH)/crypto/x509/x509_cmp.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_def.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_err.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
>    $(OPENSSL_PATH)/crypto/x509/x509_obj.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
>    $(OPENSSL_PATH)/crypto/x509/x509_req.c
> -  $(OPENSSL_PATH)/crypto/x509/x509spki.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
>    $(OPENSSL_PATH)/crypto/x509/x509_set.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
>    $(OPENSSL_PATH)/crypto/x509/x509cset.c
> -  $(OPENSSL_PATH)/crypto/x509/x509rset.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_err.c
>    $(OPENSSL_PATH)/crypto/x509/x509name.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_att.c
> +  $(OPENSSL_PATH)/crypto/x509/x509rset.c
> +  $(OPENSSL_PATH)/crypto/x509/x509spki.c
>    $(OPENSSL_PATH)/crypto/x509/x509type.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
>    $(OPENSSL_PATH)/crypto/x509/x_all.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
> -  $(OPENSSL_PATH)/crypto/x509/by_file.c
> -  $(OPENSSL_PATH)/crypto/x509/by_dir.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
> +  $(OPENSSL_PATH)/crypto/x509/x_attrib.c
> +  $(OPENSSL_PATH)/crypto/x509/x_crl.c
> +  $(OPENSSL_PATH)/crypto/x509/x_exten.c
> +  $(OPENSSL_PATH)/crypto/x509/x_name.c
> +  $(OPENSSL_PATH)/crypto/x509/x_pubkey.c
> +  $(OPENSSL_PATH)/crypto/x509/x_req.c
> +  $(OPENSSL_PATH)/crypto/x509/x_x509.c
> +  $(OPENSSL_PATH)/crypto/x509/x_x509a.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_bcons.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_bitst.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_conf.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_extku.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_ia5.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_lib.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_prn.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_skey.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_sxnet.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_ocsp.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/conf/conf_def.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
> -  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
> -  $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c
> -  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
> -  $(OPENSSL_PATH)/crypto/cmac/cmac.c
> -  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
> -  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
> -  $(OPENSSL_PATH)/ssl/s2_meth.c
> -  $(OPENSSL_PATH)/ssl/s2_srvr.c
> -  $(OPENSSL_PATH)/ssl/s2_clnt.c
> -  $(OPENSSL_PATH)/ssl/s2_lib.c
> -  $(OPENSSL_PATH)/ssl/s2_enc.c
> -  $(OPENSSL_PATH)/ssl/s2_pkt.c
> -  $(OPENSSL_PATH)/ssl/s3_meth.c
> -  $(OPENSSL_PATH)/ssl/s3_srvr.c
> -  $(OPENSSL_PATH)/ssl/s3_clnt.c
> -  $(OPENSSL_PATH)/ssl/s3_lib.c
> -  $(OPENSSL_PATH)/ssl/s3_enc.c
> -  $(OPENSSL_PATH)/ssl/s3_pkt.c
> -  $(OPENSSL_PATH)/ssl/s3_both.c
> -  $(OPENSSL_PATH)/ssl/s3_cbc.c
> -  $(OPENSSL_PATH)/ssl/s23_meth.c
> -  $(OPENSSL_PATH)/ssl/s23_srvr.c
> -  $(OPENSSL_PATH)/ssl/s23_clnt.c
> -  $(OPENSSL_PATH)/ssl/s23_lib.c
> -  $(OPENSSL_PATH)/ssl/s23_pkt.c
> -  $(OPENSSL_PATH)/ssl/t1_meth.c
> -  $(OPENSSL_PATH)/ssl/t1_srvr.c
> -  $(OPENSSL_PATH)/ssl/t1_clnt.c
> -  $(OPENSSL_PATH)/ssl/t1_lib.c
> -  $(OPENSSL_PATH)/ssl/t1_enc.c
> -  $(OPENSSL_PATH)/ssl/t1_ext.c
> -  $(OPENSSL_PATH)/ssl/d1_meth.c
> -  $(OPENSSL_PATH)/ssl/d1_srvr.c
> -  $(OPENSSL_PATH)/ssl/d1_clnt.c
> +  $(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_pkt.c
> -  $(OPENSSL_PATH)/ssl/d1_both.c
> +  $(OPENSSL_PATH)/ssl/d1_msg.c
>    $(OPENSSL_PATH)/ssl/d1_srtp.c
> -  $(OPENSSL_PATH)/ssl/ssl_lib.c
> -  $(OPENSSL_PATH)/ssl/ssl_err2.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_sess.c
>    $(OPENSSL_PATH)/ssl/ssl_ciph.c
> -  $(OPENSSL_PATH)/ssl/ssl_stat.c
> -  $(OPENSSL_PATH)/ssl/ssl_rsa.c
> -  $(OPENSSL_PATH)/ssl/ssl_asn1.c
> -  $(OPENSSL_PATH)/ssl/ssl_txt.c
> -  $(OPENSSL_PATH)/ssl/ssl_algs.c
>    $(OPENSSL_PATH)/ssl/ssl_conf.c
> -  $(OPENSSL_PATH)/ssl/bio_ssl.c
>    $(OPENSSL_PATH)/ssl/ssl_err.c
> -  $(OPENSSL_PATH)/ssl/kssl.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/tls_srp.c
>    $(OPENSSL_PATH)/ssl/t1_trce.c
> -  $(OPENSSL_PATH)/ssl/ssl_utst.c
> -
> +  $(OPENSSL_PATH)/ssl/tls_srp.c
>  # Autogenerated files list ends here
>  
>  [Packages]
> @@ -539,31 +529,29 @@
>  
>  [BuildOptions]
>    #
> -  # Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
> -  # C4244: conversion from type1 to type2, possible loss of data
> -  # C4702: unreachable code
> -  # C4706: assignment within conditional expression
> -  # C4133: incompatible types - from type1 to type2
> -  # C4245: conversion from type1 to type2, signed/unsigned mismatch
> -  # C4267: conversion from size_t to type, possible loss of data
> -  # 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'
> +  # 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
>    #
> -  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4245 /wd4267 /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
> +  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
>  
> -  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
>  
> -  GCC:*_*_IA32_CC_FLAGS     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w
> -  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_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
> +  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)
>  
>    # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
>    # 1295: Deprecated declaration <entity> - give arg types
> diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> index b788e0c013..e042293263 100644
> --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
> @@ -1,5 +1,5 @@
>  ## @file
> -#  This module provides openSSL Library implementation.
> +#  This module provides OpenSSL Library implementation.
>  #
>  #  Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  This program and the accompanying materials
> @@ -20,8 +20,8 @@
>    MODULE_TYPE                    = BASE
>    VERSION_STRING                 = 1.0
>    LIBRARY_CLASS                  = OpensslLib
> -  DEFINE OPENSSL_PATH            = openssl-1.0.2k
> -  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
> +  DEFINE OPENSSL_PATH            = openssl
> +  DEFINE OPENSSL_FLAGS           = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNO_SYSLOG
>  
>  #
>  #  VALID_ARCHITECTURES           = IA32 X64 IPF ARM AARCH64
> @@ -30,48 +30,164 @@
>  [Sources]
>    $(OPENSSL_PATH)/e_os.h
>  # Autogenerated files list starts here
> +  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_core.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
> +  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_int.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_object.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_print.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_time.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_type.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
> +  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
> +  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_mstbl.c
> +  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
> +  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
> +  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
> +  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
> +  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
> +  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
> +  $(OPENSSL_PATH)/crypto/asn1/f_int.c
> +  $(OPENSSL_PATH)/crypto/asn1/f_string.c
> +  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
> +  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
> +  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
> +  $(OPENSSL_PATH)/crypto/asn1/p5_scrypt.c
> +  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_scn.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
> +  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_info.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_long.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
> +  $(OPENSSL_PATH)/crypto/asn1/x_val.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_null.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_posix.c
> +  $(OPENSSL_PATH)/crypto/async/arch/async_win.c
> +  $(OPENSSL_PATH)/crypto/async/async.c
> +  $(OPENSSL_PATH)/crypto/async/async_err.c
> +  $(OPENSSL_PATH)/crypto/async/async_wait.c
> +  $(OPENSSL_PATH)/crypto/bio/b_addr.c
> +  $(OPENSSL_PATH)/crypto/bio/b_dump.c
> +  $(OPENSSL_PATH)/crypto/bio/b_sock.c
> +  $(OPENSSL_PATH)/crypto/bio/b_sock2.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_lbuf.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
> +  $(OPENSSL_PATH)/crypto/bio/bf_null.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_err.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
> +  $(OPENSSL_PATH)/crypto/bio/bio_meth.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_file.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_log.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_null.c
> +  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_add.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_const.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_dh.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_div.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_err.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_intern.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_print.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_srp.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_word.c
> +  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
> +  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
> +  $(OPENSSL_PATH)/crypto/buffer/buffer.c
> +  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
> +  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
> +  $(OPENSSL_PATH)/crypto/cmac/cmac.c
> +  $(OPENSSL_PATH)/crypto/comp/c_zlib.c
> +  $(OPENSSL_PATH)/crypto/comp/comp_err.c
> +  $(OPENSSL_PATH)/crypto/comp/comp_lib.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_api.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_def.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_err.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_lib.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
> +  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
> +  $(OPENSSL_PATH)/crypto/cpt_err.c
>    $(OPENSSL_PATH)/crypto/cryptlib.c
> -  $(OPENSSL_PATH)/crypto/mem.c
> -  $(OPENSSL_PATH)/crypto/mem_clr.c
> -  $(OPENSSL_PATH)/crypto/mem_dbg.c
>    $(OPENSSL_PATH)/crypto/cversion.c
> -  $(OPENSSL_PATH)/crypto/ex_data.c
> -  $(OPENSSL_PATH)/crypto/cpt_err.c
> -  $(OPENSSL_PATH)/crypto/ebcdic.c
> -  $(OPENSSL_PATH)/crypto/uid.c
> -  $(OPENSSL_PATH)/crypto/o_time.c
> -  $(OPENSSL_PATH)/crypto/o_str.c
> -  $(OPENSSL_PATH)/crypto/o_dir.c
> -  $(OPENSSL_PATH)/crypto/o_fips.c
> -  $(OPENSSL_PATH)/crypto/o_init.c
> -  $(OPENSSL_PATH)/crypto/fips_ers.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
> -  $(OPENSSL_PATH)/crypto/md4/md4_one.c
> -  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
> -  $(OPENSSL_PATH)/crypto/md5/md5_one.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/hmac/hmac.c
> -  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
> -  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
>    $(OPENSSL_PATH)/crypto/des/cbc_cksm.c
>    $(OPENSSL_PATH)/crypto/des/cbc_enc.c
> +  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
>    $(OPENSSL_PATH)/crypto/des/cfb64enc.c
>    $(OPENSSL_PATH)/crypto/des/cfb_enc.c
> +  $(OPENSSL_PATH)/crypto/des/des_enc.c
>    $(OPENSSL_PATH)/crypto/des/ecb3_enc.c
>    $(OPENSSL_PATH)/crypto/des/ecb_enc.c
> -  $(OPENSSL_PATH)/crypto/des/enc_read.c
> -  $(OPENSSL_PATH)/crypto/des/enc_writ.c
>    $(OPENSSL_PATH)/crypto/des/fcrypt.c
> +  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
> +  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
>    $(OPENSSL_PATH)/crypto/des/ofb64enc.c
>    $(OPENSSL_PATH)/crypto/des/ofb_enc.c
>    $(OPENSSL_PATH)/crypto/des/pcbc_enc.c
> @@ -79,402 +195,287 @@
>    $(OPENSSL_PATH)/crypto/des/rand_key.c
>    $(OPENSSL_PATH)/crypto/des/rpc_enc.c
>    $(OPENSSL_PATH)/crypto/des/set_key.c
> -  $(OPENSSL_PATH)/crypto/des/des_enc.c
> -  $(OPENSSL_PATH)/crypto/des/fcrypt_b.c
> -  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
>    $(OPENSSL_PATH)/crypto/des/str2key.c
> -  $(OPENSSL_PATH)/crypto/des/cfb64ede.c
> -  $(OPENSSL_PATH)/crypto/des/ofb64ede.c
> -  $(OPENSSL_PATH)/crypto/des/ede_cbcm_enc.c
> -  $(OPENSSL_PATH)/crypto/des/des_old.c
> -  $(OPENSSL_PATH)/crypto/des/des_old2.c
> -  $(OPENSSL_PATH)/crypto/des/read2pwd.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_core.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_misc.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ecb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_cbc.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_cfb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ofb.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ctr.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_ige.c
> -  $(OPENSSL_PATH)/crypto/aes/aes_wrap.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
> -  $(OPENSSL_PATH)/crypto/rc4/rc4_utl.c
> -  $(OPENSSL_PATH)/crypto/modes/cbc128.c
> -  $(OPENSSL_PATH)/crypto/modes/ctr128.c
> -  $(OPENSSL_PATH)/crypto/modes/cts128.c
> -  $(OPENSSL_PATH)/crypto/modes/cfb128.c
> -  $(OPENSSL_PATH)/crypto/modes/ofb128.c
> -  $(OPENSSL_PATH)/crypto/modes/gcm128.c
> -  $(OPENSSL_PATH)/crypto/modes/ccm128.c
> -  $(OPENSSL_PATH)/crypto/modes/xts128.c
> -  $(OPENSSL_PATH)/crypto/modes/wrap128.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_add.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_div.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_exp.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_lib.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_ctx.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mul.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mod.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_print.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_rand.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_shift.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_word.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_blind.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_kron.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_sqrt.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_gcd.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_prime.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_err.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_sqr.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_asm.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_recp.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mont.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_mpi.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_exp2.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_gf2m.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_nist.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_depr.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_const.c
> -  $(OPENSSL_PATH)/crypto/bn/bn_x931p.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_eay.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
> -  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
> +  $(OPENSSL_PATH)/crypto/des/xcbc_enc.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
>    $(OPENSSL_PATH)/crypto/dh/dh_asn1.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_check.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_err.c
>    $(OPENSSL_PATH)/crypto/dh/dh_gen.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_kdf.c
>    $(OPENSSL_PATH)/crypto/dh/dh_key.c
>    $(OPENSSL_PATH)/crypto/dh/dh_lib.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_check.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_err.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_depr.c
> -  $(OPENSSL_PATH)/crypto/dh/dh_ameth.c
> +  $(OPENSSL_PATH)/crypto/dh/dh_meth.c
>    $(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
>    $(OPENSSL_PATH)/crypto/dso/dso_dl.c
>    $(OPENSSL_PATH)/crypto/dso/dso_dlfcn.c
>    $(OPENSSL_PATH)/crypto/dso/dso_err.c
>    $(OPENSSL_PATH)/crypto/dso/dso_lib.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_null.c
>    $(OPENSSL_PATH)/crypto/dso/dso_openssl.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
>    $(OPENSSL_PATH)/crypto/dso/dso_vms.c
> -  $(OPENSSL_PATH)/crypto/dso/dso_beos.c
> -  $(OPENSSL_PATH)/crypto/buffer/buffer.c
> -  $(OPENSSL_PATH)/crypto/buffer/buf_str.c
> -  $(OPENSSL_PATH)/crypto/buffer/buf_err.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_lib.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_cb.c
> -  $(OPENSSL_PATH)/crypto/bio/bio_err.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_mem.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_null.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_fd.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_file.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_sock.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_conn.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_null.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_buff.c
> -  $(OPENSSL_PATH)/crypto/bio/b_dump.c
> -  $(OPENSSL_PATH)/crypto/bio/b_sock.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_acpt.c
> -  $(OPENSSL_PATH)/crypto/bio/bf_nbio.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_log.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_bio.c
> -  $(OPENSSL_PATH)/crypto/bio/bss_dgram.c
> -  $(OPENSSL_PATH)/crypto/stack/stack.c
> -  $(OPENSSL_PATH)/crypto/lhash/lhash.c
> -  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
> -  $(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_unix.c
> -  $(OPENSSL_PATH)/crypto/rand/rand_os2.c
> -  $(OPENSSL_PATH)/crypto/rand/rand_nw.c
> +  $(OPENSSL_PATH)/crypto/dso/dso_win32.c
> +  $(OPENSSL_PATH)/crypto/ebcdic.c
>    $(OPENSSL_PATH)/crypto/err/err.c
>    $(OPENSSL_PATH)/crypto/err/err_all.c
>    $(OPENSSL_PATH)/crypto/err/err_prn.c
> -  $(OPENSSL_PATH)/crypto/evp/encode.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_md.c
> +  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
> +  $(OPENSSL_PATH)/crypto/evp/c_allc.c
> +  $(OPENSSL_PATH)/crypto/evp/c_alld.c
> +  $(OPENSSL_PATH)/crypto/evp/cmeth_lib.c
>    $(OPENSSL_PATH)/crypto/evp/digest.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_key.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_acnf.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
> -  $(OPENSSL_PATH)/crypto/evp/e_des.c
> +  $(OPENSSL_PATH)/crypto/evp/e_aes.c
> +  $(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_bf.c
> -  $(OPENSSL_PATH)/crypto/evp/e_idea.c
> -  $(OPENSSL_PATH)/crypto/evp/e_des3.c
>    $(OPENSSL_PATH)/crypto/evp/e_camellia.c
> +  $(OPENSSL_PATH)/crypto/evp/e_cast.c
> +  $(OPENSSL_PATH)/crypto/evp/e_chacha20_poly1305.c
> +  $(OPENSSL_PATH)/crypto/evp/e_des.c
> +  $(OPENSSL_PATH)/crypto/evp/e_des3.c
> +  $(OPENSSL_PATH)/crypto/evp/e_idea.c
> +  $(OPENSSL_PATH)/crypto/evp/e_null.c
> +  $(OPENSSL_PATH)/crypto/evp/e_old.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
>    $(OPENSSL_PATH)/crypto/evp/e_rc4.c
> -  $(OPENSSL_PATH)/crypto/evp/e_aes.c
> -  $(OPENSSL_PATH)/crypto/evp/names.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc4_hmac_md5.c
> +  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
>    $(OPENSSL_PATH)/crypto/evp/e_seed.c
>    $(OPENSSL_PATH)/crypto/evp/e_xcbc_d.c
> -  $(OPENSSL_PATH)/crypto/evp/e_rc2.c
> -  $(OPENSSL_PATH)/crypto/evp/e_cast.c
> -  $(OPENSSL_PATH)/crypto/evp/e_rc5.c
> -  $(OPENSSL_PATH)/crypto/evp/m_null.c
> +  $(OPENSSL_PATH)/crypto/evp/encode.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_cnf.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_err.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_key.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
> +  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
>    $(OPENSSL_PATH)/crypto/evp/m_md2.c
>    $(OPENSSL_PATH)/crypto/evp/m_md4.c
>    $(OPENSSL_PATH)/crypto/evp/m_md5.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sha.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
> -  $(OPENSSL_PATH)/crypto/evp/m_wp.c
> -  $(OPENSSL_PATH)/crypto/evp/m_dss.c
> -  $(OPENSSL_PATH)/crypto/evp/m_dss1.c
> +  $(OPENSSL_PATH)/crypto/evp/m_md5_sha1.c
>    $(OPENSSL_PATH)/crypto/evp/m_mdc2.c
> +  $(OPENSSL_PATH)/crypto/evp/m_null.c
>    $(OPENSSL_PATH)/crypto/evp/m_ripemd.c
> -  $(OPENSSL_PATH)/crypto/evp/m_ecdsa.c
> -  $(OPENSSL_PATH)/crypto/evp/p_open.c
> -  $(OPENSSL_PATH)/crypto/evp/p_seal.c
> -  $(OPENSSL_PATH)/crypto/evp/p_sign.c
> -  $(OPENSSL_PATH)/crypto/evp/p_verify.c
> -  $(OPENSSL_PATH)/crypto/evp/p_lib.c
> -  $(OPENSSL_PATH)/crypto/evp/p_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/p_dec.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_md.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_b64.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_enc.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_err.c
> -  $(OPENSSL_PATH)/crypto/evp/e_null.c
> -  $(OPENSSL_PATH)/crypto/evp/c_all.c
> -  $(OPENSSL_PATH)/crypto/evp/c_allc.c
> -  $(OPENSSL_PATH)/crypto/evp/c_alld.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_lib.c
> -  $(OPENSSL_PATH)/crypto/evp/bio_ok.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_pkey.c
> -  $(OPENSSL_PATH)/crypto/evp/evp_pbe.c
> -  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
> -  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
> -  $(OPENSSL_PATH)/crypto/evp/e_old.c
> -  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
> -  $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
> -  $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
> -  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/asn1/a_object.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bitstr.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_utctm.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_gentm.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_time.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_int.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_octet.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_print.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_type.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_set.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_dup.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_d2i_fp.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_i2d_fp.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_enum.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_utf8.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_sign.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_digest.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_verify.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_mbstr.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_strex.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_algor.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_val.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_pubkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_sig.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_req.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_attrib.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_bignum.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_long.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_name.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_x509.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_x509a.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_crl.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_info.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_spki.c
> -  $(OPENSSL_PATH)/crypto/asn1/nsseq.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_nx509.c
> -  $(OPENSSL_PATH)/crypto/asn1/d2i_pu.c
> -  $(OPENSSL_PATH)/crypto/asn1/d2i_pr.c
> -  $(OPENSSL_PATH)/crypto/asn1/i2d_pu.c
> -  $(OPENSSL_PATH)/crypto/asn1/i2d_pr.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_req.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_x509.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_x509a.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_crl.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_spki.c
> -  $(OPENSSL_PATH)/crypto/asn1/t_bitst.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_new.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_fre.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_enc.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_dec.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_utl.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_typ.c
> -  $(OPENSSL_PATH)/crypto/asn1/tasn_prn.c
> -  $(OPENSSL_PATH)/crypto/asn1/ameth_lib.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_int.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_string.c
> -  $(OPENSSL_PATH)/crypto/asn1/n_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/f_enum.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bool.c
> -  $(OPENSSL_PATH)/crypto/asn1/x_exten.c
> -  $(OPENSSL_PATH)/crypto/asn1/bio_asn1.c
> -  $(OPENSSL_PATH)/crypto/asn1/bio_ndef.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_mime.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_gen.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_par.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_lib.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn1_err.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_bytes.c
> -  $(OPENSSL_PATH)/crypto/asn1/a_strnid.c
> -  $(OPENSSL_PATH)/crypto/asn1/evp_asn1.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_pack.c
> -  $(OPENSSL_PATH)/crypto/asn1/p5_pbe.c
> -  $(OPENSSL_PATH)/crypto/asn1/p5_pbev2.c
> -  $(OPENSSL_PATH)/crypto/asn1/p8_pkey.c
> -  $(OPENSSL_PATH)/crypto/asn1/asn_moid.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_seal.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_info.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/m_sha1.c
> +  $(OPENSSL_PATH)/crypto/evp/m_sigver.c
> +  $(OPENSSL_PATH)/crypto/evp/m_wp.c
> +  $(OPENSSL_PATH)/crypto/evp/names.c
> +  $(OPENSSL_PATH)/crypto/evp/p5_crpt.c
> +  $(OPENSSL_PATH)/crypto/evp/p5_crpt2.c
> +  $(OPENSSL_PATH)/crypto/evp/p_dec.c
> +  $(OPENSSL_PATH)/crypto/evp/p_enc.c
> +  $(OPENSSL_PATH)/crypto/evp/p_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/p_open.c
> +  $(OPENSSL_PATH)/crypto/evp/p_seal.c
> +  $(OPENSSL_PATH)/crypto/evp/p_sign.c
> +  $(OPENSSL_PATH)/crypto/evp/p_verify.c
> +  $(OPENSSL_PATH)/crypto/evp/pmeth_fn.c
> +  $(OPENSSL_PATH)/crypto/evp/pmeth_gn.c
> +  $(OPENSSL_PATH)/crypto/evp/pmeth_lib.c
> +  $(OPENSSL_PATH)/crypto/evp/scrypt.c
> +  $(OPENSSL_PATH)/crypto/ex_data.c
> +  $(OPENSSL_PATH)/crypto/hmac/hm_ameth.c
> +  $(OPENSSL_PATH)/crypto/hmac/hm_pmeth.c
> +  $(OPENSSL_PATH)/crypto/hmac/hmac.c
> +  $(OPENSSL_PATH)/crypto/init.c
> +  $(OPENSSL_PATH)/crypto/kdf/hkdf.c
> +  $(OPENSSL_PATH)/crypto/kdf/kdf_err.c
> +  $(OPENSSL_PATH)/crypto/kdf/tls1_prf.c
> +  $(OPENSSL_PATH)/crypto/lhash/lh_stats.c
> +  $(OPENSSL_PATH)/crypto/lhash/lhash.c
> +  $(OPENSSL_PATH)/crypto/md4/md4_dgst.c
> +  $(OPENSSL_PATH)/crypto/md4/md4_one.c
> +  $(OPENSSL_PATH)/crypto/md5/md5_dgst.c
> +  $(OPENSSL_PATH)/crypto/md5/md5_one.c
> +  $(OPENSSL_PATH)/crypto/mem.c
> +  $(OPENSSL_PATH)/crypto/mem_clr.c
> +  $(OPENSSL_PATH)/crypto/mem_dbg.c
> +  $(OPENSSL_PATH)/crypto/mem_sec.c
> +  $(OPENSSL_PATH)/crypto/modes/cbc128.c
> +  $(OPENSSL_PATH)/crypto/modes/ccm128.c
> +  $(OPENSSL_PATH)/crypto/modes/cfb128.c
> +  $(OPENSSL_PATH)/crypto/modes/ctr128.c
> +  $(OPENSSL_PATH)/crypto/modes/cts128.c
> +  $(OPENSSL_PATH)/crypto/modes/gcm128.c
> +  $(OPENSSL_PATH)/crypto/modes/ocb128.c
> +  $(OPENSSL_PATH)/crypto/modes/ofb128.c
> +  $(OPENSSL_PATH)/crypto/modes/wrap128.c
> +  $(OPENSSL_PATH)/crypto/modes/xts128.c
> +  $(OPENSSL_PATH)/crypto/o_dir.c
> +  $(OPENSSL_PATH)/crypto/o_fips.c
> +  $(OPENSSL_PATH)/crypto/o_fopen.c
> +  $(OPENSSL_PATH)/crypto/o_init.c
> +  $(OPENSSL_PATH)/crypto/o_str.c
> +  $(OPENSSL_PATH)/crypto/o_time.c
> +  $(OPENSSL_PATH)/crypto/objects/o_names.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_dat.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_err.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_lib.c
> +  $(OPENSSL_PATH)/crypto/objects/obj_xref.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
> +  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
> +  $(OPENSSL_PATH)/crypto/ocsp/v3_ocsp.c
>    $(OPENSSL_PATH)/crypto/pem/pem_all.c
>    $(OPENSSL_PATH)/crypto/pem/pem_err.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
> -  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_info.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_lib.c
>    $(OPENSSL_PATH)/crypto/pem/pem_oth.c
>    $(OPENSSL_PATH)/crypto/pem/pem_pk8.c
>    $(OPENSSL_PATH)/crypto/pem/pem_pkey.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_sign.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_x509.c
> +  $(OPENSSL_PATH)/crypto/pem/pem_xaux.c
>    $(OPENSSL_PATH)/crypto/pem/pvkfmt.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_def.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_sbag.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
> +  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
> +  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
> +  $(OPENSSL_PATH)/crypto/rand/md_rand.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_egd.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_err.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_lib.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_unix.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_vms.c
> +  $(OPENSSL_PATH)/crypto/rand/rand_win.c
> +  $(OPENSSL_PATH)/crypto/rand/randfile.c
> +  $(OPENSSL_PATH)/crypto/rc4/rc4_enc.c
> +  $(OPENSSL_PATH)/crypto/rc4/rc4_skey.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ameth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_asn1.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_chk.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_crpt.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_depr.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_err.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_gen.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_lib.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_meth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_none.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_null.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_oaep.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ossl.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pk1.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pmeth.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_prn.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_pss.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_saos.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_sign.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_ssl.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_x931.c
> +  $(OPENSSL_PATH)/crypto/rsa/rsa_x931g.c
> +  $(OPENSSL_PATH)/crypto/sha/sha1_one.c
> +  $(OPENSSL_PATH)/crypto/sha/sha1dgst.c
> +  $(OPENSSL_PATH)/crypto/sha/sha256.c
> +  $(OPENSSL_PATH)/crypto/sha/sha512.c
> +  $(OPENSSL_PATH)/crypto/stack/stack.c
> +  $(OPENSSL_PATH)/crypto/threads_none.c
> +  $(OPENSSL_PATH)/crypto/threads_pthread.c
> +  $(OPENSSL_PATH)/crypto/threads_win.c
> +  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
> +  $(OPENSSL_PATH)/crypto/uid.c
> +  $(OPENSSL_PATH)/crypto/x509/by_dir.c
> +  $(OPENSSL_PATH)/crypto/x509/by_file.c
> +  $(OPENSSL_PATH)/crypto/x509/t_crl.c
> +  $(OPENSSL_PATH)/crypto/x509/t_req.c
> +  $(OPENSSL_PATH)/crypto/x509/t_x509.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_att.c
>    $(OPENSSL_PATH)/crypto/x509/x509_cmp.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_d2.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_def.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_err.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
>    $(OPENSSL_PATH)/crypto/x509/x509_obj.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_r2x.c
>    $(OPENSSL_PATH)/crypto/x509/x509_req.c
> -  $(OPENSSL_PATH)/crypto/x509/x509spki.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
>    $(OPENSSL_PATH)/crypto/x509/x509_set.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_vfy.c
> +  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
>    $(OPENSSL_PATH)/crypto/x509/x509cset.c
> -  $(OPENSSL_PATH)/crypto/x509/x509rset.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_err.c
>    $(OPENSSL_PATH)/crypto/x509/x509name.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_v3.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_ext.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_att.c
> +  $(OPENSSL_PATH)/crypto/x509/x509rset.c
> +  $(OPENSSL_PATH)/crypto/x509/x509spki.c
>    $(OPENSSL_PATH)/crypto/x509/x509type.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_lu.c
>    $(OPENSSL_PATH)/crypto/x509/x_all.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_txt.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_trs.c
> -  $(OPENSSL_PATH)/crypto/x509/by_file.c
> -  $(OPENSSL_PATH)/crypto/x509/by_dir.c
> -  $(OPENSSL_PATH)/crypto/x509/x509_vpm.c
> +  $(OPENSSL_PATH)/crypto/x509/x_attrib.c
> +  $(OPENSSL_PATH)/crypto/x509/x_crl.c
> +  $(OPENSSL_PATH)/crypto/x509/x_exten.c
> +  $(OPENSSL_PATH)/crypto/x509/x_name.c
> +  $(OPENSSL_PATH)/crypto/x509/x_pubkey.c
> +  $(OPENSSL_PATH)/crypto/x509/x_req.c
> +  $(OPENSSL_PATH)/crypto/x509/x_x509.c
> +  $(OPENSSL_PATH)/crypto/x509/x_x509a.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
> +  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_bcons.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_bitst.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_conf.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_extku.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_ia5.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_lib.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_prn.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_genn.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_alt.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_skey.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_akey.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pku.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_int.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_enum.c
>    $(OPENSSL_PATH)/crypto/x509v3/v3_sxnet.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_cpols.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_crld.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_purp.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_info.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_ocsp.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_akeya.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pmaps.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pcons.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_ncons.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pcia.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_pci.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_cache.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_node.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_data.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_map.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_tree.c
> -  $(OPENSSL_PATH)/crypto/x509v3/pcy_lib.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_asid.c
> -  $(OPENSSL_PATH)/crypto/x509v3/v3_addr.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/conf/conf_def.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_mod.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_mall.c
> -  $(OPENSSL_PATH)/crypto/conf/conf_sap.c
> -  $(OPENSSL_PATH)/crypto/txt_db/txt_db.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_asn1.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_lib.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pkcs7err.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_doit.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_smime.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_attr.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/pk7_mime.c
> -  $(OPENSSL_PATH)/crypto/pkcs7/bio_pk7.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_add.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_asn.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_attr.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_crpt.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_crt.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_decr.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_init.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_key.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_kiss.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_mutl.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_utl.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_npas.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/pk12err.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8d.c
> -  $(OPENSSL_PATH)/crypto/pkcs12/p12_p8e.c
> -  $(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
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_asn.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ext.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_ht.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_lib.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_cl.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_srv.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_prn.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_vfy.c
> -  $(OPENSSL_PATH)/crypto/ocsp/ocsp_err.c
> -  $(OPENSSL_PATH)/crypto/krb5/krb5_asn.c
> -  $(OPENSSL_PATH)/crypto/pqueue/pqueue.c
> -  $(OPENSSL_PATH)/crypto/cmac/cmac.c
> -  $(OPENSSL_PATH)/crypto/cmac/cm_ameth.c
> -  $(OPENSSL_PATH)/crypto/cmac/cm_pmeth.c
> -
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_tlsf.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3_utl.c
> +  $(OPENSSL_PATH)/crypto/x509v3/v3err.c
>  # Autogenerated files list ends here
>  
>  [Packages]
> @@ -489,31 +490,27 @@
>  
>  [BuildOptions]
>    #
> -  # Disables the following Visual Studio compiler warnings brought by openssl source, so we do not break the build with /WX option:
> +  # 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
> -  # C4702: unreachable code
> -  # C4706: assignment within conditional expression
> -  # C4133: incompatible types - from type1 to type2
>    # C4245: conversion from type1 to type2, signed/unsigned mismatch
>    # C4267: conversion from size_t to type, possible loss of data
> -  # 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'
> +  # C4389: 'operator' : signed/unsigned mismatch (xxxx)
> +  # C4702: unreachable code
> +  # C4706: assignment within conditional expression
>    #
> -  MSFT:*_*_IA32_CC_FLAGS    = -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) /wd4244 /wd4245 /wd4267 /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
> +  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
>  
>    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) -w
> -  GCC:*_*_X64_CC_FLAGS      = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) -w -DNO_MSABI_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
> +  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:*_*_ARM_CC_FLAGS     = $(OPENSSL_FLAGS)
> +  GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS)
>  
>    # suppress the following warnings in openssl so we don't break the build with warnings-as-errors:
>    # 1295: Deprecated declaration <entity> - give arg types
> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

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

Posted by Laszlo Ersek 7 years, 7 months ago

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
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel